diff --git a/_config.yml b/_config.yml
index 8ad7eed..a2d8ee5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,11 @@
-theme: jekyll-theme-architect
+# theme: jekyll-theme-architect
+# GitHub Stars: https://github.com/dawidolko/Website-Templates
+# icon: logo.png
+favicon: "logo.png"
+title: 170 HTML5 Website Templates - free editable templates
+description: 170 HTML5 Website Templates - free editable templates
 GitHub Stars: https://github.com/dawidolko/Website-Templates
 icon: logo.png
 favicon: "logo.png"
+show_downloads: true
+theme: jekyll-theme-midnight
diff --git a/_includes/head-custom-google-analytics.html b/_includes/head-custom-google-analytics.html
new file mode 100644
index 0000000..8a3ae5c
--- /dev/null
+++ b/_includes/head-custom-google-analytics.html
@@ -0,0 +1,10 @@
+{% if site.google_analytics %}
+  <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', '{{ site.google_analytics }}', 'auto');
+    ga('send', 'pageview');
+  </script>
+{% endif %}
diff --git a/_includes/head-custom-theme-colors.html b/_includes/head-custom-theme-colors.html
new file mode 100644
index 0000000..856cb35
--- /dev/null
+++ b/_includes/head-custom-theme-colors.html
@@ -0,0 +1,5 @@
+<!-- start theme color meta headers -->
+<meta name="theme-color" content="#353535">
+<meta name="msapplication-navbutton-color" content="#353535">
+<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+<!-- end theme color meta headers -->
diff --git a/_includes/head-custom.html b/_includes/head-custom.html
new file mode 100644
index 0000000..44cdb83
--- /dev/null
+++ b/_includes/head-custom.html
@@ -0,0 +1,12 @@
+<!-- start custom head snippets, customize with your own _includes/head-custom.html file -->
+
+<!-- Setup theme-color -->
+{% include head-custom-theme-colors.html %}
+
+<!-- Setup Google Analytics -->
+{% include head-custom-google-analytics.html %}
+
+<!-- You can set your favicon here -->
+<!-- link rel="shortcut icon" type="image/x-icon" href="{{ '/favicon.ico' | relative_url }}" -->
+
+<!-- end custom head snippets -->
diff --git a/_layouts/default.html b/_layouts/default.html
index 97a1608..12aba36 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,66 +1,54 @@
-<!DOCTYPE html>
-<html lang="{{ site.lang | default: "en-US" }}">
-  <head>
-    <title>Website Templates</title>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}" media="screen" type="text/css">
-    <link rel="stylesheet" href="{{ '/assets/css/print.css' | relative_url }}" media="print" type="text/css">
-    <link rel="icon" type="image/png" href="logo.png">
-    <base href="https://templateswebsite.dawidolko.pl/">
-
-    <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <![endif]-->
-
-{% seo %}
-
-    {% include head-custom.html %}
-  </head>
-
-  <body>
-    <header>
-      <div class="inner">
-        <a href="{{ '/' | absolute_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-        {% if site.github.is_project_page %}
-          <a href="{{ site.github.repository_url }}" class="button"><small>View project on</small> GitHub</a>
-        {% endif %}
-        {% if site.github.is_user_page %}
-          <a href="{{ site.github.owner_url }}" class="button"><small>Follow me on</small> GitHub</a>
-        {% endif %}
-      </div>
-    </header>
-
-    <div id="content-wrapper">
-      <div class="inner clearfix">
-        <section id="main-content">
-          {{ content }}
-        </section>
-
-        <aside id="sidebar">
-          {% if site.show_downloads %}
-            <a href="{{ site.github.zip_url }}" class="button">
-              <small>Download</small>
-              .zip file
-            </a>
-            <a href="{{ site.github.tar_url }}" class="button">
-              <small>Download</small>
-              .tar.gz file
-            </a>
-          {% endif %}
-
-          {% if site.github.is_project_page %}
-            <p class="repo-owner"><a href="{{ site.github.repository_url }}">{{ site.github.repository_name }}</a> is maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a>.</p>
-          {% endif %}
-
-          <p>My main website: <a href="https://dawidolko.pl">dawidolko.pl</a>.</p>
-        </aside>
-      </div>
-    </div>
-
-  </body>
-</html>
+<!doctype html>
+    <html lang="{{ site.lang | default: "en-US" }}">
+      <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    
+    {% seo %}
+        <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
+        <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
+        <script src="{{ '/assets/js/respond.js' | relative_url }}"></script>
+        <title>Website Templates</title>
+        <link rel="icon" type="image/png" href="logo.png">
+        <!--[if lt IE 9]>
+          <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+        <![endif]-->
+        <!--[if lt IE 8]>
+        <link rel="stylesheet" href="{{ '/assets/css/ie.css' | relative_url }}">
+        <![endif]-->
+        <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+        {% include head-custom.html %}
+      </head>
+      <body>
+          <div id="header">
+            <nav>
+              <ul>
+                <li class="fork"><a href="{{ site.github.repository_url }}">View On GitHub</a></li>
+                {% if site.show_downloads %}
+                  <li class="downloads"><a href="{{ site.github.zip_url }}">ZIP</a></li>
+                  <li class="downloads"><a href="{{ site.github.tar_url }}">TAR</a></li>
+                  <li class="title">DOWNLOADS</li>
+                {% endif %}
+              </ul>
+            </nav>
+          </div><!-- end header -->
+    
+        <div class="wrapper">
+    
+          <section>
+            <div id="title">
+              <h1>{{ site.title | default: site.github.repository_name }}</h1>
+              <p>{{ site.description | default: site.github.project_tagline }}</p>
+              <hr>
+              <span class="credits left">Project maintained by <a href="{{ site.github.owner_url }}">{{ site.github.owner_name }}</a></span>
+              <span class="credits right">Hosted on GitHub Pages &mdash; Theme by <a href="https://twitter.com/dawidolko">dawidolko</a></span>
+            </div>
+    
+            {{ content }}
+    
+          </section>
+    
+        </div>
+      </body>
+    </html>
+    
\ No newline at end of file
