diff --git a/astro.config.mjs b/astro.config.mjs
index 7b9ca2c..da27717 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -5,6 +5,7 @@ import { defineConfig } from "astro/config"
 
 // https://astro.build/config
 export default defineConfig({
+  output: "static",
   site: "https://astro-air.netlify.app",
   vite: {
     worker: {
@@ -12,5 +13,4 @@ export default defineConfig({
     },
   },
   integrations: [react(), tailwind(), mdx()],
-  viewTransitions: true,
 })
diff --git a/src/layouts/base.astro b/src/layouts/base.astro
index 70c1c7b..f67f35a 100644
--- a/src/layouts/base.astro
+++ b/src/layouts/base.astro
@@ -49,7 +49,8 @@ const config = lang === "zh" ? zh.meta : en.meta
     <meta property="twitter:description" content={description} />
     <meta property="twitter:image" content={ogImageURL} />
 
-    <ClientRouter />
+    <ClientRouter fallback="swap" />
+
     <script is:inline>
       const setTheme = () => {
         const theme =
@@ -67,9 +68,8 @@ const config = lang === "zh" ? zh.meta : en.meta
 
       setTheme()
 
-      document.addEventListener("astro:page-load", () => {
-        setTheme()
-      })
+      document.addEventListener("astro:after-swap", setTheme)
+      document.addEventListener("astro:page-load", setTheme)
     </script>
 
     <script