diff --git a/themes/custom-learn2-dark/templates/partials/langswitcher.html.twig b/themes/custom-learn2-dark/templates/partials/langswitcher.html.twig
new file mode 100644
index 0000000..3b44b1f
--- /dev/null
+++ b/themes/custom-learn2-dark/templates/partials/langswitcher.html.twig
@@ -0,0 +1,33 @@
+<ul class="langswitcher">
+    {% set display_format = display_format ?? config.get('plugins.langswitcher.language_display', 'long') %}
+
+    {% for language in langswitcher.languages %}
+        {% set active_class = '' %}
+        {% set show_language = true %}
+        {% if language == langswitcher.current %}
+            {% set active_class = 'active' %}
+        {% endif %}
+        {% if langswitcher.translated_routes[language] %}
+            {% set lang_url = langswitcher.translated_routes[language] ~ page.urlExtension %}
+        {% else %}
+            {% set base_lang_url = base_url_simple ~ grav.language.getLanguageURLPrefix(language) %}
+            {% set lang_url = base_lang_url ~ langswitcher.page_route ~ page.urlExtension %}
+        {% endif %}
+        {% set untranslated_pages_behavior = grav.config.plugins.langswitcher.untranslated_pages_behavior %}
+        {% if untranslated_pages_behavior != 'none' %}
+            {% set translated_page = langswitcher.translated_pages[language] %}
+            {% if (not translated_page) or (not translated_page.published) %}
+                {% if untranslated_pages_behavior == 'redirect' %}
+                    {% set lang_url = url('/') %}
+                {% elseif untranslated_pages_behavior == 'hide' %}
+                    {% set show_language = false %}
+                {% endif %}
+            {% endif %}
+        {% endif %}
+
+        {% if show_language %}
+            <li><a href="{{ lang_url ~ uri.params ~ (uri.query|length > 1 ? '?' ~ uri.query) }}" class="external {{ active_class }}">{% include 'partials/langswitcher-' ~ display_format ~ '.html.twig' %}</a></li>
+        {% endif %}
+
+    {% endfor %}
+</ul>
diff --git a/themes/custom-learn2-dark/templates/partials/language-selector.html.twig b/themes/custom-learn2-dark/templates/partials/language-selector.html.twig
deleted file mode 100644
index 7e19f0e..0000000
--- a/themes/custom-learn2-dark/templates/partials/language-selector.html.twig
+++ /dev/null
@@ -1,49 +0,0 @@
-<div class="language-selector">
-  <button class="btn" type="button" data-dropdown="langSelectorList">
-    {% if language_display.button == 'default' or language_display.button == 'flag' %}
-    <img alt="{{ native_name(language_selector.current)|capitalize }}" src="{{ path_flags ~ language_selector.current }}.png" />
-    {% endif %}
-    {% if language_display.button == 'default' or language_display.button == 'name' %}
-    {{ native_name(language_selector.current)|capitalize }}
-    {% endif %}
-    <i class="fa fa-caret-down"></i>
-  </button>
-
-  <ul class="dropdown-menu" id="langSelectorList">
-{% for language in language_selector.languages %}
-
-    {% set show_language = true %}
-    {% if language == language_selector.current %}
-        {% set lang_url = page.url %}
-    {% else %}
-        {% set base_lang_url = base_url_simple ~ grav.language.getLanguageURLPrefix(language) %}
-        {% set lang_url = base_lang_url ~ language_selector.page_route ~ page.urlExtension %}
-        {% set untranslated_pages_behavior = grav.config.plugins.language_selector.untranslated_pages_behavior %}
-        {% if untranslated_pages_behavior != 'none' %}
-            {% set translated_page = language_selector.translated_pages[language] %}
-            {% if (not translated_page) or (not translated_page.published) %}
-                {% if untranslated_pages_behavior == 'redirect' %}
-                    {% set lang_url = base_lang_url ~ '/' %}
-                {% elseif untranslated_pages_behavior == 'hide' %}
-                    {% set show_language = false %}
-                {% endif %}
-            {% endif %}
-        {% endif %}
-    {% endif %}
-
-    {% if show_language %}
-        <li>
-          <a href="{{ lang_url ~ uri.params }}">
-            {% if language_display.select == 'default' or language_display.select == 'flag' %}
-            <img alt="{{ native_name(language)|capitalize }}" src="{{ path_flags ~ language }}.png" />
-            {% endif %}
-            {% if language_display.select == 'default' or language_display.select == 'name' %}
-            {{ native_name(language)|capitalize }}
-            {% endif %}
-          </a>
-        </li>
-    {% endif %}
-
-{% endfor %}
-  </ul>
-</div>
diff --git a/themes/custom-learn2-dark/templates/partials/sidebar.html.twig b/themes/custom-learn2-dark/templates/partials/sidebar.html.twig
index 21cfdf8..b055e45 100644
--- a/themes/custom-learn2-dark/templates/partials/sidebar.html.twig
+++ b/themes/custom-learn2-dark/templates/partials/sidebar.html.twig
@@ -61,7 +61,7 @@
         <a class="padding" href="#" data-clear-history-toggle><i
                     class="fa fa-fw fa-history"></i> {{ 'THEME_LEARN2_CLEAR_HISTORY'|t }}</a><br/>
 
-        {% include 'partials/language-selector.html.twig' %}
+        {% include 'partials/langswitcher.html.twig' %}
 
         <section id="footer">
             <p>{{ 'THEME_LEARN2_BUILT_WITH_GRAV'|t|raw }}</p>