diff --git a/Makefile b/Makefile
index 52650f154..e311d066f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 SHELL         := /bin/bash
 MAKEFILE_PATH := ./Makefile
 MAKEFILES_DIR := ./@bin/makefiles
-MAKEFILES_VER := v0.1.13
+MAKEFILES_VER := v0.1.18
 
 help:
 	@echo 'Available Commands:'
diff --git a/docs/welcome.md b/docs/welcome.md
index d935af6e2..7da9aa5be 100644
--- a/docs/welcome.md
+++ b/docs/welcome.md
@@ -3,7 +3,37 @@ template: overrides/main.html
 ---
 
 ![binbash-logo](./assets/images/logos/binbash.png "Binbash"){: style="width:250px"}
-![binbash-leverage-tf](./assets/images/logos/binbash-leverage-terraform.png#right "Leverage"){: style="width:130px"}
+![binbash-leverage-tf](./assets/images/logos/binbash-leverage.png#right "Leverage"){: style="width:130px"}
+
+# About Leverage
+
+!!! important "What's Leverage?"
+    Our focus is on creating reusable, high quality 
+    ![leverage-aws](./assets/images/icons/aws-emojipack/General_AWScloud.png "AWS"){: style="width:30px"} 
+    Cloud Infrastructure code, such as our
+    [**Reference AWS Cloud Solutions Architecture**](how-it-works/index.md) backed by our 
+    [**DevOps Automation Code Library**](how-it-works/code-library/code-library.md). Because all the code and modules 
+    are already built, we can get you up and running **at least 2x faster** :rocket: than a consulting company 
+    (:white_check_mark: *typically in just few months!*) on top of code that is thoroughly documented, tested, and has been proven in 
+    production at dozens of other project deployments.
+
+!!! important "Why Leverage?"
+    You implement **Binbash Leverage Reference AWS Cloud Solutions Architecture** via our **DevOps Automation Code 
+    Library** and you get your entire Cloud Native Application Infra in few months. Leverage will solve your
+    entire infrastructure and will grant you complete control of the source code, and of course you'll be able to
+    run it without us.
+     
+    *Implement yourself or we implement it for you!* :muscle:
+     
+!!! important "Core Features"
+    - [x] [**DevOps Automation Code Library**](how-it-works/index.md):
+        A collection of reusable, tested, production-ready E2E AWS Cloud infrastructure as code solutions, leveraged by
+        modules written in: *Terraform, Ansible, Helm charts, Dockerfiles and Makefiles*.
+
+    - [x] [**Reference Architecture**](how-it-works/code-library/code-library.md):
+        Designed under optimal configs for the most popular modern web and mobile applications needs.
+        Its design is fully based on the 
+        [**AWS Well Architected Framework**](https://leverage.binbash.com.ar/support/#aws-well-architected-review).
 
 # Welcome
 This is the documentation for the **Leverage Reference Architecture**.
diff --git a/material/overrides/home.html b/material/overrides/home.html
index 6aa4caacf..bfe4db7fb 100644
--- a/material/overrides/home.html
+++ b/material/overrides/home.html
@@ -4,41 +4,72 @@
    - current | #2a978d (OK w/ mkdocs.yaml -> palette -> /docs/assets/stylesheets)
    - before  | #2a978d (OK w/ mkdocs.yaml -> palette -> primary: "teal"
 -#}
+
 {% extends "overrides/main.html" %}
+
+<!-- Render hero under tabs -->
 {% block tabs %}
 {{ super() }}
-<style>.md-header{position:initial}.md-main__inner{margin:0}.md-content{display:none}.tx-container{padding-top:1rem;
-  background:url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1123 258'><path d='M1124,2c0,0 0,256 0,256l-1125,0l0,-48c0,0 16,5 55,5c116,0 197,-92 325,-92c121,0 114,46 254,46c140,0 214,-167 572,-166Z' style='fill: white' /></svg>") no-repeat bottom,linear-gradient(to bottom,var(--md-primary-fg-color),#2a978d 99%,#fff 99%)}.tx-hero{margin:0 .8rem;color:var(--md-primary-bg-color)}.tx-hero h1{margin-bottom:1rem;color:currentColor;
-  font-weight:700}.tx-hero__content{padding-bottom:6rem}.tx-hero .md-button{margin-top:.5rem;margin-right:.5rem;
-  color:var(--md-primary-bg-color)}.tx-hero .md-button--primary{background-color:var(--md-primary-bg-color);color:hsla(280deg,37%,48%,1);
-  border-color:var(--md-primary-bg-color)}.tx-hero .md-button:focus,.tx-hero .md-button:hover{background-color:var(--md-accent-fg-color);
-  color:var(--md-default-bg-color);border-color:var(--md-accent-fg-color)}@media screen and (max-width:30em){.tx-hero h1{font-size:1.4rem}}@media screen and (min-width:60em){.md-sidebar--secondary{display:none}.tx-hero{display:flex;align-items:stretch}.tx-hero__content{max-width:19rem;margin-top:3.5rem;
-  padding-bottom:14vw}.tx-hero__image{width:38rem;order:1;transform:translateX(4rem)}}@media screen and (min-width:76.25em){.md-sidebar--primary{display:none}.tx-hero__image{transform:translateX(8rem)}}
+
+<!-- Additional styles for landing page -->
+<style>
+    .md-header{position:initial}.md-main__inner{margin:0}.md-content{display:none}.tx-container{padding-top:1rem;
+
+    background:url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 1123 258'><path d='M1124,2c0,0 0,256 0,256l-1125,0l0,-48c0,0 16,5 55,5c116,0 197,-92 325,-92c121,0 114,46 254,46c140,0 214,-167 572,-166Z' style='fill: white' /></svg>") no-repeat bottom,linear-gradient(to bottom,var(--md-primary-fg-color),#2a978d 99%,#fff 99%)}.tx-hero{margin:0 .8rem;color:var(--md-primary-bg-color)}.tx-hero h1{margin-bottom:1rem;color:currentColor;
+
+    font-weight:700}.tx-hero__content{padding-bottom:6rem}.tx-hero .md-button{margin-top:.5rem;margin-right:.5rem;
+
+    color:var(--md-primary-bg-color)}.tx-hero .md-button--primary{background-color:var(--md-primary-bg-color);color:hsla(280deg,37%,48%,1);
+
+    border-color:var(--md-primary-bg-color)}.tx-hero .md-button:focus,.tx-hero .md-button:hover{background-color:var(--md-accent-fg-color);
+
+    color:var(--md-default-bg-color);border-color:var(--md-accent-fg-color)}@media screen and (max-width:30em){.tx-hero h1{font-size:1.4rem}}@media screen and (min-width:60em){.md-sidebar--secondary{display:none}.tx-hero{display:flex;align-items:stretch}.tx-hero__content{max-width:19rem;margin-top:3.5rem;
+
+    padding-bottom:14vw}.tx-hero__image{width:38rem;order:1;transform:translateX(4rem)}}@media screen and (min-width:76.25em){.md-sidebar--primary{display:none}.tx-hero__image{transform:translateX(8rem)}}
+
 </style>
+
+<!-- Hero for landing page -->
 <section class="tx-container">
     <div class="md-grid md-typeset">
         <div class="tx-hero">
+
+            <!-- Hero image -->
             <div class="tx-hero__image">
-                <img src="assets/images/illustrations/home.png" alt="" width="600" draggable="false">
+                <img
+                        src="assets/images/illustrations/home.png"
+                        alt=""
+                        width="600"
+                        draggable="false"
+                >
             </div>
+
+            <!-- Hero content -->
             <div class="tx-hero__content">
                 <h1>Leverage Reference Architecture</h1>
-                <style>
-          a:link, a:visited {
-            color: white;
-          }
 
-                </style>
+                  <style>
+                    a:link {
+                        color: white;
+                    }
+                    a:hover {
+                        color: #311b92;
+                    }
+                    a:visited {
+                        color: white;
+                    }
+                  </style>
+
                 <p>
                     Reference AWS Cloud Solutions architecture designed under optimal configs for the most popular
-                    modern web
-                    and mobile applications needs. <br> Its design is fully based on the
+                    modern web and mobile applications needs. <br> Its design is fully based on the
                     <strong>
-                        <a href="https://leverage.binbash.com.ar/support/#aws-well-architected-review">AWS Well
-                            Architected Framework.
+                        <a href="https://leverage.binbash.com.ar/support/#aws-well-architected-review">AWS
+                            Well Architected Framework.
                         </a>
                     </strong>
                 </p>
+
                 <p>
                     With its complete
                     <strong>
@@ -46,26 +77,39 @@ <h1>Leverage Reference Architecture</h1>
                             DevOps Automation Code Library
                         </a>
                     </strong>
-                    to rapidly implement it, <strong>
+                    to rapidly implement it,
+                    <strong>
                     <a href="https://leverage.binbash.com.ar/welcome/">Leverage
                     </a>
-                </strong>
+                    </strong>
                     will solve your entire infrastructure and will grant you complete control of the source code, and of
                     course
                     you'll be able to run it without us.
                 </p>
 
-                <a href="{{ page.next_page.url | url }}" title="{{ page.next_page.title | striptags }}"
-                   class="md-button md-button--primary">
-                    Get started
+                <a
+                href="{{ page.next_page.url | url }}"
+                title="{{ page.next_page.title | e }}"
+                class="md-button md-button--primary"
+                >
+                Get started
                 </a>
-                <a href="{{ config.repo_url }}" title="{{ lang.t('source.link.title') }}" class="md-button">
-                    Go to GitHub
+
+                <a
+                href="{{ config.repo_url }}"
+                title="{{ lang.t('source.link.title') }}"
+                class="md-button">
+                Go to GitHub
                 </a>
+
             </div>
         </div>
     </div>
 </section>
 {% endblock %}
+
+<!-- Content -->
 {% block content %}{% endblock %}
-{% block footer %}{% endblock %}
\ No newline at end of file
+
+<!-- Application footer -->
+{% block footer %}{% endblock %}
diff --git a/material/overrides/main.html b/material/overrides/main.html
index 1cf8b229a..8e1573544 100644
--- a/material/overrides/main.html
+++ b/material/overrides/main.html
@@ -1,28 +1,51 @@
-{#-
-This file was automatically generated - do not edit
--#}
 {% extends "base.html" %}
+
+<!-- Custom front matter -->
 {% block extrahead %}
-{% set title = config.site_name %}
-{% if page and page.title and not page.is_homepage %}
-{% set title = config.site_name ~ " - " ~ page.title | striptags %}
-{% endif %}
-{% set image = config.site_url ~ 'assets/images/illustrations/banner.png' %}
-<meta property="og:type" content="website">
-<meta property="og:title" content="{{ title }}">
-<meta property="og:description" content="{{ config.site_description }}">
-<meta property="og:url" content="{{ page.canonical_url }}">
-<meta property="og:image" content="{{ image }}">
-<meta property="og:image:type" content="image/png">
-<meta property="og:image:width" content="1200">
-<meta property="og:image:height" content="630">
+
+  <!-- Determine title -->
+  {% set title = config.site_name %}
+  {% if page and page.title and not page.is_homepage %}
+    {% set title = config.site_name ~ " - " ~ page.title | striptags %}
+  {% endif %}
+
+  <!-- The image needs to have an absolute URL -->
+  {% set image = config.site_url ~ 'assets/images/illustrations/banner.png' %}
+
+  <!-- Open graph meta tags -->
+  <meta property="og:type" content="website" />
+  <meta property="og:title" content="{{ title }}" />
+  <meta property="og:description" content="{{ config.site_description }}" />
+  <meta property="og:url" content="{{ page.canonical_url }}" />
+  <meta property="og:image" content="{{ image }}" />
+  <meta property="og:image:type" content="image/png" />
+  <meta property="og:image:width" content="1080" />
+  <meta property="og:image:height" content="568" />
+
+  <!-- Extra stylesheets -->
+  <link
+    rel="stylesheet"
+    href="{{ 'assets/stylesheets/overrides.css' | url }}"
+  />
 {% endblock %}
+
+<!-- Announcement bar -->
 {% block announce %}
-<style>
-    .md-announce a,.md-announce a:focus,.md-announce a:hover{color:currentColor}.md-announce strong{white-space:nowrap}.md-announce}
-</style>
+  <!-- Extra stylesing -->
+  <style>
+      .md-announce a,
+      .md-announce a:focus,
+      .md-announce a:hover{color:currentColor}.md-announce
+      strong{white-space:nowrap}.md-announce}
+  </style>
+
 <a href="https://www.linkedin.com/company/binbash">
-    For updates follow <strong>@Binbash</strong> on
-    <strong>LinkedIn</strong>
-</a>
+    For updates follow <strong style="color: #2a978d">@Binbash</strong> on
+    <span class="twemoji linkedin" style="color: #0e76a8">
+      {% include ".icons/fontawesome/brands/linkedin-in.svg" %}
+    </span>
+
+    <strong style="color: white">LinkedIn</strong>
+  </a>
+
 {% endblock %}