diff --git a/CHANGELOG.md b/CHANGELOG.md
index abec584..91ea769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,25 @@
 Below is a detailed change-log, along with specific tasks completed, for each
 version released to date.
 
+## Version 1.2.0 (15/09/2018)
+
+- [#enhancement](#enhancement)
+    - Added meta-tag for `humans.txt` file. Actually a bug, but it's now added.
+- [#new](#new)
+    - Added Font Awesome to all the templates.
+- [#bugfix](#bugfix)
+    - Fixed bug where Font Awesome wasn't appearing in markup.
+
+## Version 1.1.0 (15/09/2018)
+
+- [#new](#new)
+    - Added Font Awesome icon library.
+- [#bugfix](#bugfix)
+    - Fixed bug in spacing in humans.txt.
+- [#enhancement](#enhancement)
+    - Removed the Bootstrap SVG icons from the project folder. Using the raw svg
+      markup in templates.
+
 ## Version 1.0.0 (15/09/2018)
 
 - [#enhancement](#enhancement)
diff --git a/templates/blog/index.html b/templates/blog/index.html
index 64429e5..035fc26 100755
--- a/templates/blog/index.html
+++ b/templates/blog/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <link href="https://fonts.googleapis.com/css?family=Playfair+Display:700,900" rel="stylesheet">
     <!-- @stylesheet blog -->
 </head>
diff --git a/templates/carousel/index.html b/templates/carousel/index.html
index dcd7af2..fe5ab14 100755
--- a/templates/carousel/index.html
+++ b/templates/carousel/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet carousel -->
 </head>
 
diff --git a/templates/checkout/index.html b/templates/checkout/index.html
index 5211e7a..35934a6 100755
--- a/templates/checkout/index.html
+++ b/templates/checkout/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet form-validation -->
 </head>
 
diff --git a/templates/cover/index.html b/templates/cover/index.html
index 856baab..6c16034 100755
--- a/templates/cover/index.html
+++ b/templates/cover/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet cover -->
 </head>
 
diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html
index 0cb86a0..cc4aa81 100755
--- a/templates/dashboard/index.html
+++ b/templates/dashboard/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet dashboard -->
 </head>
 
@@ -317,7 +318,6 @@ <h2>Section title</h2>
             }
         });
     </script>
-    
 <!-- @if @googleAnalytics -->
     <!-- @if @googleAnalyticsSiteID --><!-- Google Analytics --><!-- @else --><!-- Google Analytics: change UA-XXXXX-Y to be your site's ID. --><!-- @end if-->
     <script>
diff --git a/templates/floating/index.html b/templates/floating/index.html
index b318b94..e329f20 100755
--- a/templates/floating/index.html
+++ b/templates/floating/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet floating-labels -->
 </head>
 
diff --git a/templates/grid/index.html b/templates/grid/index.html
index d65d60e..40b26c5 100755
--- a/templates/grid/index.html
+++ b/templates/grid/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet grid -->
 </head>
 
diff --git a/templates/jumbotron/index.html b/templates/jumbotron/index.html
index dd15664..b3c1c11 100755
--- a/templates/jumbotron/index.html
+++ b/templates/jumbotron/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet jumbotron -->
 </head>
 
diff --git a/templates/navbarbottom/index.html b/templates/navbarbottom/index.html
index 52ed828..079e16e 100755
--- a/templates/navbarbottom/index.html
+++ b/templates/navbarbottom/index.html
@@ -9,19 +9,21 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
 </head>
 
 <body>
diff --git a/templates/navbarfixed/index.html b/templates/navbarfixed/index.html
index 3a67b0a..2598fd0 100755
--- a/templates/navbarfixed/index.html
+++ b/templates/navbarfixed/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet navbar-top-fixed -->
 </head>
 
diff --git a/templates/navbars/index.html b/templates/navbars/index.html
index fe7b971..8300e65 100755
--- a/templates/navbars/index.html
+++ b/templates/navbars/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet navbar -->
 </head>
 
diff --git a/templates/navbarstatic/index.html b/templates/navbarstatic/index.html
index c685d3b..7a4272b 100755
--- a/templates/navbarstatic/index.html
+++ b/templates/navbarstatic/index.html
@@ -8,21 +8,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet navbar-top -->
   </head>
 
diff --git a/templates/offcanvas/index.html b/templates/offcanvas/index.html
index 7cda193..2fae770 100755
--- a/templates/offcanvas/index.html
+++ b/templates/offcanvas/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet offcanvas -->
 </head>
 
diff --git a/templates/pricing/index.html b/templates/pricing/index.html
index 52cf1b8..915fac9 100755
--- a/templates/pricing/index.html
+++ b/templates/pricing/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet pricing -->
 </head>
 
diff --git a/templates/product/index.html b/templates/product/index.html
index 148e3af..8e553d1 100755
--- a/templates/product/index.html
+++ b/templates/product/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet product -->
 </head>
 
diff --git a/templates/signin/index.html b/templates/signin/index.html
index 68b3a9d..ef3480c 100755
--- a/templates/signin/index.html
+++ b/templates/signin/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet signin -->
 </head>
 
diff --git a/templates/starter/index.html b/templates/starter/index.html
index f294da8..d5dfdf2 100755
--- a/templates/starter/index.html
+++ b/templates/starter/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet starter-template -->
 </head>
 
diff --git a/templates/sticky/index.html b/templates/sticky/index.html
index fa66956..39195fe 100755
--- a/templates/sticky/index.html
+++ b/templates/sticky/index.html
@@ -9,21 +9,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
-    <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
-    <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
+<!-- @if @ieTags -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet sticky-footer -->
 </head>
 
diff --git a/templates/stickynav/index.html b/templates/stickynav/index.html
index ef586ff..5412a1f 100755
--- a/templates/stickynav/index.html
+++ b/templates/stickynav/index.html
@@ -8,21 +8,22 @@
     <meta name="description" content="">
     <meta name="author" content="">
     <link rel="icon" href="favicon.ico">
-    <link rel="manifest" href="manifest.json"> <!-- For Android Devices -->
-    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile -->
-    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS -->
-    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari -->
+    <link rel="manifest" href="manifest.json"> <!-- For Android Devices. -->
+    <meta name="msapplication-config" content="browserconfig.xml"> <!-- For Windows and Microsoft Mobile. -->
+    <link rel="apple-touch-icon" href="img/favicons/apple-touch-icon.png"> <!-- For Apple iOS. -->
+    <link rel="mask-icon" href="img/favicons/safari-pinned-tab.svg" color="#563d7c"> <!-- For Safari. -->
+<!-- @if @serverExtras -->
+    <link rel="author" href="humans.txt" /> <!-- Link to humans.txt file. -->
+<!-- @end if -->
 <!-- @if @ieTags -->
-    <!-- @stylesheet browser-upgrade -->
+    <!-- @stylesheet browser-upgrade --> <!-- Browser Upgrade Notice CSS. -->
 <!-- @end if -->
-
-    <!-- Bootstrap core CSS -->
-    <!-- @stylesheet bootstrap.min -->
-
-    <!-- Add custom styles here -->
-    <!-- @stylesheet styles -->
-
-    <!-- Custom styles for this template -->
+    <!-- @stylesheet bootstrap.min --> <!-- Bootstrap core CSS. -->
+<!-- @if @fontAwesome -->
+    <!-- @stylesheet fontawesome-all.min --> <!-- Font Awesome all CSS. -->
+<!-- @end if -->
+    <!-- @stylesheet styles --> <!-- Add your custom styles here. -->
+    <!-- Custom styles for this template. -->
     <!-- @stylesheet sticky-footer-navbar -->
   </head>