diff --git a/bootstrap_barrio.libraries.yml b/bootstrap_barrio.libraries.yml
index 71c7c694c196d05354fb5216f5bcd4054c29533f..953e2199529d12072fb0515947608378eceef581 100644
--- a/bootstrap_barrio.libraries.yml
+++ b/bootstrap_barrio.libraries.yml
@@ -253,9 +253,8 @@ material_design_icons:
 
 fontawesome:
   version: VERSION
-  css:
-    component:
-      //maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css: {}
+  js:
+    //use.fontawesome.com/releases/v5.0.13/js/all.js: { external: true }
 
 # Material Design for Bootstrap
 
diff --git a/subtheme/_bootstrap_barrio_subtheme.theme b/subtheme/_bootstrap_barrio_subtheme.theme
new file mode 100644
index 0000000000000000000000000000000000000000..55ebf9ceb7459d7951b5554be312b5b3000e2e0c
--- /dev/null
+++ b/subtheme/_bootstrap_barrio_subtheme.theme
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Functions to support theming in the SASS Starterkit subtheme.
+ */
+
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Implements hook_form_system_theme_settings_alter() for settings form.
+ *
+ * Replace Barrio setting options with subtheme ones.
+ * 
+ * Example on how to alter theme settings form
+ * 
+ */
+function bootstrap_barrio_subtheme_form_system_theme_settings_alter(&$form, FormStateInterface $form_state) {
+  $form['components']['navbar']['bootstrap_barrio_navbar_top_background']['#options'] = array(
+      'bg-primary' => t('Primary'),
+      'bg-secondary' => t('Secondary'),
+      'bg-light' => t('Light'),
+      'bg-dark' => t('Dark'),
+      'bg-white' => t('White'),
+      'bg-transparent' => t('Transparent'),
+  );
+  $form['components']['navbar']['bootstrap_barrio_navbar_background']['#options'] = array(
+      'bg-primary' => t('Primary'),
+      'bg-secondary' => t('Secondary'),
+      'bg-light' => t('Light'),
+      'bg-dark' => t('Dark'),
+      'bg-white' => t('White'),
+      'bg-transparent' => t('Transparent'),
+  );
+}
\ No newline at end of file
diff --git a/subtheme/templates/_page.html.twig b/subtheme/templates/_page.html.twig
index f8d49ad01effa4434bfcd9f48331e640ac5db053..30504dfdf91451f64e5dbcffbe3f89448e5eec88 100644
--- a/subtheme/templates/_page.html.twig
+++ b/subtheme/templates/_page.html.twig
@@ -70,7 +70,7 @@
 #}
 
 {% block head %}
-        {% if page.secondary_menu or page.page.top_header or page.top_header_form %}
+        {% if page.secondary_menu or page.top_header or page.top_header_form %}
           <nav{{ navbar_top_attributes }}>
           {% if container_navbar %}
           <div class="container">
@@ -91,9 +91,7 @@
           {% if container_navbar %}
           <div class="container">
           {% endif %}
-            <div class="navbar-brand">
-              {{ page.header }}
-            </div>
+            {{ page.header }}
             {% if page.primary_menu or page.header_form %}
               <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
               <div class="collapse navbar-collapse" id="CollapsingNavbar">
@@ -116,11 +114,7 @@
 
 {% block content %}
         <div id="main" class="{{ container }}">
-          {% if page.breadcrumb %}
-            <div class="row">
-              {{ page.breadcrumb }}
-            </div>
-          {% endif %}
+          {{ page.breadcrumb }}
           <div class="row row-offcanvas row-offcanvas-left clearfix">
               <main{{ content_attributes }}>
                 <section class="section">