diff --git a/Template-01/src/App.tsx b/Template-01/src/App.tsx
index 70da4e6..4e6c8eb 100644
--- a/Template-01/src/App.tsx
+++ b/Template-01/src/App.tsx
@@ -27,10 +27,11 @@ import { ScrollToTop } from './components/ScrollToTop';
 export default function App() {
   return (
     <HelmetProvider>
+      <ThemeListener />
       <BrowserRouter>
         <ScrollToTop />
         <Suspense fallback={<div className="overflow-x-hidden min-h-screen bg-white flex items-center justify-center font-mono text-[10px] uppercase tracking-widest text-tech-muted animate-pulse">
-      <ThemeListener />loading_module...</div>}>
+      loading_module...</div>}>
           <Routes>
             <Route path="/" element={<Navigate to="/pt" replace />} />
             
diff --git a/Template-02/src/App.tsx b/Template-02/src/App.tsx
index adc5b7c..ab86056 100644
--- a/Template-02/src/App.tsx
+++ b/Template-02/src/App.tsx
@@ -27,10 +27,11 @@ import { ScrollToTop } from './components/ScrollToTop';
 export default function App() {
   return (
     <HelmetProvider>
+      <ThemeListener />
       <BrowserRouter>
         <ScrollToTop />
         <Suspense fallback={<div className="overflow-x-hidden min-h-screen bg-black flex items-center justify-center font-mono text-[10px] font-black uppercase tracking-[0.5em] text-tech-primary animate-pulse italic">
-      <ThemeListener />VANTA_KERN_INIT...</div>}>
+      VANTA_KERN_INIT...</div>}>
           <Routes>
             <Route path="/" element={<Navigate to="/pt" replace />} />
             
diff --git a/Template-03/src/App.tsx b/Template-03/src/App.tsx
index ef74baf..880bdd0 100644
--- a/Template-03/src/App.tsx
+++ b/Template-03/src/App.tsx
@@ -30,10 +30,11 @@ import { ScrollToTop } from './components/ScrollToTop';
 export default function App() {
   return (
     <HelmetProvider>
+      <ThemeListener />
       <BrowserRouter>
         <ScrollToTop />
         <Suspense fallback={<div className="overflow-x-hidden min-h-screen bg-black flex items-center justify-center font-mono text-[10px] font-black uppercase tracking-[0.5em] text-tech-primary animate-pulse italic">
-      <ThemeListener />VANTA_KERN_INIT...</div>}>
+      VANTA_KERN_INIT...</div>}>
           <Routes>
             <Route path="/" element={<Navigate to="/pt" replace />} />