diff --git a/pelicanconf.py b/pelicanconf.py
index f8be4a9..77fec88 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -10,16 +10,17 @@ SITESUBTITLE = 'Code, Flying, Tech, Automation'
 SITEBASE = "/blog"
 
 
-MENUITEMS = [
-    #('Home', f'{SITEBASE}/'),
-    ('Tags', f'{SITEBASE}/tags.html'),
-    ('Categories', f'{SITEBASE}/categories.html'),
+MENU_INTERNAL_PAGES = [
+    ('Archive', 'archives.html', f'archives.html'),
+    ('Tags', 'tags.html', f'tags.html'),
+    ('Categories', 'categories.html', f'categories.html'),
 ]
-LINKS = (
+
+MENUITEMS = [
     ('My Code', 'https://gitea.tyrel.dev/tyrel'),
     ('Find Me', 'https://tyrel.dev/links'),
     ('Book Me', 'https://cal.com/tyrelsouza'),
-)
+]
 
 PATH = 'content'
 
@@ -36,9 +37,7 @@ AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
 
 FEED_ATOM = 'tyrel-dev.atom.xml'
-#FEED_RSS = 'tyrel-dev.rss'
 FEED_ALL_ATOM = 'tyrel-dev.all.xml'
-#FEED_ALL_RSS = 'tyrel-dev.all.rss'
 
 
 PLUGINS = ["webassets"]
@@ -70,6 +69,7 @@ SOCIAL = ()
 # THEME = "./themes/pelican-themes/gum"
 DISPLAY_PAGES_ON_MENU=True
 LANDING_PAGE_ABOUT=True
-THEME = pwd / "themes" / "solarized"
-THEME = pwd / "themes" / "waterspill-en"
 THEME = pwd / "themes" / "blue-penguin-dark"
+
+PAGINATED_TEMPLATES = {'index': 4, 'tag': 4, 'category': 4, 'author': None}
+DISPLAY_HOME = False
diff --git a/themes/blue-penguin-dark/templates/base.html b/themes/blue-penguin-dark/templates/base.html
index beca9ab..767c910 100644
--- a/themes/blue-penguin-dark/templates/base.html
+++ b/themes/blue-penguin-dark/templates/base.html
@@ -83,17 +83,17 @@
                 {% if DISPLAY_HOME or DISPLAY_HOME is not defined %}
                 <li{% if output_file == "index.html" %} class="selected"{% endif %}><a href="{{ SITEURL }}/">Home</a></li>
                 {% endif %}
+                {% for name, link, file in MENU_INTERNAL_PAGES %}
+                <li{% if output_file == file %} class="selected"{% endif %}><a href="{{ SITEURL }}/{{ link }}">{{ name }}</a></li>
+                {% endfor %}
+                {% for title, link in MENUITEMS %}
+                <li{% if output_file == file %} class="selected"{% endif %}><a href="{{ link }}">{{ title }}</a></li>
+                {% endfor %}
                 {% if DISPLAY_PAGES_ON_MENU %}
                 {% for p in pages %}
                 <li{% if p == page %} class="selected"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}">{{ p.title }}</a></li>
                 {% endfor %}
                 {% endif %}
-                {% for title, link in MENUITEMS %}
-                <li><a href="{{ link }}">{{ title }}</a></li>
-                {% endfor %}
-                {% for name, link, file in MENU_INTERNAL_PAGES %}
-                <li{% if output_file == file %} class="selected"{% endif %}><a href="{{ SITEURL }}/{{ link }}">{{ name }}</a></li>
-                {% endfor %}
             </ul>
         </nav>
         {% endif %}