diff --git a/src/components/base.tsx b/src/components/base.tsx
index c44d1f6..e3c9aa5 100644
--- a/src/components/base.tsx
+++ b/src/components/base.tsx
@@ -15,13 +15,36 @@ export const BaseHtml = ({
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <meta name="webroot" content={webroot} />
       <title safe>{title}</title>
+
+      {/* Main stylesheet generated by Tailwind/Bun */}
       <link rel="stylesheet" href={`${webroot}/generated.css`} />
-      <link rel="apple-touch-icon" sizes="180x180" href={`${webroot}/apple-touch-icon.png`} />
-      <link rel="icon" type="image/png" sizes="32x32" href={`${webroot}/favicon-32x32.png`} />
-      <link rel="icon" type="image/png" sizes="16x16" href={`${webroot}/favicon-16x16.png`} />
+
+      {/* Icons / manifest (original ConvertX setup) */}
+      <link
+        rel="apple-touch-icon"
+        sizes="180x180"
+        href={`${webroot}/apple-touch-icon.png`}
+      />
+      <link
+        rel="icon"
+        type="image/png"
+        sizes="32x32"
+        href={`${webroot}/favicon-32x32.png`}
+      />
+      <link
+        rel="icon"
+        type="image/png"
+        sizes="16x16"
+        href={`${webroot}/favicon-16x16.png`}
+      />
       <link rel="manifest" href={`${webroot}/site.webmanifest`} />
+
+      {/* NEW: global theme initializer – runs on *all* pages */}
+      <script src={`${webroot}/theme-init.js`} defer></script>
     </head>
-    <body class={`flex min-h-screen w-full flex-col bg-neutral-900 text-neutral-200`}>
+    <body
+      class={`flex min-h-screen w-full flex-col bg-neutral-900 text-neutral-200`}
+    >
       {children}
       <footer class="w-full">
         <div class="p-4 text-center text-sm text-neutral-500">
@@ -41,3 +64,4 @@ export const BaseHtml = ({
     </body>
   </html>
 );
+
