diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000000..dd84ea7824f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
new file mode 100644
index 00000000000..48d5f81fa42
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000000..bbcbbe7d615
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000000..034e8480320
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.
diff --git a/_config.yml b/_config.yml
index c5cf3fdc785..42fc43c0b0b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,5 +1,10 @@
-title: Hacker theme
-description: Hacker is a theme for GitHub Pages.
+remote_theme: pages-themes/hacker@master
+plugins:
+- jekyll-remote-theme
+title: Modern Hacker theme
+description: Modern Hacker is a theme for GitHub Pages.
+theme: jekyll-theme-modern-hacker
 show_downloads: true
-google_analytics:
-theme: jekyll-theme-hacker
\ No newline at end of file
+google:
+  tag_manager:
+  analytics:
diff --git a/_includes/body-custom-google-tag-manager.html b/_includes/body-custom-google-tag-manager.html
new file mode 100644
index 00000000000..6a939f76862
--- /dev/null
+++ b/_includes/body-custom-google-tag-manager.html
@@ -0,0 +1,6 @@
+{% if site.google.tag_manager %}
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ site.google.tag_manager }}" height="0" width="0"
+                style="display:none;visibility:hidden"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
+{% endif %}
diff --git a/_includes/body-custom.html b/_includes/body-custom.html
new file mode 100644
index 00000000000..fe517eea35a
--- /dev/null
+++ b/_includes/body-custom.html
@@ -0,0 +1,6 @@
+<!-- start custom body snippets, customize with your own _includes/body-custom.html file -->
+
+<!-- Setup Google Tag Manager -->
+{% include body-custom-google-tag-manager.html %}
+
+<!-- end custom body snippets -->
diff --git a/_includes/head-custom-google-analytics.html b/_includes/head-custom-google-analytics.html
index 8a3ae5c9ca1..af6f64aceeb 100644
--- a/_includes/head-custom-google-analytics.html
+++ b/_includes/head-custom-google-analytics.html
@@ -1,10 +1,9 @@
-{% 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>
+{% if site.google.analytics %}
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google.analytics }}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag() { dataLayer.push(arguments); }
+  gtag('js', new Date());
+  gtag('config', '{{ site.google.analytics }}');</script>
 {% endif %}
diff --git a/_includes/head-custom-google-tag-manager.html b/_includes/head-custom-google-tag-manager.html
new file mode 100644
index 00000000000..44b1110d40f
--- /dev/null
+++ b/_includes/head-custom-google-tag-manager.html
@@ -0,0 +1,13 @@
+{% if site.google.tag_manager %}
+<!-- Google Tag Manager -->
+<script>(function (w, d, s, l, i) {
+    w[l] = w[l] || []; w[l].push({
+      'gtm.start':
+        new Date().getTime(), event: 'gtm.js'
+    }); var f = d.getElementsByTagName(s)[0],
+      j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
+        'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+  })(window, document, 'script', 'dataLayer', '{{ site.google.tag_manager }}');
+</script>
+<!-- End Google Tag Manager -->
+{% endif %}
diff --git a/_includes/head-custom.html b/_includes/head-custom.html
index 44cdb83f523..d0237cc5ece 100644
--- a/_includes/head-custom.html
+++ b/_includes/head-custom.html
@@ -1,12 +1,14 @@
 <!-- start custom head snippets, customize with your own _includes/head-custom.html file -->
 
+<!-- Setup Google Tag Manager -->
+{% include head-custom-google-tag-manager.html %}
+
 <!-- 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 }}" -->
 
+<!-- Setup Google Analytics -->
+{% include head-custom-google-analytics.html %}
 <!-- end custom head snippets -->
diff --git a/_layouts/default.html b/_layouts/default.html
index 1c8c883a480..a474e2fb233 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,38 +1,39 @@
 <!DOCTYPE html>
-<html lang="{{ site.lang | default: "en-US" }}">
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
-    {% include head-custom.html %}
+<html lang="{{ site.lang | default: " en-US" }}">
 
-{% seo %}
-  </head>
-
-  <body>
-
-    <header>
-      <div class="container">
-        <a id="a-title" href="{{ '/' | relative_url }}">
-          <h1>{{ site.title | default: site.github.repository_name }}</h1>
-        </a>
-        <h2>{{ site.description | default: site.github.project_tagline }}</h2>
-
-        <section id="downloads">
-          {% if site.show_downloads %}
-            <a href="{{ site.github.zip_url }}" class="btn">Download as .zip</a>
-            <a href="{{ site.github.tar_url }}" class="btn">Download as .tar.gz</a>
-          {% endif %}
-          <a href="{{ site.github.repository_url }}" class="btn btn-github"><span class="icon"></span>View on GitHub</a>
-        </section>
-      </div>
-    </header>
+<head>
+  <meta charset='utf-8'>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
+  {% include head-custom.html %}
+  {% seo %}
+</head>
 
+<body>
+  {% include body-custom.html %}
+  <header>
     <div class="container">
-      <section id="main_content">
-        {{ content }}
+      <a id="a-title" href="{{ '/' | relative_url }}">
+        <h1>{{ site.title | default: site.github.repository_name }}</h1>
+      </a>
+      <h2>{{ site.description | default: site.github.project_tagline }}</h2>
+
+      <section id="downloads">
+        {% if site.show_downloads %}
+        <a href="{{ site.github.zip_url }}" class="btn">Download as .zip</a>
+        <a href="{{ site.github.tar_url }}" class="btn">Download as .tar.gz</a>
+        {% endif %}
+        <a href="{{ site.github.repository_url }}" class="btn btn-github"><span class="icon"></span>View on GitHub</a>
       </section>
     </div>
-  </body>
+  </header>
+
+  <div class="container">
+    <section id="main_content">
+      {{ content }}
+    </section>
+  </div>
+</body>
+
 </html>