diff --git a/themes/DeepThought/templates/base.html b/themes/DeepThought/templates/base.html
index 79b92de..0ce125e 100644
--- a/themes/DeepThought/templates/base.html
+++ b/themes/DeepThought/templates/base.html
@@ -44,7 +44,12 @@
   <nav aria-label="section navigation" class="navbar is-light" role="navigation">
     <div class="container">
       <div class="navbar-brand">
-        <a class="navbar-item is-size-5 has-text-weight-bold" href="{{get_url(path="", lang=lang)}}/">{{ config.title }}</a>
+      {% if lang == 'en' %}
+      <a class="navbar-item is-size-5 has-text-weight-bold" href="/">{{ config.title }}</a>
+      {% endif %}
+      {% if lang != 'en' %}
+      <a class="navbar-item is-size-5 has-text-weight-bold" href="/{{lang}}/">{{ config.title }}</a>
+      {% endif %}
         <a aria-expanded="false" aria-label="menu" class="navbar-burger burger" data-target="navMenu" role="button">
           <span aria-hidden="true"></span>
           <span aria-hidden="true"></span>
@@ -62,7 +67,12 @@
           {% endfor %}
           {% endif %}
           {% endfor %}
-	  <a class="navbar-item" id="nav-search" title="{{ trans(key="search", lang=lang) }}" href="{{get_url(path="", lang=lang)}}/search" target="_blank" rel="noopener noreferrer">
+      	  {% if lang == 'en' %}
+	  <a class="navbar-item" id="nav-search" title="{{ trans(key="search", lang=lang) }}" href="/search" target="_blank" rel="noopener noreferrer">
+          {% endif %}
+          {% if lang != 'en' %}
+	  <a class="navbar-item" id="nav-search" title="{{ trans(key="search", lang=lang) }}" href="/{{lang}}/search" target="_blank" rel="noopener noreferrer">
+          {% endif %}
             <span class="icon is-small">
 	      <img src="/images/search.png">
             </span>
@@ -125,7 +135,12 @@
     <div class="content has-text-centered">
       <p>
       <a class="footer-text" href="https://0xacab.org/anarsec/anarsec.guide/-/blob/no-masters/CHANGELOG.md">Changelog    </a>
-      <a href="{{get_url(path="", lang=lang)}}/atom.xml" target="_blank">
+      {% if lang == 'en' %}
+      <a href="/atom.xml" target="_blank">
+      {% endif %}
+      {% if lang != 'en' %}
+      <a href="/{{lang}}/atom.xml" target="_blank">
+      {% endif %}
       <span class="icon" title="RSS Feed">
       <img src="/images/rss-symbol.png">
       </span>
diff --git a/themes/DeepThought/templates/categories/list.html b/themes/DeepThought/templates/categories/list.html
index 0367668..eb0cb35 100644
--- a/themes/DeepThought/templates/categories/list.html
+++ b/themes/DeepThought/templates/categories/list.html
@@ -12,7 +12,12 @@
       </h1>
       <p>
         {% for category in terms %}
-	  <a href="{{get_url(path="", lang=lang)}}/categories/{{category.name | lower}}" class="mr-4">
+          {% if lang == 'en' %}
+	  <a href="/categories/{{category.name | lower}}" class="mr-4">
+          {% endif %}
+          {% if lang != 'en' %}
+	  <a href="/{{lang}}/categories/{{category.name | lower}}" class="mr-4">
+          {% endif %}
           <span class="icon is-small">
             <img src="/images/cube.png">
           </span>
diff --git a/themes/DeepThought/templates/macros.html b/themes/DeepThought/templates/macros.html
index b91da07..5aac007 100644
--- a/themes/DeepThought/templates/macros.html
+++ b/themes/DeepThought/templates/macros.html
@@ -80,7 +80,7 @@
 	  <span><a href="/posts/{{page.slug | lower}}/{{page.extra.letter | lower}}">{{ trans(key="letter", lang=lang) }}</a> | <a href="/posts/{{page.slug | lower}}/{{page.extra.a4 | lower}}">{{ trans(key="a4", lang=lang) }}</a> </span>
   {% endif %}
   {% if lang != 'en' %}
-  <span><a href="/{{get_url(path="", lang=lang)}}/posts/{{page.slug | lower}}/{{page.extra.letter | lower}}">{{ trans(key="letter", lang=lang) }}</a> | <a href="/{{get_url(path="", lang=lang)}}/posts/{{page.slug | lower}}/{{page.extra.a4 | lower}}">{{ trans(key="a4", lang=lang) }}</a> </span>
+  <span><a href="/{{lang}}/posts/{{page.slug | lower}}/{{page.extra.letter | lower}}">{{ trans(key="letter", lang=lang) }}</a> | <a href="/{{lang}}/posts/{{page.slug | lower}}/{{page.extra.a4 | lower}}">{{ trans(key="a4", lang=lang) }}</a> </span>
   {% endif %}
 </span>
 
@@ -89,7 +89,12 @@
 <p>
   {{ trans(key="categories", lang=lang) }}:
   {% for category in categories %}
-	  <a class="has-text-weight-semibold" href="{{get_url(path="", lang=lang)}}/categories/{{category | lower}}">
+      {% if lang == 'en' %}
+      <a class="has-text-weight-semibold" href="/categories/{{category | lower}}">
+      {% endif %}
+      {% if lang != 'en' %}
+      <a class="has-text-weight-semibold" href="/{{lang}}/categories/{{category | lower}}">
+      {% endif %}
     <span class="icon-text">
       <span class="icon is-small">
         <img src="/images/cube-pink.png">
@@ -107,7 +112,12 @@
 <p>
   {{ trans(key="tags", lang=lang) }}:
   {% for tag in tags %}
-	  <a class="has-text-weight-semibold" href="{{get_url(path="", lang=lang)}}/tags/{{tag | lower}}">
+      {% if lang == 'en' %}
+      <a class="has-text-weight-semibold" href="/tags/{{tag | lower}}">
+      {% endif %}
+      {% if lang != 'en' %}
+      <a class="has-text-weight-semibold" href="/{{lang}}/tags/{{tag | lower}}">
+      {% endif %}
     <span class="icon-text">
       <span class="icon is-small">
         <img src="/images/tag-pink.png">
diff --git a/themes/DeepThought/templates/tags/list.html b/themes/DeepThought/templates/tags/list.html
index 1ae14b0..046d081 100644
--- a/themes/DeepThought/templates/tags/list.html
+++ b/themes/DeepThought/templates/tags/list.html
@@ -12,7 +12,12 @@
       </h1>
       <p>
         {% for tag in terms %}
-		<a href="{{get_url(path="", lang=lang)}}/tags/{{tag.name | lower}}" class="mr-4">
+          {% if lang == 'en' %}
+	  <a href="/tags/{{tag.name | lower}}" class="mr-4">
+          {% endif %}
+          {% if lang != 'en' %}
+	  <a href="/{{lang}}/tags/{{tag.name | lower}}" class="mr-4">
+          {% endif %}
           <span class="icon is-small">
             <img src="/images/tag.png">
           </span>