diff --git a/404.md b/404.md
index 668dd59..fce6c7e 100644
--- a/404.md
+++ b/404.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: 404
 title: Not Found
 exclude: true
 permalink: /404.html
diff --git a/_includes/footer404.html b/_includes/footer404.html
new file mode 100644
index 0000000..d8df263
--- /dev/null
+++ b/_includes/footer404.html
@@ -0,0 +1,40 @@
+<footer class="site-footer">
+
+  <div class="wrapper">
+    <p class="text">&copy; 2014 to 2018 Team Win LLC.<br>Use of this site constitutes agreement to our <a href="https://twrp.me/terms/termsofservice.html">Terms of Service</a> and our <a href="https://twrp.me/terms/cookiepolicy.html">use of cookies</a></p>
+    <div class="footer-col-wrapper">
+
+      <div class="footer-col  footer-col-2">
+        <ul class="social-media-list">
+          {% if site.github_username %}
+          <li>
+            <a href="https://github.com/{{ site.github_username }}">
+              <span class="icon  icon--github">
+                <svg viewBox="0 0 16 16">
+                  <path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
+                </svg>
+              </span>
+
+              <span class="username">{{ site.github_username }}</span>
+            </a>
+          </li>
+          {% endif %}
+
+          <li>
+            <a href="https://plus.google.com/communities/106804207647688456928">
+
+              <span class="username">TWRP on G+</span>
+            </a>
+          </li>
+        </ul>
+      </div>
+
+      <div class="footer-col  footer-col-3">
+        <p class="text">{{ site.description }}</p>
+      </div>
+    </div>
+
+
+  </div>
+
+</footer>
diff --git a/_includes/header404.html b/_includes/header404.html
new file mode 100644
index 0000000..8c851d7
--- /dev/null
+++ b/_includes/header404.html
@@ -0,0 +1,17 @@
+<header>
+<div class="wrapper">
+
+      <div class="trigger">
+        {% for page in site.pages %}
+	  {% unless page.exclude %}
+          {% if page.title %}
+          <a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
+          {% endif %}
+	  {% endunless %}
+        {% endfor %}
+      </div>
+    </nav>
+
+  </div>
+
+</header>
diff --git a/_layouts/404.html b/_layouts/404.html
new file mode 100644
index 0000000..704c257
--- /dev/null
+++ b/_layouts/404.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+
+  {% include head.html %}
+
+  <body>
+
+    {% include header404.html %}
+
+    <div class="page-content">
+      <div class="wrapper">
+        {{ content }}
+      </div>
+    </div>
+
+    {% include footer404.html %}
+
+  </body>
+
+</html>