diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index 96c606c..cd67ef3 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -44,14 +44,18 @@ jobs:
         run: npm ci
 
       - name: Build site
+        # Build into public/tsuki so the on-disk layout mirrors the URL structure
+        # (`/tsuki/foo` href → exampleSite/public/tsuki/foo file). This lets
+        # htmltest resolve internal links without needing URL-rewriting (which
+        # htmltest does not support).
         working-directory: exampleSite
-        run: hugo --gc --minify --baseURL "https://tiennm99.github.io/tsuki/"
+        run: hugo --gc --minify --destination public/tsuki --baseURL "https://tiennm99.github.io/tsuki/"
 
       - name: Build Pagefind index
-        run: npx pagefind --site exampleSite/public
+        run: npx pagefind --site exampleSite/public/tsuki
 
       - name: Smoke tests (SEO + a11y + per-kind CSS budget + features regression guard)
-        run: ./scripts/smoke-tests.sh exampleSite/public
+        run: ./scripts/smoke-tests.sh exampleSite/public/tsuki
 
       - name: htmltest (broken internal links + HTML5 validation)
         # Pinned to master SHA (2026-05-10) for supply-chain hygiene. Refresh periodically.
@@ -60,11 +64,12 @@ jobs:
           config: .htmltest.yml
 
       - name: Upload artifact
-        # Only upload from the current Hugo version; the floor-version run is for compatibility check.
+        # Upload only the inner build (exampleSite/public/tsuki). Pages mounts the
+        # artifact root at /tsuki/, so the inner contents become the served site.
         if: matrix.hugo == '0.154.0'
         uses: actions/upload-pages-artifact@v5
         with:
-          path: exampleSite/public
+          path: exampleSite/public/tsuki
 
   deploy:
     needs: build
diff --git a/.gitignore b/.gitignore
index 32e1d11..ee641ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ Thumbs.db
 .vscode/
 .idea/
 *.swp
+tmp/
diff --git a/.htmltest.yml b/.htmltest.yml
index b1b325c..eb387c8 100644
--- a/.htmltest.yml
+++ b/.htmltest.yml
@@ -4,14 +4,10 @@ IgnoreDirectoryMissingTrailingSlash: true
 IgnoreInternalEmptyHash: true
 IgnoreEmptyHref: false
 EnforceHTML5: true
-# Strip the /tsuki/ baseURL prefix so links resolve against exampleSite/public/.
-# htmltest's URLSwap is a regex substring match (not anchored), so the leading
-# "^" used previously silently failed against the minified `href=/tsuki/...`
-# outputs in built HTML — every link reported missing. Quoted plain-prefix form
-# matches whatever position /tsuki/ appears in the href, which for our build is
-# always at the start of relative URLs.
-URLSwap:
-  "/tsuki/": /
+# CI builds with `hugo --destination public/tsuki` so the on-disk layout
+# mirrors the URL structure (`/tsuki/foo` → exampleSite/public/tsuki/foo).
+# htmltest has no URL-rewriting feature, so this is the cleanest way to make
+# internal-link resolution work without dual builds.
 IgnoreURLs:
   - "^https://giscus.app"
   - "^https://github.com/"
diff --git a/layouts/404.html b/layouts/404.html
index 2d57e4a..373ba72 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -4,6 +4,6 @@
 <section class="error-404">
   <h1>404</h1>
   <p>{{ i18n "pageNotFound" | default "Trang không tồn tại." }}</p>
-  <p><a href="{{ "/" | relURL }}">{{ i18n "backHome" | default "Về trang chủ" }}</a></p>
+  <p><a href="{{ site.Home.RelPermalink }}">{{ i18n "backHome" | default "Về trang chủ" }}</a></p>
 </section>
 {{ end }}
diff --git a/layouts/_partials/header.html b/layouts/_partials/header.html
index 919d5a8..f55f1e0 100644
--- a/layouts/_partials/header.html
+++ b/layouts/_partials/header.html
@@ -1,5 +1,5 @@
 <header class="site-header">
-  <a class="site-title" href="{{ "/" | relURL }}">
+  <a class="site-title" href="{{ site.Home.RelPermalink }}">
     {{- with site.Data.profile }}{{ .name | default site.Title }}{{ else }}{{ site.Title }}{{ end -}}
   </a>
   {{ partial "nav.html" . }}
diff --git a/layouts/_partials/home/hero.html b/layouts/_partials/home/hero.html
index 19d3b82..e690c40 100644
--- a/layouts/_partials/home/hero.html
+++ b/layouts/_partials/home/hero.html
@@ -19,7 +19,7 @@
   <ul class="home-hero-links">
     {{- range . }}
     <li>
-      <a href="{{ .url }}" rel="me noopener" aria-label="{{ .label | default .icon }}">
+      <a href="{{ strings.TrimPrefix "/" .url | relLangURL }}" rel="me noopener" aria-label="{{ .label | default .icon }}">
         {{- with .icon }}{{ partial "icon.html" . }}{{ end }}
         <span>{{ .label | default .icon }}</span>
       </a>
diff --git a/layouts/_partials/home/recent-posts.html b/layouts/_partials/home/recent-posts.html
index 0c32052..69c19ba 100644
--- a/layouts/_partials/home/recent-posts.html
+++ b/layouts/_partials/home/recent-posts.html
@@ -15,7 +15,7 @@
 
   {{- if gt (len $all) $count }}
   <p class="home-recent-more">
-    <a href="{{ "/post/" | relURL }}">{{ i18n "viewAll" | default "View all" }} →</a>
+    <a href="{{ "post/" | relLangURL }}">{{ i18n "viewAll" | default "View all" }} →</a>
   </p>
   {{- end }}
 </section>
diff --git a/layouts/_partials/nav.html b/layouts/_partials/nav.html
index a054968..0995d20 100644
--- a/layouts/_partials/nav.html
+++ b/layouts/_partials/nav.html
@@ -3,7 +3,7 @@
   {{- range site.Menus.main }}
     {{- $current := or ($.IsMenuCurrent "main" .) ($.HasMenuCurrent "main" .) }}
     <li>
-      <a href="{{ .URL | relURL }}"{{ if $current }} aria-current="page"{{ end }}>{{ .Name }}</a>
+      <a href="{{ strings.TrimPrefix "/" .URL | relLangURL }}"{{ if $current }} aria-current="page"{{ end }}>{{ .Name }}
     </li>
   {{- end }}
   </ul>
diff --git a/layouts/_partials/search-button.html b/layouts/_partials/search-button.html
index e7795d8..02532a6 100644
--- a/layouts/_partials/search-button.html
+++ b/layouts/_partials/search-button.html
@@ -1,3 +1,3 @@
-<a class="search-button" href="{{ "/search/" | relURL }}" aria-label="{{ i18n "search" | default "Tìm kiếm" }}">
+<a class="search-button" href="{{ "search/" | relLangURL }}" aria-label="{{ i18n "search" | default "Tìm kiếm" }}">
   {{ partial "icon.html" "search" }}
 </a>
diff --git a/layouts/search/list.html b/layouts/search/list.html
index 2940254..56218c2 100644
--- a/layouts/search/list.html
+++ b/layouts/search/list.html
@@ -4,7 +4,7 @@
 {{- $search := resources.Get "css/search.css" | minify | fingerprint -}}
 <link rel="stylesheet" href="{{ $search.RelPermalink }}" integrity="{{ $search.Data.Integrity }}" crossorigin="anonymous">
 {{- if site.Params.search.enable | default true }}
-{{- $pagefindCss := "/pagefind/pagefind-ui.css" | relURL }}
+{{- $pagefindCss := "pagefind/pagefind-ui.css" | relLangURL }}
 <link rel="preload" as="style" href="{{ $pagefindCss }}" onload="this.onload=null;this.rel='stylesheet'">
 <noscript><link rel="stylesheet" href="{{ $pagefindCss }}"></noscript>
 {{- end }}
@@ -30,7 +30,7 @@
 {{ define "scripts" }}
 {{- if site.Params.search.enable | default true }}
 <script type="module">
-  import { PagefindUI } from "{{ "/pagefind/pagefind-ui.js" | relURL }}";
+  import { PagefindUI } from "{{ "pagefind/pagefind-ui.js" | relLangURL }}";
   new PagefindUI({
     element: "#search",
     showSubResults: true,