diff --git a/book.toml b/book.toml
index 9e3a6b93..ee58beca 100644
--- a/book.toml
+++ b/book.toml
@@ -95,9 +95,7 @@ optional = true
 "pt-BR" = "Brazilian Portuguese (Português do Brasil)"
 
 [output.tera-backend]
-after = "html"
-components = [
-    { name = "Macros", path = "src/components/macros.html" },
-    { name = "Included", path = "src/components/include_language_picker.html" },
-    { name = "LanguagePicker", path = "src/components/language_picker.html", dependencies = ["Included", "Macros"] },
+html_components = [
+    "src/components/LanguagePicker.html",
 ]
+templates_dir = "src/components"
\ No newline at end of file
diff --git a/src/components/language_picker.html b/src/components/LanguagePicker.html
similarity index 76%
rename from src/components/language_picker.html
rename to src/components/LanguagePicker.html
index 5fb32d4a..9ffc15ca 100644
--- a/src/components/language_picker.html
+++ b/src/components/LanguagePicker.html
@@ -1,10 +1,11 @@
-{% import "Macros" as macros %}
+{% import "macros.html" as macros %}
+{% set current_language = ctx | get(key="config") | get(key="book") | get(key="language", default="en") %}
 <button id="language-toggle{{ counter }}" class="icon-button" type="button"
     title="Change language" aria-label="Change language"
     aria-haspopup="true" aria-expanded="false"
     aria-controls="language-list{{ counter }}" style="{{ attributes | get(key="style", default="")  }}">
     <i class="fa fa-globe"></i>
-</button>
+</button> 
 <ul id="language-list{{ counter }}" class="theme-popup" aria-label="Languages"
     role="menu" style="left: auto; right: 10px;">
     {% for identifier, language_name in get_context(key="output.i18n.languages") %}
@@ -12,24 +13,25 @@
         <a id="{{ identifier }}"
             href="{{ macros::get_rendered_path(identifier=identifier) }}"
             style="color: inherit;">
-            <button role="menuitem" class="theme {% if identifier == language %} theme-selected {% endif %}">
-                {% include "Included" %} {{ language_name }}
+            <button role="menuitem" class="theme {% if identifier == current_language %} theme-selected {% endif %}">
+                {% include "include_language_picker.html" %} {{ language_name }}
             </button>
-        </a>
+        </a> 
     </li>
     {% endfor %}
 </ul>
-
+ 
 <script>
     let langToggle = document.getElementById("language-toggle{{ counter }}");
     let langList = document.getElementById("language-list{{ counter }}");
-    {% raw %}
-    langToggle.addEventListener("click", (event) => {{
+    {% raw %} 
+    langToggle.addEventListener("click", (event) => {
         langList.style.display = langList.style.display == "block" ? "none" : "block";
-    }});
+    });
     {% endraw %}
 </script>
 
+
 <style>
     [dir=rtl] #language-list{{ counter }} {% raw %} {
         left: 10px;
diff --git a/src/components/macros.html b/src/components/macros.html
index 8af22fb3..f8e906d4 100644
--- a/src/components/macros.html
+++ b/src/components/macros.html
@@ -1,3 +1,3 @@
 {% macro get_rendered_path(identifier) %}
-{% if identifier != get_context(key="output.i18n.default_language") %}/{{ identifier }}{% endif %}{{ strip_prefix(s=path, prefix=book_dir ~ "/html") }}
+{% if identifier != get_context(key="output.i18n.default_language") %}/{{ identifier }}{% endif %}{{ path | trim_start_matches(pat=book_dir ~ "/html") }}
 {% endmacro get_rendered_path %}
diff --git a/theme/index.hbs b/theme/index.hbs
index bfa19f0c..792aea06 100644
--- a/theme/index.hbs
+++ b/theme/index.hbs
@@ -166,6 +166,10 @@
 
                     <h1 class="menu-title">{{ book_title }}</h1>
                     <div class="right-buttons">
+                        {{{{raw}}}}
+                        {% set current_language = ctx | get(key="config") | get(key="book") | get(key="language", default="en") %}
+                        CURRENT LANGUAGE: {{ current_language }}
+                        {{{{/raw}}}}
                         <LanguagePicker style="color: red;">
                         </LanguagePicker>
                         {{#if print_enable}}