diff --git a/dist/about.html b/dist/about.html
index 4dfddf2..91d2995 100644
--- a/dist/about.html
+++ b/dist/about.html
@@ -14,12 +14,21 @@
     <link type="text/plain" rel="author" href="humans.txt" />
     <link href="assets/images/favicon.png" rel="shortcut icon">
 
-
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 
     <link rel="stylesheet" href="assets/styles/main.css">
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
+    <script>
+      (function(h,o,t,j,a,r){
+          h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+          h._hjSettings={hjid:744957,hjsv:6};
+          a=o.getElementsByTagName('head')[0];
+          r=o.createElement('script');r.async=1;
+          r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+          a.appendChild(r);
+      })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+    </script>
 	</head>
 	<body>
 		<!--[if lt IE 10]>
diff --git a/dist/components/footer.html b/dist/components/footer.html
deleted file mode 100644
index a692b94..0000000
--- a/dist/components/footer.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!doctype html>
-<html class="no-js" lang="pt">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		<title></title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="format-detection" content="telephone=no">
-
-    <meta name="description" content="A Coderockr acredita que o desenvolvimento de software é uma arte, que deve ser feita com paixão e dedicação.">
-    <meta name="keywords" content="Coderockr, Desenvilvimento, Sistemas Web, Aplicativos Mobile, Big Data, Planrockr, Elton Minetto, Joinville.">
-
-    <link type="text/plain" rel="author" href="humans.txt" />
-    <link href="assets/images/favicon.png" rel="shortcut icon">
-
-
-    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-
-    <link rel="stylesheet" href="assets/styles/main.css">
-
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-	</head>
-	<body>
-		<!--[if lt IE 10]>
-			<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-		<![endif]-->
-
-		<footer id="footer">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-12">
-        <ul class="social">
-          <li><a href="https://www.facebook.com/coderockr" title="Curta a Coderockr no Facebook"><span class="icon-facebook"></span></a></li>
-          <li><a href="https://twitter.com/coderockr" title="Siga a Coderockr no Twitter" target="_blank"><span class="icon-twitter"></span></a></li>
-          <li><a href="https://www.youtube.com/user/coderockr" title="Acompahe a Coderockr no YouTube" target="_blank"><span class="icon-youtube"></span></a></li>
-          <li><a href="https://blog.coderockr.com" title="Leia sore a Coderockr no Medium" target="_blank"><span class="icon-medium"></span></a></li>
-          <li><a href="https://plus.google.com/+Coderockr" title="Acompahe a Coderockr no Google+" target="_blank"><span class="icon-google-plus"></span></a></li>
-          <li><a href="https://github.com/Coderockr" title="Acompahe a Coderockr no Github" target="_blank"><span class="icon-github"></span></a></li>
-        </ul>
-        <img src="assets/images/hand-white.svg" alt="Coderockr Logo" title="You Rock!" class="pull-right">
-        <div class="text">
-          <p>
-            +55 47 3227-6359 &nbsp;&nbsp;&nbsp;
-            contato@coderockr.com
-          </p>
-          <p class="copyright">© 2018 Coderockr. Todos os direitos reservados. &nbsp; Joinville - SC</p>
-        </div>
-      </div>
-    </div>
-  </div>
-</footer>
-
-		<div class="shadow-layer"></div>
-
-    <nav id="menu-mobile">
-      <div class="container">
-        <div class="row">
-          <ul>
-            <li><a href="index.html">Home</a></li>
-            <li><a href="index.html#what-we-do" data-autoscroll="true">O Que Fazemos</a></li>
-            <li><a href="about.html">Quem Somos</a></li>
-            <li><a href="index.html#products" title="Nossos Produtos" data-autoscroll="true">Produtos</a></li>
-            <li><a href="https://blog.coderockr.com" title="Blog Coderockr" target="_blank">Blog</a></li>
-            <li><a href="contact.html">Contato</a></li>
-          </ul>
-          <a href="#0" class="close-menu"><img src="assets/images/close.svg" alt="Close icon"></a>
-        </div>
-      </div>
-    </nav>
-
-    <script src="assets/scripts/main.js" async defer></script>
-  </body>
-</html>
diff --git a/dist/components/header.html b/dist/components/header.html
deleted file mode 100644
index 202e275..0000000
--- a/dist/components/header.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!doctype html>
-<html class="no-js" lang="pt">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		<title></title>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="format-detection" content="telephone=no">
-
-    <meta name="description" content="A Coderockr acredita que o desenvolvimento de software é uma arte, que deve ser feita com paixão e dedicação.">
-    <meta name="keywords" content="Coderockr, Desenvilvimento, Sistemas Web, Aplicativos Mobile, Big Data, Planrockr, Elton Minetto, Joinville.">
-
-    <link type="text/plain" rel="author" href="humans.txt" />
-    <link href="assets/images/favicon.png" rel="shortcut icon">
-
-
-    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
-
-    <link rel="stylesheet" href="assets/styles/main.css">
-
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
-	</head>
-	<body>
-		<!--[if lt IE 10]>
-			<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
-		<![endif]-->
-
-		<header id="header">
-  <div class="container">
-    <div class="row">
-      <div class="col-md-12 flex-row">
-        <a href="index.html" title="Coderockr" class="logo">
-          <img src="assets/images/coderockr.svg" alt="Coderockr Logo">
-        </a>
-        <nav>
-          <ul>
-            <li><a href="index.html" title="O que fazemos" data-autoscroll="true">O Que Fazemos</a></li>
-            <li><a href="about.html" title="Quem somos">Quem Somos</a></li>
-            <li><a href="index.html#products" title="Nossos Produtos" data-autoscroll="true">Produtos</a></li>
-            <li><a href="https://blog.coderockr.com" title="Blog Coderockr" target="_blank">Blog</a></li>
-            <li><a href="contact.html" title="Contato">Contato</a></li>
-          </ul>
-        </nav>
-        <a class="mobile hidden-md hidden-lg menu-trigger" href="#menu-mobile" title="Menu">
-          <img src="assets/images/menu.svg" alt="Menu icon">
-        </a>
-      </div>
-    </div>
-  </div>
-</header>
-
-		<div class="shadow-layer"></div>
-
-    <nav id="menu-mobile">
-      <div class="container">
-        <div class="row">
-          <ul>
-            <li><a href="index.html">Home</a></li>
-            <li><a href="index.html#what-we-do" data-autoscroll="true">O Que Fazemos</a></li>
-            <li><a href="about.html">Quem Somos</a></li>
-            <li><a href="index.html#products" title="Nossos Produtos" data-autoscroll="true">Produtos</a></li>
-            <li><a href="https://blog.coderockr.com" title="Blog Coderockr" target="_blank">Blog</a></li>
-            <li><a href="contact.html">Contato</a></li>
-          </ul>
-          <a href="#0" class="close-menu"><img src="assets/images/close.svg" alt="Close icon"></a>
-        </div>
-      </div>
-    </nav>
-
-    <script src="assets/scripts/main.js" async defer></script>
-  </body>
-</html>
diff --git a/dist/contact.html b/dist/contact.html
index 20df7dc..3588229 100644
--- a/dist/contact.html
+++ b/dist/contact.html
@@ -14,12 +14,21 @@
     <link type="text/plain" rel="author" href="humans.txt" />
     <link href="assets/images/favicon.png" rel="shortcut icon">
 
-
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 
     <link rel="stylesheet" href="assets/styles/main.css">
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
+    <script>
+      (function(h,o,t,j,a,r){
+          h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+          h._hjSettings={hjid:744957,hjsv:6};
+          a=o.getElementsByTagName('head')[0];
+          r=o.createElement('script');r.async=1;
+          r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+          a.appendChild(r);
+      })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+    </script>
 	</head>
 	<body>
 		<!--[if lt IE 10]>
diff --git a/dist/index.html b/dist/index.html
index f2838ec..49b37b8 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -14,12 +14,21 @@
     <link type="text/plain" rel="author" href="humans.txt" />
     <link href="assets/images/favicon.png" rel="shortcut icon">
 
-
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 
     <link rel="stylesheet" href="assets/styles/main.css">
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
+    <script>
+      (function(h,o,t,j,a,r){
+          h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+          h._hjSettings={hjid:744957,hjsv:6};
+          a=o.getElementsByTagName('head')[0];
+          r=o.createElement('script');r.async=1;
+          r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+          a.appendChild(r);
+      })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+    </script>
 	</head>
 	<body>
 		<!--[if lt IE 10]>
diff --git a/gulpfile.js b/gulpfile.js
index 5415f0e..7cfe578 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -56,6 +56,9 @@ const config = {
 // clean
 gulp.task('clean', del.bind(null, ['dist']));
 
+// postclean
+gulp.task('postclean', del.bind(null, ['dist/components']));
+
 // templates
 gulp.task('templates', (done) => {
   assemble({
@@ -213,6 +216,7 @@ gulp.task('default', ['clean'], () => {
     'images',
     'fonts',
     'data',
+    'postclean',
   ];
 
   // run build
diff --git a/src/templates/layouts/default.html b/src/templates/layouts/default.html
index 3f74c0c..117b271 100644
--- a/src/templates/layouts/default.html
+++ b/src/templates/layouts/default.html
@@ -14,12 +14,21 @@
     <link type="text/plain" rel="author" href="humans.txt" />
     <link href="assets/images/favicon.png" rel="shortcut icon">
 
-
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
 
     <link rel="stylesheet" href="assets/styles/main.css">
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
+    <script>
+      (function(h,o,t,j,a,r){
+          h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+          h._hjSettings={hjid:744957,hjsv:6};
+          a=o.getElementsByTagName('head')[0];
+          r=o.createElement('script');r.async=1;
+          r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+          a.appendChild(r);
+      })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+    </script>
 	</head>
 	<body>
 		<!--[if lt IE 10]>
