diff --git a/README.md b/README.md
index e787f62..9bfbd35 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # k0r.386
 
-![k0r.386 screenshot](https://github.com/lopes/zola.386/blob/master/screenshot.png?raw=true)
+![k0r.386 screenshot](https://git.k0r.in/n/k0r.386/raw/branch/main/screenshot.png)
 
 ## [k0r.in](https://k0r.in/)
 
diff --git a/sass/site.scss b/sass/site.scss
index 0aca236..97bc76a 100644
--- a/sass/site.scss
+++ b/sass/site.scss
@@ -1,13 +1,13 @@
 // fixing font path
 @font-face {
-	font-family: 'DOS';
+	font-family: 'Fixed';
 	font-style: normal;
 	font-weight: normal;
 	src: local('☺'), url('./fonts/fixedsys.woff') format('woff');
 }
 
 :root {
-	font: 20px / 1.1 DOS;
+	font: 20px / 1.1 'Fixed';
 	background-color: #190084;
 	color: #BBB;
 }
@@ -49,12 +49,6 @@ body>nav li {
 	display: inline-block;
 }
 
-body>nav li:hover,
-body>nav li.active {
-	background-color: #000;
-	color: #BBB;
-}
-
 .container {
 	margin: auto;
 	max-width: 980px;
@@ -126,6 +120,14 @@ a {
 	box-shadow: 0 0 0 5px, 11px 13px 0 4px black;
 }
 
+.bg-error {
+	background-color: #B00;
+}
+
+.text-white {
+	color: white;
+}
+
 nav {
 	background: #BBB;
 	margin: 0 0 2rem;
@@ -152,12 +154,17 @@ nav>menu>li>a {
 	padding: 0 .5rem;
 }
 
-nav>menu>li>a {
+nav li:hover,
+nav li.active {
+	background-color: #000;
+	color: #BBB;
+}
+
+nav li>a {
 	color: black;
 }
 
-nav>menu>li>a:hover,
-nav>menu>li>a.active {
+nav li:hover>a,
+nav li.active>a {
 	color: #BBB;
-	background: black;
 }
\ No newline at end of file
diff --git a/screenshot.png b/screenshot.png
index ba6ba69..8bcc1ff 100644
Binary files a/screenshot.png and b/screenshot.png differ
diff --git a/templates/404.html b/templates/404.html
index 8056850..35681a5 100644
--- a/templates/404.html
+++ b/templates/404.html
@@ -2,18 +2,10 @@
 
 {% block title %}{{ config.title }} - 404{% endblock title %}
 
-{% block navbar %}
-{% for item in config.extra.menu_items %}
-<li>
-  <a href="{{ config.base_url }}/{{item.path}}"><span>{{ item.name }}</span></a>
-</li>
-{% endfor %}
-{% endblock %}
-
 {% block header %}
-<div class="alert alert-error navmargin">
-  <h1>404 - Not found</h1>
-</div>
+<header class="bg-error">
+  <h1 class="text-white">404 - Not found</h1>
+</header>
 {% endblock header %}
 
 {% block main %}
@@ -23,7 +15,8 @@
 </p>
 <p>
   <a href="{{ config.base_url }}" class="btn btn-info" role="button">Home</a>
-  <a href="{{ config.base_url }}/categories" class="btn btn-info" role="button">Categories</a>
-  <a href="{{ config.base_url }}/tags" class="btn btn-info" role="button">Tags</a>
 </p>
-{% endblock main %}
\ No newline at end of file
+{% endblock main %}
+
+{% block sidebar %}
+{% endblock sidebar %}
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index e9f34a4..cc526b0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -43,13 +43,13 @@
 
 <body>
   <main class="container">
+    {% block breadcrumb %}{% endblock breadcrumb %}
+    {% block header %}
     <header>
-      {% block breadcrumb %}{% endblock breadcrumb %}
-      {% block header %}
       <h1>{{ config.title }} <small>{{ config.description }}</small></h1>
-      {% endblock header %}
-      {% block meta %}{% endblock meta %}
     </header>
+    {% endblock header %}
+    {% block meta %}{% endblock meta %}
 
     <div class="flex-row gap">
 
@@ -71,11 +71,13 @@
           <header>{{ page.title }}</header>
           <menu>
             {% for item in page.items %}
-            {% if page.internal %}
-            <li><a href="{{ item.path }}">{{ item.name }}</a></li>
-            {% else %}
-            <li><a href="{{ item.path }}" target="_blank" rel="noopener">{{ item.name }}</a></li>
-            {% endif %}
+            <li class="{% if item.path == current_path %}active{% endif %}">
+              {% if page.internal %}
+              <a href="{{ item.path }}">{{ item.name }}</a>
+              {% else %}
+              <a href="{{ item.path }}" target="_blank" rel="noopener">{{ item.name }}</a>
+              {% endif %}
+            </li>
             {% endfor %}
           </menu>
         </nav>
@@ -92,24 +94,8 @@
     <p>
       {{ config.extra.year }} &copy;
       <a href="{{ config.base_url }}">{{ config.extra.author }}</a>
-      {% if config.extra.twitter_user or config.extra.linkedin_user or config.extra.github_user or
-      config.extra.gitlab_user %}
       |
-      {% endif %}
-      {% if config.extra.twitter_user %}
-      <a href="https://twitter.com/{{ config.extra.twitter_user }}" target="_blank">Twitter</a>
-      {% endif %}
-      {% if config.extra.linkedin_user %}
-      <a href="https://linkedin.com/in/{{ config.extra.linkedin_user }}" target="_blank">Linkedin</a>
-      {% endif %}
-      {% if config.extra.github_user %}
-      <a href="https://github.com/{{ config.extra.github_user }}" target="_blank">GitHub</a>
-      {% endif %}
-      {% if config.extra.gitlab_user %}
-      <a href="https://gitlab.com/{{ config.extra.gitlab_user }}" target="_blank">GitLab</a>
-      {% endif %}
-      |
-      Built on <a href="https://getzola.org" target="_blank">Zola</a>
+      Built on <a href="https://getzola.org" rel="noopener" target="_blank">Zola</a>
     </p>
   </footer>
 </body>
