diff --git a/gawa/blog/templates/blog/featured.html b/gawa/blog/templates/blog/featured.html
new file mode 100644
index 0000000..2437058
--- /dev/null
+++ b/gawa/blog/templates/blog/featured.html
@@ -0,0 +1,88 @@
+{% load i18n %}
+
-
+
{% translate "Writeups" %}
{% blocktranslate %}
@@ -21,24 +21,29 @@
{% endblocktranslate %}
-
+
{% translate "Open Source" %}
{% blocktranslate %}
If something comes up, I may post Linux guides or my thoughts on current processes here.
{% endblocktranslate %}
-
+
{% translate "Selfhosting" %}
{% blocktranslate %}
Selfhosting is something that I'm really fond of. There will be guides and thoughts about that too
{% endblocktranslate %}
-
+
{% translate "Anything Really" %}
{% blocktranslate %}
This is my personal Blog after all, I will put here whatever I want and you can't stop me.
{% endblocktranslate %}
+
+
{% translate "Looking for anything specific?" %}
+ {% include 'main_search_form.html' %}
+
+ {% include 'blog/featured.html' %}
{% endblock main %}
diff --git a/gawa/blog/templates/blog/nav.html b/gawa/blog/templates/blog/nav.html
index 8be33c3..d817b2f 100644
--- a/gawa/blog/templates/blog/nav.html
+++ b/gawa/blog/templates/blog/nav.html
@@ -43,38 +43,10 @@
-
-
+ {% include 'dark_light_switch.html' %}
- {% block MainSearchFormSpace %}
-
- {% endblock MainSearchFormSpace %}
+ {% include 'main_search_form.html' %}
diff --git a/gawa/start/templates/main_search_form.html b/gawa/start/templates/main_search_form.html
new file mode 100644
index 0000000..671241c
--- /dev/null
+++ b/gawa/start/templates/main_search_form.html
@@ -0,0 +1,6 @@
+{% load i18n %}
+
diff --git a/gawa/start/templates/start/mainsearch_snippet.html b/gawa/start/templates/start/mainsearch_snippet.html
deleted file mode 100644
index e69de29..0000000
diff --git a/gawa/start/templates/start/nav.html b/gawa/start/templates/start/nav.html
index 338826c..32bd6b8 100644
--- a/gawa/start/templates/start/nav.html
+++ b/gawa/start/templates/start/nav.html
@@ -43,38 +43,31 @@
-
-
+ {% include 'dark_light_switch.html' %}
- {% block MainSearchFormSpace %}
-
- {% endblock MainSearchFormSpace %}
+ {% include 'main_search_form.html' %}
+
diff --git a/gawa/start/templates/start/search.html b/gawa/start/templates/start/search.html
index b296968..ef63f8d 100644
--- a/gawa/start/templates/start/search.html
+++ b/gawa/start/templates/start/search.html
@@ -1,4 +1,4 @@
-{% extends 'start/base.html' %}
+{% extends 'base.html' %}
{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}
{% block languagecode %}{{ LANGUAGE_CODE }}{% endblock languagecode %}