diff --git a/templates/page.html b/templates/page.html
index c20e930..4c62e49 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -111,6 +111,17 @@ Current section extra: {% if current_section %}{{ current_section.extra | json_e
             {{ page.title }}
         </h1>
 
+		<ul class="language-switcher">
+			{% for trans in page.translations %}
+				<ol>
+					<a href="{{ trans.permalink }}" lang="{{ trans.lang }}">
+						{{ config.extra.languages[trans.lang] | default(value=trans.lang) }}
+					</a>
+				</ol>
+			{% endfor %}
+		</ul>
+
+
         <ul class="meta">
             {#- Draft indicator -#}
             {% if page.draft %}
diff --git a/templates/partials/language_switcher.html b/templates/partials/language_switcher.html
index 83cf61f..ecea22d 100644
--- a/templates/partials/language_switcher.html
+++ b/templates/partials/language_switcher.html
@@ -36,3 +36,13 @@
         </div>
     </details>
 </li>
+
+    <ul class="language-switcher">
+        {% for trans in page.translations %}
+            <li>
+                <a href="{{ trans.permalink }}" lang="{{ trans.lang }}">
+                    {{ config.extra.languages[trans.lang] | default(value=trans.lang) }}
+                </a>
+            </li>
+        {% endfor %}
+    </ul>
diff --git a/templates/partials/nav.html b/templates/partials/nav.html
index ba61dc8..478db02 100644
--- a/templates/partials/nav.html
+++ b/templates/partials/nav.html
@@ -34,14 +34,7 @@
 
                         {# Language switcher #}
                         {# Displayed only if more than one language is available #}
-                        {%- if config.languages | length > 0 %}
                         {% include "partials/language_switcher.html" %}
-                        {%- endif %}
-
-                        {# Theme switcher #}
-                        {%- if config.extra.theme_switcher and config.extra.theme_switcher == true -%}
-                        {%- include "partials/theme_switcher.html" -%}
-                        {%- endif -%}
                     </div>
                 </ul>
             </div>
diff --git a/templates/section.html b/templates/section.html
index 66465ae..2872b87 100644
--- a/templates/section.html
+++ b/templates/section.html
@@ -38,6 +38,17 @@
     {% set path = section.path %}
 {% endif -%}
 
+    <ul class="language-switcher">
+        {% for trans in section.translations %}
+            <ol>
+                <a href="{{ trans.permalink }}" lang="{{ trans.lang }}">
+                    {{ config.extra.languages[trans.lang] | default(value=trans.lang) }}
+                </a>
+            </ol>
+        {% endfor %}
+    </ul>
+
+
 {%- if show_projects_first -%}
     {%- include "partials/main_page_projects_list.html" -%}
     {%- include "partials/main_page_posts_list.html" -%}