diff --git a/layouts/partials/components/breadcrumb.html b/layouts/partials/components/breadcrumb.html
index 9a0a0ef..cf2288e 100644
--- a/layouts/partials/components/breadcrumb.html
+++ b/layouts/partials/components/breadcrumb.html
@@ -1,13 +1,13 @@
 {{ $context := .Context }}
 {{ $class := .Class }}
-{{ $base := site.BaseURL }}
+{{ $base := site.Home.Permalink }}
 
 
 <ul class="{{ $class }} inline-flex space-x-1 capitalize">
   <li>
     <a
       class="text-primary dark:text-darkmode-primary"
-      href="{{ $base | relLangURL }}">
+      href="{{ $base }}">
       {{ i18n "home" | default "Home" }}
     </a>
     <span class="inlin-block mr-1">/</span>
diff --git a/layouts/partials/components/language-switcher.html b/layouts/partials/components/language-switcher.html
index d1de458..bbee9dd 100644
--- a/layouts/partials/components/language-switcher.html
+++ b/layouts/partials/components/language-switcher.html
@@ -2,7 +2,7 @@
 {{ $class := .Class }}
 {{ $context := .Context }}
 {{ $pageLang := $context.Lang }}
-{{ $base:= urls.Parse site.BaseURL }}
+{{ $base:= urls.Parse site.Home.Permalink }}
 {{ $siteLanguages := site.Home.AllTranslations }}
 {{ $pageLink := replace (replace $context.RelPermalink (add $pageLang "/") "") $base.Path "/" }}
 
diff --git a/layouts/partials/essentials/footer.html b/layouts/partials/essentials/footer.html
index b5f912f..f76fc36 100755
--- a/layouts/partials/essentials/footer.html
+++ b/layouts/partials/essentials/footer.html
@@ -5,7 +5,7 @@
         <!-- navbar brand/logo -->
         <a
           class="navbar-brand inline-block"
-          href="{{ site.BaseURL | relLangURL }}">
+          href="{{ site.Home.RelPermalink }}">
           {{ partial "logo" }}
         </a>
       </div>
@@ -19,7 +19,7 @@
                 {{ end }}
                 href="{{ if findRE `^#` .URL }}
                   {{ if not $.IsHome }}
-                    {{ site.BaseURL | relLangURL }}
+                    {{ site.Home.RelPermalink }}
                   {{ end }}{{ .URL }}
                 {{ else }}
                   {{ .URL | relLangURL }}
diff --git a/layouts/partials/essentials/header.html b/layouts/partials/essentials/header.html
index 56bf1f4..c639a24 100755
--- a/layouts/partials/essentials/header.html
+++ b/layouts/partials/essentials/header.html
@@ -4,7 +4,7 @@
     <!-- logo -->
     <div class="order-0">
       <!-- navbar brand/logo -->
-      <a class="navbar-brand block" href="{{ site.BaseURL | relLangURL }}">
+      <a class="navbar-brand block" href="{{ site.Home.RelPermalink }}">
         {{ partial "logo" }}
       </a>
     </div>
@@ -64,7 +64,7 @@
                     {{ end }}
                     href="{{- if findRE `^#` .URL -}}
                       {{- if not $.IsHome -}}
-                        {{- site.BaseURL | relLangURL -}}
+                        {{- site.Home.RelPermalink -}}
                       {{- end }}
                       {{- .URL -}}
                     {{- else -}}
@@ -85,7 +85,7 @@
               {{ end }}
               href="{{- if findRE `^#` .URL -}}
                 {{- if not $.IsHome -}}
-                  {{- site.BaseURL | relLangURL -}}
+                  {{- site.Home.RelPermalink -}}
                 {{- end }}{{- .URL -}}
               {{- else -}}
                 {{- .URL | relLangURL -}}