diff --git a/Template-01/index.html b/Template-01/index.html
index a20dba5..19826b1 100644
--- a/Template-01/index.html
+++ b/Template-01/index.html
@@ -10,50 +10,74 @@
     <script type="module" src="/src/main.tsx"></script>
   
     <!-- Theme Auto-Updater injected by autoblogia -->
-    <script>
-      window.addEventListener('message', (event) => {
-          if (event.data && event.data.type === 'UPDATE_APPEARANCE') {
-              const settings = event.data.settings;
-              if (!settings) return;
-              let css = '';
-              if (settings.primaryColor) {
-                 css += "\n:root { " +
-                   "--color-brand-primary: " + settings.primaryColor + " !important; " +
-                   "--color-brand-blue: " + settings.primaryColor + " !important; " +
-                   "--color-brand-gold: " + settings.primaryColor + " !important; " +
-                   "--color-blue-500: " + settings.primaryColor + " !important; " +
-                   "--color-blue-600: " + settings.primaryColor + " !important; " +
-                   "--color-emerald-500: " + settings.primaryColor + " !important; " +
-                   "--color-emerald-600: " + settings.primaryColor + " !important; " +
-                   "} " +
-                   ".text-brand-blue, .text-blue-600, .group-hover\\:text-blue-600:hover, .text-brand-gold, .text-emerald-600, .text-blue-500, .text-emerald-500 { color: " + settings.primaryColor + " !important; } " +
-                   ".bg-brand-blue, .bg-blue-600, .hover\\:bg-blue-500:hover, .bg-brand-gold, .bg-emerald-600, .bg-blue-500, .bg-emerald-500 { background-color: " + settings.primaryColor + " !important; } " +
-                   ".border-brand-blue, .border-blue-600, .focus\\:border-blue-600:focus, .border-brand-gold, .border-emerald-600, .border-blue-500, .border-emerald-500 { border-color: " + settings.primaryColor + " !important; } " +
-                   ".fill-blue-600, .fill-emerald-600 { fill: " + settings.primaryColor + " !important; }";
-              }
-              if (settings.backgroundColor) {
-                 css += "\n:root { --color-brand-bg: " + settings.backgroundColor + " !important; } body { background-color: " + settings.backgroundColor + " !important; }";
-              }
-              if (settings.fontFamily) {
-                const fontLink = document.getElementById('dynamic-font');
-                const fontName = settings.fontFamily.replace(/ /g, '+');
-                const fontUrl = 'https://fonts.googleapis.com/css2?family=' + fontName + ':wght@300;400;500;600;700&display=swap';
-                if (fontLink) { (fontLink as HTMLLinkElement).href = fontUrl; } else {
-                  const link = document.createElement('link'); link.id = 'dynamic-font'; link.rel = 'stylesheet'; link.href = fontUrl; document.head.appendChild(link);
-                }
-                css += "\n:root { " +
-                  "--font-sans: \"" + settings.fontFamily + "\", sans-serif !important; " +
-                  "--font-serif: \"" + settings.fontFamily + "\", serif !important; " +
-                  "--font-mono: \"" + settings.fontFamily + "\", monospace !important; " +
-                "} * { font-family: \"" + settings.fontFamily + "\", sans-serif !important; }";
-              }
-              let styleNode = document.getElementById('dynamic-theme-style');
-              if (!styleNode) { styleNode = document.createElement('style'); styleNode.id = 'dynamic-theme-style'; document.head.appendChild(styleNode); }
-              styleNode.innerHTML = css;
+<script>
+    function applySettings(settings) {
+        if (!settings) return;
+        let css = '';
+        if (settings.primaryColor) {
+           css += "
+:root { " +
+             "--color-brand-primary: " + settings.primaryColor + " !important; " +
+             "--color-brand-blue: " + settings.primaryColor + " !important; " +
+             "--color-brand-gold: " + settings.primaryColor + " !important; " +
+             "--color-blue-500: " + settings.primaryColor + " !important; " +
+             "--color-blue-600: " + settings.primaryColor + " !important; " +
+             "--color-emerald-500: " + settings.primaryColor + " !important; " +
+             "--color-emerald-600: " + settings.primaryColor + " !important; " +
+             "} " +
+             ".text-brand-blue, .text-blue-600, .group-hover\:text-blue-600:hover, .text-brand-gold, .text-emerald-600, .text-blue-500, .text-emerald-500 { color: " + settings.primaryColor + " !important; } " +
+             ".bg-brand-blue, .bg-blue-600, .hover\:bg-blue-500:hover, .bg-brand-gold, .bg-emerald-600, .bg-blue-500, .bg-emerald-500 { background-color: " + settings.primaryColor + " !important; } " +
+             ".border-brand-blue, .border-blue-600, .focus\:border-blue-600:focus, .border-brand-gold, .border-emerald-600, .border-blue-500, .border-emerald-500 { border-color: " + settings.primaryColor + " !important; } " +
+             ".fill-blue-600, .fill-emerald-600 { fill: " + settings.primaryColor + " !important; }";
+        }
+        if (settings.backgroundColor) {
+           css += "
+:root { --color-brand-bg: " + settings.backgroundColor + " !important; } body { background-color: " + settings.backgroundColor + " !important; }";
+        }
+        if (settings.fontFamily) {
+          const fontLink = document.getElementById('dynamic-font');
+          const fontName = settings.fontFamily.replace(/ /g, '+');
+          const fontUrl = 'https://fonts.googleapis.com/css2?family=' + fontName + ':wght@300;400;500;600;700&display=swap';
+          if (fontLink) { fontLink.href = fontUrl; } else {
+            const link = document.createElement('link'); link.id = 'dynamic-font'; link.rel = 'stylesheet'; link.href = fontUrl; document.head.appendChild(link);
           }
-        });
-        window.parent.postMessage({ type: 'IFRAME_READY' }, '*');
-    </script>
-  </body>
+          css += "
+:root { " +
+            "--font-sans: '" + settings.fontFamily + "', sans-serif !important; " +
+            "--font-serif: '" + settings.fontFamily + "', serif !important; " +
+            "--font-mono: '" + settings.fontFamily + "', monospace !important; " +
+          "} * { font-family: '" + settings.fontFamily + "', sans-serif !important; }";
+        }
+        let styleNode = document.getElementById('dynamic-theme-style');
+        if (!styleNode) { styleNode = document.createElement('style'); styleNode.id = 'dynamic-theme-style'; document.head.appendChild(styleNode); }
+        styleNode.innerHTML = css;
+    }
+
+    window.addEventListener('message', (event) => {
+        if (event.data && event.data.type === 'UPDATE_APPEARANCE') {
+            applySettings(event.data.settings);
+        }
+    });
+
+    window.parent.postMessage({ type: 'IFRAME_READY' }, '*');
+    
+    // Fetch on load
+    try {
+      const host = window.location.hostname;
+      const SUPABASE_URL = 'https://ccfezpxxmwpngqhlsbxz.supabase.co';
+      const SUPABASE_KEY = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImNjZmV6cHh4bXdwbmdxaGxzYnh6Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzU2ODk4NTcsImV4cCI6MjA5MTI2NTg1N30.TqXoUsunJoX9xQwOOq3PTugltyrMGn1OrZysO6C9hRM';
+      fetch(SUPABASE_URL + '/rest/v1/sites?select=settings&custom_domain=ilike.*' + host + '*', {
+        headers: {
+          'apikey': SUPABASE_KEY,
+          'Authorization': 'Bearer ' + SUPABASE_KEY
+        }
+      }).then(r => r.json()).then(data => {
+         if (data && data.length > 0 && data[0].settings) {
+            applySettings(data[0].settings);
+         }
+      }).catch(console.error);
+    } catch(e) {}
+</script>
+</body>
 </html>
 
diff --git a/Template-02/index.html b/Template-02/index.html
index 4694e42..1550a1b 100644
--- a/Template-02/index.html
+++ b/Template-02/index.html
@@ -10,50 +10,74 @@
     <script type="module" src="/src/main.tsx"></script>
   
     <!-- Theme Auto-Updater injected by autoblogia -->
-    <script>
-      window.addEventListener('message', (event) => {
-          if (event.data && event.data.type === 'UPDATE_APPEARANCE') {
-              const settings = event.data.settings;
-              if (!settings) return;
-              let css = '';
-              if (settings.primaryColor) {
-                 css += "\n:root { " +
-                   "--color-brand-primary: " + settings.primaryColor + " !important; " +
-                   "--color-brand-blue: " + settings.primaryColor + " !important; " +
-                   "--color-brand-gold: " + settings.primaryColor + " !important; " +
-                   "--color-blue-500: " + settings.primaryColor + " !important; " +
-                   "--color-blue-600: " + settings.primaryColor + " !important; " +
-                   "--color-emerald-500: " + settings.primaryColor + " !important; " +
-                   "--color-emerald-600: " + settings.primaryColor + " !important; " +
-                   "} " +
-                   ".text-brand-blue, .text-blue-600, .group-hover\\:text-blue-600:hover, .text-brand-gold, .text-emerald-600, .text-blue-500, .text-emerald-500 { color: " + settings.primaryColor + " !important; } " +
-                   ".bg-brand-blue, .bg-blue-600, .hover\\:bg-blue-500:hover, .bg-brand-gold, .bg-emerald-600, .bg-blue-500, .bg-emerald-500 { background-color: " + settings.primaryColor + " !important; } " +
-                   ".border-brand-blue, .border-blue-600, .focus\\:border-blue-600:focus, .border-brand-gold, .border-emerald-600, .border-blue-500, .border-emerald-500 { border-color: " + settings.primaryColor + " !important; } " +
-                   ".fill-blue-600, .fill-emerald-600 { fill: " + settings.primaryColor + " !important; }";
-              }
-              if (settings.backgroundColor) {
-                 css += "\n:root { --color-brand-bg: " + settings.backgroundColor + " !important; } body { background-color: " + settings.backgroundColor + " !important; }";
-              }
-              if (settings.fontFamily) {
-                const fontLink = document.getElementById('dynamic-font');
-                const fontName = settings.fontFamily.replace(/ /g, '+');
-                const fontUrl = 'https://fonts.googleapis.com/css2?family=' + fontName + ':wght@300;400;500;600;700&display=swap';
-                if (fontLink) { (fontLink as HTMLLinkElement).href = fontUrl; } else {
-                  const link = document.createElement('link'); link.id = 'dynamic-font'; link.rel = 'stylesheet'; link.href = fontUrl; document.head.appendChild(link);
-                }
-                css += "\n:root { " +
-                  "--font-sans: \"" + settings.fontFamily + "\", sans-serif !important; " +
-                  "--font-serif: \"" + settings.fontFamily + "\", serif !important; " +
-                  "--font-mono: \"" + settings.fontFamily + "\", monospace !important; " +
-                "} * { font-family: \"" + settings.fontFamily + "\", sans-serif !important; }";
-              }
-              let styleNode = document.getElementById('dynamic-theme-style');
-              if (!styleNode) { styleNode = document.createElement('style'); styleNode.id = 'dynamic-theme-style'; document.head.appendChild(styleNode); }
-              styleNode.innerHTML = css;
+<script>
+    function applySettings(settings) {
+        if (!settings) return;
+        let css = '';
+        if (settings.primaryColor) {
+           css += "
+:root { " +
+             "--color-brand-primary: " + settings.primaryColor + " !important; " +
+             "--color-brand-blue: " + settings.primaryColor + " !important; " +
+             "--color-brand-gold: " + settings.primaryColor + " !important; " +
+             "--color-blue-500: " + settings.primaryColor + " !important; " +
+             "--color-blue-600: " + settings.primaryColor + " !important; " +
+             "--color-emerald-500: " + settings.primaryColor + " !important; " +
+             "--color-emerald-600: " + settings.primaryColor + " !important; " +
+             "} " +
+             ".text-brand-blue, .text-blue-600, .group-hover\:text-blue-600:hover, .text-brand-gold, .text-emerald-600, .text-blue-500, .text-emerald-500 { color: " + settings.primaryColor + " !important; } " +
+             ".bg-brand-blue, .bg-blue-600, .hover\:bg-blue-500:hover, .bg-brand-gold, .bg-emerald-600, .bg-blue-500, .bg-emerald-500 { background-color: " + settings.primaryColor + " !important; } " +
+             ".border-brand-blue, .border-blue-600, .focus\:border-blue-600:focus, .border-brand-gold, .border-emerald-600, .border-blue-500, .border-emerald-500 { border-color: " + settings.primaryColor + " !important; } " +
+             ".fill-blue-600, .fill-emerald-600 { fill: " + settings.primaryColor + " !important; }";
+        }
+        if (settings.backgroundColor) {
+           css += "
+:root { --color-brand-bg: " + settings.backgroundColor + " !important; } body { background-color: " + settings.backgroundColor + " !important; }";
+        }
+        if (settings.fontFamily) {
+          const fontLink = document.getElementById('dynamic-font');
+          const fontName = settings.fontFamily.replace(/ /g, '+');
+          const fontUrl = 'https://fonts.googleapis.com/css2?family=' + fontName + ':wght@300;400;500;600;700&display=swap';
+          if (fontLink) { fontLink.href = fontUrl; } else {
+            const link = document.createElement('link'); link.id = 'dynamic-font'; link.rel = 'stylesheet'; link.href = fontUrl; document.head.appendChild(link);
           }
-        });
-        window.parent.postMessage({ type: 'IFRAME_READY' }, '*');
-    </script>
-  </body>
+          css += "
+:root { " +
+            "--font-sans: '" + settings.fontFamily + "', sans-serif !important; " +
+            "--font-serif: '" + settings.fontFamily + "', serif !important; " +
+            "--font-mono: '" + settings.fontFamily + "', monospace !important; " +
+          "} * { font-family: '" + settings.fontFamily + "', sans-serif !important; }";
+        }
+        let styleNode = document.getElementById('dynamic-theme-style');
+        if (!styleNode) { styleNode = document.createElement('style'); styleNode.id = 'dynamic-theme-style'; document.head.appendChild(styleNode); }
+        styleNode.innerHTML = css;
+    }
+
+    window.addEventListener('message', (event) => {
+        if (event.data && event.data.type === 'UPDATE_APPEARANCE') {
+            applySettings(event.data.settings);
+        }
+    });
+
+    window.parent.postMessage({ type: 'IFRAME_READY' }, '*');
+    
+    // Fetch on load
+    try {
+      const host = window.location.hostname;
+      const SUPABASE_URL = 'https://ccfezpxxmwpngqhlsbxz.supabase.co';
+      const SUPABASE_KEY = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImNjZmV6cHh4bXdwbmdxaGxzYnh6Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzU2ODk4NTcsImV4cCI6MjA5MTI2NTg1N30.TqXoUsunJoX9xQwOOq3PTugltyrMGn1OrZysO6C9hRM';
+      fetch(SUPABASE_URL + '/rest/v1/sites?select=settings&custom_domain=ilike.*' + host + '*', {
+        headers: {
+          'apikey': SUPABASE_KEY,
+          'Authorization': 'Bearer ' + SUPABASE_KEY
+        }
+      }).then(r => r.json()).then(data => {
+         if (data && data.length > 0 && data[0].settings) {
+            applySettings(data[0].settings);
+         }
+      }).catch(console.error);
+    } catch(e) {}
+</script>
+</body>
 </html>