diff --git a/src/components/Footer.astro b/src/components/Footer.astro
index 5f1f55b..6a49b3a 100644
--- a/src/components/Footer.astro
+++ b/src/components/Footer.astro
@@ -20,7 +20,7 @@ const t = useTranslations(lang);
   </div>
   <div class="footer-bottom">
     <div class="footer-links">
-      <a href="https://titaniumnetwork.org">Titanium Network</a>
+      <a href="https://titaniumnetwork.org">{t("footer.poweredBy")}</a>
     </div>
 
     <div class="footer-copyright">
diff --git a/src/components/SettingsContent/CreditsTab.astro b/src/components/SettingsContent/CreditsTab.astro
index c3a06e0..8b71074 100644
--- a/src/components/SettingsContent/CreditsTab.astro
+++ b/src/components/SettingsContent/CreditsTab.astro
@@ -7,13 +7,16 @@ const t = useTranslations(lang);
 <div class="settings-container">
   <div class="credits-container">
     <p class="credit-item">
-      {t("ultraviolet")} - <a href="https://titaniumnetwork.org/">Titanium Network</a>
+      {t("ultraviolet")} - <a target="_blank" rel="noreferrer noopener" href="https://titaniumnetwork.org/">Titanium Network</a>
     </p>
     <p class="credit-item">
-      {t("settings.credits.japaneseTranslations")} - <a href="https://wearr.dev">wearr</a>
+      {t("settings.credits.japaneseTranslations")} - <a target="_blank" rel="noreferrer noopener" href="https://wearr.dev">wearr</a>
     </p>
     <p class="credit-item">
-      {t("settings.credits.mochaandmacchiatothemes")} - <a href="">Catppuccin</a>
+      {t("settings.credits.mochaandmacchiatothemes")} - <a target="_blank" rel="noreferrer noopener" href="https://github.com/catppuccin/catppuccin">Catppuccin</a>
+    </p>
+    <p class="credit-item">
+      Rosé Pine Theme - <a target="_blank" rel="noreferrer noopener" href="https://rosepinetheme.com/">Rosé Pine</a>
     </p>
   </div>
 </div>
diff --git a/src/components/UVRegistrar.astro b/src/components/UVRegistrar.astro
index 434a375..234cb54 100644
--- a/src/components/UVRegistrar.astro
+++ b/src/components/UVRegistrar.astro
@@ -1,15 +1,23 @@
-<script src="/uv/uv.bundle.js" transition:persist is:inline></script>
-<script src="/uv.config.js" transition:persist is:inline></script>
-<script transition:persist defer>
-  // This is a hack to make sure window.__uv$config is defined, because this means everything has been.
-  if (window.__uv$config == undefined) window.location.reload();
-  var form = document.querySelector("form");
-  var input = document.querySelector("input");
+<script src="/uv/uv.bundle.js" transition:persist></script>
+<script src="/uv.config.js" transition:persist></script>
+<script transition:persist>
+  let form = document.querySelector("form");
+  let input = document.querySelector("input");
   window.navigator.serviceWorker.register("/sw.js", {
     scope: window.__uv$config.prefix,
   });
+  if (form) {
+    document.addEventListener("astro:after-swap", () => {
+      form = document.querySelector("form");
+      input = document.querySelector("input");
+      if (form) {
+        form.addEventListener("submit", formEventListener);
+      }
 
-  form.addEventListener("submit", (event) => {
+    });
+    form.addEventListener("submit", formEventListener);
+
+  function formEventListener(event) {
     event.preventDefault();
     let loadingContent = document.getElementById("loading-content");
     loadingContent.style.opacity = 1;
@@ -46,7 +54,9 @@
       topBar.appendChild(urlText);
       document.body.appendChild(topBar);
     });
-  });
+  }
+  }
+
 
   function isUrl(val = "") {
     if (/^http(s?):\/\//.test(val) || (val.includes(".") && val.substr(0, 1) !== " ")) return true;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1e2a694..f88e177 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -14,6 +14,7 @@
 
   "footer.brand": "Alu",
   "footer.madeWithLove": "Made with ❤️ by wearr",
+  "footer.poweredBy": "Powered by Ultraviolet",
   "footer.services": "Services",
   "footer.socials": "Socials",
   "footer.aluProject": "Alu Project",
diff --git a/src/i18n/jp.json b/src/i18n/jp.json
index 4c9afbd..a04a0cb 100644
--- a/src/i18n/jp.json
+++ b/src/i18n/jp.json
@@ -14,6 +14,7 @@
 
   "footer.brand": "アルー",
   "footer.madeWithLove": "wearrによる❤️で作られました",
+  "footer.poweredBy": "「ウルトラバイオレット」による駆動",
   "footer.services": "サービス",
   "footer.socials": "ソーシャル",
   "footer.aluProject": "アループロジェクト",
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 5396066..2c931be 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -5,6 +5,7 @@ import Footer from "../components/Footer.astro";
 import ThemeLoader from "../components/ThemeLoader.astro";
 import CloakLoader from "../components/CloakLoader.astro";
 import WelcomeLogging from "../components/WelcomeLogging.astro";
+import UVRegistrar from "../components/UVRegistrar.astro";
 
 type Preload = {
   href: string;
@@ -47,6 +48,7 @@ const { title, optionalPreloads } = Astro.props;
     <Header />
     <slot transition:animate={"fade"} />
     <WelcomeLogging />
+    <UVRegistrar />
     <Footer />
     <style is:global>
       * {
diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro
index 6947400..710f7fc 100644
--- a/src/pages/[lang]/index.astro
+++ b/src/pages/[lang]/index.astro
@@ -1,6 +1,5 @@
 ---
 import Layout from "../../layouts/Layout.astro";
-import UVRegistrar from "../../components/UVRegistrar.astro";
 
 import { getLangFromUrl, useTranslations } from "../../i18n/utils";
 const lang = getLangFromUrl(Astro.url);
@@ -21,7 +20,6 @@ export function getStaticPaths() {
       <iframe title="proxy-iframe" id="proxy-frame"></iframe>
     </form>
   </div>
-  <UVRegistrar />
 </Layout>
 
 <style>