diff --git a/src/.vitepress/theme/components/ExtensionDetails.vue b/src/.vitepress/theme/components/ExtensionDetails.vue
index 3d51e94..66f42c4 100644
--- a/src/.vitepress/theme/components/ExtensionDetails.vue
+++ b/src/.vitepress/theme/components/ExtensionDetails.vue
@@ -2,7 +2,7 @@
 <!-- Copyright © 2026 Inkdex -->
 
 <script setup lang="ts">
-import { watch } from "vue";
+import { computed, watch } from "vue";
 import {
   getContentRatingBg,
   getContentRatingColor,
@@ -11,6 +11,7 @@ import {
   hasChapterProviding,
   hasCloudflareBypassProviding,
   hasMangaProgressProviding,
+  type CustomRepository,
   type Extension,
 } from "../lib/extensions";
 import { formatRating } from "../lib/uiUtils";
@@ -18,10 +19,39 @@ import { formatRating } from "../lib/uiUtils";
 interface Props {
   extension: Extension | null;
   show: boolean;
+  customRepos: CustomRepository[];
 }
 
 const props = defineProps<Props>();
 
+const sourceUrl = computed(() => {
+  if (!props.extension) return null;
+
+  if (props.extension.source === "inkdex" && props.extension.sourceRepo) {
+    return `https://github.com/${props.extension.sourceRepo}`;
+  }
+
+  const repo = props.customRepos.find((r) => r.id === props.extension?.source);
+  if (repo) {
+    return `https://github.com/${repo.owner}/${repo.name}`;
+  }
+
+  return null;
+});
+
+const sourceDisplayName = computed(() => {
+  if (!props.extension) return "";
+
+  if (props.extension.source === "inkdex") {
+    return "Inkdex";
+  }
+
+  const repo = props.customRepos.find((r) => r.id === props.extension?.source);
+  return repo
+    ? `${repo.owner}/${repo.name}`
+    : props.extension.repoId || props.extension.source;
+});
+
 const emit = defineEmits<{
   hide: [];
   install: [extension: Extension];
@@ -170,13 +200,29 @@ watch(
 
         <div class="details-section">
           <h3>Repository</h3>
-          <span class="source-badge">
-            {{
-              extension.source === "inkdex"
-                ? "Inkdex"
-                : extension.repoId || extension.source
-            }}
-          </span>
+          <div class="repo-badges">
+            <span class="source-badge">
+              {{ sourceDisplayName }}
+            </span>
+            <a
+              v-if="sourceUrl"
+              :href="sourceUrl"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="source-link"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 24 24"
+                fill="currentColor"
+              >
+                <path
+                  d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"
+                />
+              </svg>
+              Source
+            </a>
+          </div>
         </div>
 
         <div
@@ -193,7 +239,7 @@ watch(
               :key="dev.name"
               class="details-developer"
             >
-              <div class="dev-name">{{ dev.name }}</div>
+              <div class="dev-name">- {{ dev.name }}</div>
               <div v-if="dev.github || dev.website" class="dev-links">
                 <a
                   v-if="dev.github"
diff --git a/src/.vitepress/theme/components/ExtensionList.css b/src/.vitepress/theme/components/ExtensionList.css
index 2afd11e..a62f2a3 100644
--- a/src/.vitepress/theme/components/ExtensionList.css
+++ b/src/.vitepress/theme/components/ExtensionList.css
@@ -1037,7 +1037,7 @@
   font-size: 0.85rem;
   color: var(--vp-c-text-1);
   text-decoration: none;
-  padding: 0.4rem 0.75rem;
+  padding: 0.25rem 0.5rem;
   border-radius: 8px;
   background: var(--vp-c-bg);
   transition: all 0.2s ease;
@@ -1057,6 +1057,37 @@
   height: 14px;
 }
 
+.source-link {
+  font-size: 0.85rem;
+  color: var(--vp-c-text-1);
+  text-decoration: none;
+  padding: 0.25rem 0.5rem;
+  border-radius: 8px;
+  background: var(--vp-c-bg);
+  transition: all 0.2s ease;
+  border: 1px solid var(--vp-c-divider);
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
+  width: fit-content;
+  line-height: 1.5rem;
+}
+
+.repo-badges {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+.source-link:hover {
+  background: var(--vp-c-bg-soft);
+  color: var(--vp-c-text-2);
+  border-color: var(--vp-c-border);
+}
+.source-link svg {
+  width: 14px;
+  height: 14px;
+}
+
 /* Notification Toast - styled like install button and slides from right */
 .notification-toast {
   position: fixed;
diff --git a/src/.vitepress/theme/components/ExtensionList.vue b/src/.vitepress/theme/components/ExtensionList.vue
index 5f1e768..f55fe0f 100644
--- a/src/.vitepress/theme/components/ExtensionList.vue
+++ b/src/.vitepress/theme/components/ExtensionList.vue
@@ -31,6 +31,7 @@ const {
   customRepos,
   loadRepos,
   fetchAllExtensions,
+  fetchExtensionsForRepo,
   addCustomRepo,
   removeCustomRepo,
 } = useExtensions();
@@ -200,7 +201,6 @@ const handleAddRepo = async () => {
     const result = await addCustomRepo(newRepoUrl.value);
 
     if (!result.success) {
-      // Silently fail if repository is already added
       if (result.error?.includes("already added")) {
         newRepoUrl.value = "";
         checkingRepo.value = false;
@@ -211,17 +211,33 @@ const handleAddRepo = async () => {
       return;
     }
 
+    const repoUrl = newRepoUrl.value;
+    newRepoUrl.value = "";
+
+    // Extract owner/repo to find the added repo and fetch its extensions
+    let repoId: string | undefined;
+    const cleanUrl = repoUrl.replace(/^https?:\/\//, "");
+    const match = cleanUrl.match(/github\.com\/([^/]+)\/([^/]+)/);
+    if (match) {
+      repoId = `${match[1]}/${match[2]}`;
+    } else if (repoUrl.includes("/")) {
+      const parts = repoUrl.trim().split("/");
+      if (parts.length >= 2 && parts[0] && parts[1]) {
+        repoId = `${parts[0]}/${parts[1]}`;
+      }
+    }
+
     showSuccess(
       "Repository Added",
-      `${newRepoUrl.value} has been added successfully`,
+      `${repoId || repoUrl} has been added successfully`,
     );
-    newRepoUrl.value = "";
-
-    // Fetch extensions dynamically without showing loading spinner
-    await fetchAllExtensions(false);
 
-    // Invalidate cache to refresh available languages and labels after extensions are updated
-    invalidateCache();
+    if (repoId) {
+      const addedRepo = customRepos.value.find((r) => r.id === repoId);
+      if (addedRepo) {
+        await fetchExtensionsForRepo(addedRepo);
+      }
+    }
     checkingRepo.value = false;
   } catch (e) {
     showError("Error", "An error occurred while adding repository");
@@ -230,6 +246,18 @@ const handleAddRepo = async () => {
   }
 };
 
+const addRepoFromId = async (repoId: string): Promise<boolean> => {
+  const trimmed = repoId.trim();
+  if (trimmed === "inkdex") return true;
+  if (trimmed.toLowerCase().includes("inkdex/extensions")) return true;
+
+  const existing = customRepos.value.find((r) => r.id === trimmed);
+  if (existing) return true;
+
+  const result = await addCustomRepo(trimmed);
+  return result.success;
+};
+
 const handleToggleSource = (source: string) => {
   toggleSource(source);
 };
@@ -467,7 +495,6 @@ onMounted(async () => {
     urlParams.has("nb") ||
     urlParams.has("r") ||
     urlParams.has("nr") ||
-    urlParams.has("ar") ||
     urlParams.has("sel") ||
     urlParams.has("oss") ||
     urlParams.has("m") ||
@@ -478,105 +505,42 @@ onMounted(async () => {
   // Step 1: Load repos and process repositories from URL
   loadRepos();
 
-  // Helper function to add repository from URL
-  const addRepoFromUrl = async (repoUrl: string): Promise<boolean> => {
-    const trimmedUrl = repoUrl.trim();
-    // Skip inkdex as it's always available
-    if (trimmedUrl === "inkdex") return true;
-    if (trimmedUrl.toLowerCase().includes("inkdex/extensions")) return true;
-
-    const result = await addCustomRepo(trimmedUrl);
-    return result.success;
-  };
-
-  // Process ar parameter (additional repositories)
-  const arParam = urlParams.get("ar");
-  if (arParam) {
-    try {
-      const repoUrls = decodeURIComponent(arParam).split(",");
-      for (const repoUrl of repoUrls) {
-        const trimmedUrl = repoUrl.trim();
-        // Validate URL format before processing
-        if (
-          trimmedUrl &&
-          (trimmedUrl.startsWith("https://github.com/") ||
-            /^[^/]+\/[^/]+$/.test(trimmedUrl))
-        ) {
-          await addRepoFromUrl(trimmedUrl);
-        }
-      }
-    } catch (error) {
-      console.warn("Failed to parse ar parameter:", error);
+  // Add repos from r/nr params before fetching extensions
+  const repoIdsToAdd: string[] = [];
+  const rParam = urlParams.get("r");
+  if (rParam) {
+    repoIdsToAdd.push(
+      ...rParam
+        .split(",")
+        .map((s) => s.trim())
+        .filter((s) => s.length > 0),
+    );
+  }
+  const nrParam = urlParams.get("nr");
+  if (nrParam) {
+    repoIdsToAdd.push(
+      ...nrParam
+        .split(",")
+        .map((s) => s.trim())
+        .filter((s) => s.length > 0),
+    );
+  }
+  for (const repoId of repoIdsToAdd) {
+    if (
+      repoId !== "inkdex" &&
+      !repoId.toLowerCase().includes("inkdex/extensions")
+    ) {
+      await addRepoFromId(repoId);
     }
   }
 
-  // Step 2: Parse basic URL parameters that don't depend on extensions
-  // Note: Search query, selected extensions, and only show selected flag
-  // are now handled by useUrlSync.ts parseUrlParams() function
-
   // Step 2: Fetch extensions after repositories are set up
   await fetchAllExtensions();
 
-  // Wait for computed properties to update after extensions are loaded
-  // Use double nextTick to ensure computed properties fully update with new extension data
-  await nextTick();
-  await nextTick();
-
-  // Step 3: Use centralized URL parsing from useUrlSync (already instantiated above)
-
-  // Parse all URL parameters using centralized logic
+  // Step 3: Parse URL parameters using centralized logic
   parseUrlParams();
 
-  // Step 4: Auto-select repositories from ar parameter if no explicit r/nr filters
-  const additionalReposParam = urlParams.get("ar");
-  if (additionalReposParam && !urlParams.has("r") && !urlParams.has("nr")) {
-    const repoUrls = decodeURIComponent(additionalReposParam).split(",");
-    const autoSelectRepoIds: string[] = [];
-
-    for (const repoUrl of repoUrls) {
-      const trimmedUrl = repoUrl.trim();
-      // Skip inkdex as it's always available and shouldn't be auto-selected
-      if (trimmedUrl.toLowerCase().includes("inkdex/extensions")) continue;
-
-      // Extract repo ID from URL to match with customRepos
-      const match = trimmedUrl.match(/github\.com\/([^/]+)\/([^/?]+)/);
-      if (match) {
-        const [, owner, name] = match;
-        const repoId = `${owner}-${name}`;
-
-        // Check if this repo exists in our custom repos
-        if (customRepos.value.some((r) => r.id === repoId)) {
-          autoSelectRepoIds.push(repoId);
-        }
-      }
-    }
-
-    // Auto-select repositories from ar parameter
-    autoSelectRepoIds.forEach((repoId) => {
-      selectedSources.value.add(repoId);
-    });
-
-    // Update URL to include auto-selected repositories for consistency
-    if (autoSelectRepoIds.length > 0) {
-      urlParams.set("r", autoSelectRepoIds.join(","));
-    }
-  }
-
-  // Step 3: Fetch extensions after repositories are set up
-  await fetchAllExtensions();
-
-  // Wait for computed properties to update after extensions are loaded
-  await nextTick();
-
-  // Step 4: Parse remaining URL parameters that depend on extensions data
-  // Note: Content ratings, services, languages, and badges parsing
-  // are now handled by useUrlSync.ts parseUrlParams() function
-
-  // Step 5: Parse filter modes from URL (only when relevant filters are present)
-  // Note: Filter modes parsing and conflict resolution are now handled
-  // by useUrlSync.ts parseUrlParams() function
-
-  // Step 6: Set default SAFE rating if no filters were present
+  // Step 4: Set default SAFE rating if no filters were present
   if (!hasAnyUrlFilters) {
     selectedRatings.value = new Set([CONTENT_RATINGS[0]]); // SAFE is first rating
   }
@@ -1113,6 +1077,7 @@ onMounted(async () => {
       <ExtensionDetails
         :extension="selectedExtension"
         :show="showDetails"
+        :custom-repos="customRepos"
         @hide="hideExtensionDetails"
         @install="installExtension"
       />
diff --git a/src/.vitepress/theme/components/NotificationPanel.vue b/src/.vitepress/theme/components/NotificationPanel.vue
index c026cf6..34e24c5 100644
--- a/src/.vitepress/theme/components/NotificationPanel.vue
+++ b/src/.vitepress/theme/components/NotificationPanel.vue
@@ -77,9 +77,11 @@ const removeNotification = (id: string) => {
   position: fixed;
   top: 20px;
   right: 20px;
+  left: 20px;
   z-index: 9999;
   pointer-events: none;
   max-width: 400px;
+  margin-left: auto;
 }
 
 .notification {
@@ -90,31 +92,46 @@ const removeNotification = (id: string) => {
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
   backdrop-filter: blur(10px);
   border: 1px solid var(--vp-c-border);
-  background: var(--vp-c-bg-soft);
   color: var(--vp-c-text-1);
+  overflow-wrap: break-word;
+  word-break: break-word;
+}
+
+.dark .notification {
+  background: rgba(27, 27, 27, 0.35);
+}
+
+:root:not(.dark) .notification {
+  background: rgba(255, 255, 255, 0.45);
 }
 
 .notification-success {
-  background: var(--vp-c-bg-soft);
+  backdrop-filter: blur(10px);
   color: var(--vp-c-text-1);
   border-color: var(--vp-c-border);
 }
 
 .notification-error {
-  background: var(--vp-c-danger-soft);
-  color: var(--vp-c-danger);
-  border-color: var(--vp-c-danger);
-  box-shadow: 0 4px 12px rgba(239, 68, 68, 0.2);
+  color: #ffffff;
+  border-color: var(--vp-c-danger-1);
+}
+
+.dark .notification-error {
+  background: rgba(255, 57, 57, 0.35);
+}
+
+:root:not(.dark) .notification-error {
+  background: rgba(200, 30, 30, 0.65);
 }
 
 .notification-warning {
-  background: var(--vp-c-yellow-soft);
+  backdrop-filter: blur(10px);
   color: var(--vp-c-yellow-1);
   border-color: var(--vp-c-yellow-1);
 }
 
 .notification-info {
-  background: var(--vp-c-bg-soft);
+  backdrop-filter: blur(10px);
   color: var(--vp-c-text-1);
   border-color: var(--vp-c-border);
 }
@@ -140,6 +157,7 @@ const removeNotification = (id: string) => {
 
 .notification-title {
   flex: 1;
+  min-width: 0;
 }
 
 .notification-close {
diff --git a/src/.vitepress/theme/composables/useAvailableData.ts b/src/.vitepress/theme/composables/useAvailableData.ts
index 9eb8bf8..9725740 100644
--- a/src/.vitepress/theme/composables/useAvailableData.ts
+++ b/src/.vitepress/theme/composables/useAvailableData.ts
@@ -3,6 +3,10 @@
 
 import { computed, ref, type Ref } from "vue";
 import { normalizeLanguageTag, type Extension } from "../lib/extensions";
+import {
+  LANGUAGE_EMOJI_MAP,
+  VALID_IETF_LANGUAGE_TAGS,
+} from "../lib/languageData";
 
 export const useAvailableData = (extensions: Ref<Extension[]>) => {
   // Cache for computed values to avoid recalculation
@@ -36,67 +40,12 @@ export const useAvailableData = (extensions: Ref<Extension[]>) => {
       if (ext.metadata?.language) {
         const normalizedLanguage = normalizeLanguageTag(ext.metadata.language);
 
-        // Use the complete set of valid IETF language tags from the emoji map
-        const languageEmojiMap = {
-          en: "🇬🇧",
-          zh: "🇨🇳",
-          hi: "🇮🇳",
-          es: "🇪🇸",
-          fr: "🇫🇷",
-          ar: "🇸🇦",
-          bn: "🇧🇩",
-          ru: "🇷🇺",
-          pt: "🇵🇹",
-          ur: "🇵🇰",
-          id: "🇮🇩",
-          de: "🇩🇪",
-          ja: "🇯🇵",
-          sw: "🇰🇪",
-          mr: "🇮🇳",
-          te: "🇮🇳",
-          tr: "🇹🇷",
-          ta: "🇮🇳",
-          ko: "🇰🇷",
-          vi: "🇻🇳",
-          it: "🇮🇹",
-          th: "🇹🇭",
-          gu: "🇮🇳",
-          fa: "🇮🇷",
-          pl: "🇵🇱",
-          uk: "🇺🇦",
-          ml: "🇮🇳",
-          kn: "🇮🇳",
-          or: "🇮🇳",
-          my: "🇲🇲",
-          pa: "🇮🇳",
-          nl: "🇳🇱",
-          ro: "🇷🇴",
-          hu: "🇭🇺",
-          el: "🇬🇷",
-          cs: "🇨🇿",
-          sv: "🇸🇪",
-          fi: "🇫🇮",
-          da: "🇩🇰",
-          no: "🇳🇴",
-          he: "🇮🇱",
-          sk: "🇸🇰",
-          bg: "🇧🇬",
-          hr: "🇭🇷",
-          sr: "🇷🇸",
-          lt: "🇱🇹",
-          sl: "🇸🇮",
-          et: "🇪🇪",
-          lv: "🇱🇻",
-        };
-
-        const validTags = new Set(Object.keys(languageEmojiMap));
-        validTags.add("multi"); // Add multi as a special case
-
-        // Add valid IETF tags, but allow non-matches to show as-is
+        const validTags = new Set(Object.keys(LANGUAGE_EMOJI_MAP));
+        validTags.add("multi");
+
         if (validTags.has(normalizedLanguage)) {
           languages.add(normalizedLanguage);
         } else {
-          // For non-matching tags, add the original language string as-is
           if (ext.metadata.language && ext.metadata.language.trim()) {
             languages.add(ext.metadata.language);
           }
@@ -108,75 +57,18 @@ export const useAvailableData = (extensions: Ref<Extension[]>) => {
       const aLower = a.toLowerCase();
       const bLower = b.toLowerCase();
 
-      // Multi always first
       if (aLower === "multi") return -1;
       if (bLower === "multi") return 1;
 
-      // Define valid IETF language tags
-      const validIETFTags = new Set([
-        "en",
-        "es",
-        "fr",
-        "de",
-        "it",
-        "pt",
-        "ru",
-        "ja",
-        "zh",
-        "ko",
-        "ar",
-        "tr",
-        "pl",
-        "nl",
-        "id",
-        "th",
-        "vi",
-        "hi",
-        "bn",
-        "ur",
-        "sw",
-        "mr",
-        "te",
-        "ta",
-        "gu",
-        "fa",
-        "uk",
-        "ml",
-        "kn",
-        "or",
-        "my",
-        "pa",
-        "ro",
-        "hu",
-        "el",
-        "cs",
-        "sv",
-        "fi",
-        "da",
-        "no",
-        "he",
-        "sk",
-        "bg",
-        "hr",
-        "sr",
-        "lt",
-        "sl",
-        "et",
-        "lv",
-      ]);
-
-      // Check if A is valid IETF and B is not
-      const aIsIETF = validIETFTags.has(aLower);
-      const bIsIETF = validIETFTags.has(bLower);
+      const aIsIETF = VALID_IETF_LANGUAGE_TAGS.has(aLower);
+      const bIsIETF = VALID_IETF_LANGUAGE_TAGS.has(bLower);
 
       if (aIsIETF && !bIsIETF) return -1;
       if (!aIsIETF && bIsIETF) return 1;
 
-      // If both are IETF or both are non-IETF, sort alphabetically
       return a.localeCompare(b);
     });
 
-    // Cache the result
     cachedLanguages.value = sortedLanguages;
     lastLanguagesHash.value = currentHash;
 
diff --git a/src/.vitepress/theme/composables/useUrlSync.ts b/src/.vitepress/theme/composables/useUrlSync.ts
index 4c65be5..1a38109 100644
--- a/src/.vitepress/theme/composables/useUrlSync.ts
+++ b/src/.vitepress/theme/composables/useUrlSync.ts
@@ -179,14 +179,27 @@ export const useUrlSync = (
       });
     }
 
-    // Parse source (repository) filters
+    // Parse source (repository) filters - expect owner/repo format
     const sourceParam = urlParams.get("r");
     if (sourceParam) {
       const providedSources = sourceParam
         .split(",")
         .map((source) => source.trim())
         .filter((source) => source.length > 0);
-      state.selectedSources.value = new Set(providedSources);
+
+      const sourceIds: string[] = [];
+      for (const source of providedSources) {
+        if (source === "inkdex") {
+          sourceIds.push("inkdex");
+        } else if (source.includes("/")) {
+          // URL params are automatically decoded, use directly as ID
+          const existing = customRepos.value.find((r) => r.id === source);
+          if (existing) {
+            sourceIds.push(source);
+          }
+        }
+      }
+      state.selectedSources.value = new Set(sourceIds);
     }
 
     const notSourceParam = urlParams.get("nr");
@@ -195,9 +208,22 @@ export const useUrlSync = (
         .split(",")
         .map((source) => source.trim())
         .filter((source) => source.length > 0);
-      providedSources.forEach((source) => {
-        if (!state.selectedSources.value.has(source)) {
-          state.negatedSources.value.add(source);
+
+      const negatedIds: string[] = [];
+      for (const source of providedSources) {
+        if (source === "inkdex") {
+          negatedIds.push("inkdex");
+        } else if (source.includes("/")) {
+          // URL params are automatically decoded, use directly as ID
+          const existing = customRepos.value.find((r) => r.id === source);
+          if (existing) {
+            negatedIds.push(source);
+          }
+        }
+      }
+      negatedIds.forEach((id) => {
+        if (!state.selectedSources.value.has(id)) {
+          state.negatedSources.value.add(id);
         }
       });
     }
@@ -237,43 +263,35 @@ export const useUrlSync = (
 
     const urlParams = new URLSearchParams();
 
-    // Add positive source filters (selected repositories) - use IDs only
+    // Add positive source filters (selected repositories) - use owner/repo format
     if (state.selectedSources.value.size > 0) {
-      const repoIds = Array.from(state.selectedSources.value);
-      urlParams.set("r", repoIds.join(","));
+      const repoIdentifiers: string[] = [];
+      for (const repoId of state.selectedSources.value) {
+        const repo = customRepos.value.find((r) => r.id === repoId);
+        if (repo && repo.owner && repo.name) {
+          repoIdentifiers.push(`${repo.owner}/${repo.name}`);
+        } else if (repoId === "inkdex") {
+          repoIdentifiers.push("inkdex");
+        }
+      }
+      if (repoIdentifiers.length > 0) {
+        urlParams.set("r", repoIdentifiers.join(","));
+      }
     }
 
-    // Add negated source filters - use IDs only
+    // Add negated source filters - use owner/repo format
     if (state.negatedSources.value.size > 0) {
-      const repoIds = Array.from(state.negatedSources.value);
-      urlParams.set("nr", repoIds.join(","));
-    }
-
-    // Add ar parameter with URLs for non-inkdex repos in r and nr
-    const nonInkdexRepos = new Set(
-      [...state.selectedSources.value, ...state.negatedSources.value].filter(
-        (id) => id !== "inkdex",
-      ),
-    );
-
-    if (nonInkdexRepos.size > 0) {
-      const arUrls: string[] = [];
-      for (const repoId of nonInkdexRepos) {
+      const repoIdentifiers: string[] = [];
+      for (const repoId of state.negatedSources.value) {
         const repo = customRepos.value.find((r) => r.id === repoId);
-        if (
-          repo &&
-          repo.owner &&
-          repo.name &&
-          repo.owner.length > 0 &&
-          repo.name.length > 0
-        ) {
-          arUrls.push(
-            `https://github.com/${repo.owner}/${repo.name}${repo.branch !== "gh-pages" ? `/tree/${repo.branch}` : ""}`,
-          );
+        if (repo && repo.owner && repo.name) {
+          repoIdentifiers.push(`${repo.owner}/${repo.name}`);
+        } else if (repoId === "inkdex") {
+          repoIdentifiers.push("inkdex");
         }
       }
-      if (arUrls.length > 0) {
-        urlParams.set("ar", arUrls.join(","));
+      if (repoIdentifiers.length > 0) {
+        urlParams.set("nr", repoIdentifiers.join(","));
       }
     }
 
diff --git a/src/.vitepress/theme/lib/extensions.ts b/src/.vitepress/theme/lib/extensions.ts
index 1a26e4d..471176f 100644
--- a/src/.vitepress/theme/lib/extensions.ts
+++ b/src/.vitepress/theme/lib/extensions.ts
@@ -2,14 +2,7 @@
 /* Copyright © 2025 Inkdex */
 
 import { ref } from "vue";
-
-export interface GitHubFile {
-  name: string;
-  path: string;
-  type: "file" | "dir";
-  html_url: string;
-  download_url?: string;
-}
+import { LANGUAGE_EMOJI_MAP, LANGUAGE_NAMES_MAP } from "./languageData";
 
 export interface ExtensionMetadata {
   id: string;
@@ -40,6 +33,7 @@ export interface Extension {
   metadata?: ExtensionMetadata;
   iconUrl?: string;
   repoId?: string;
+  sourceRepo?: string;
 }
 
 export interface CustomRepository {
@@ -50,7 +44,7 @@ export interface CustomRepository {
   displayName: string;
 }
 
-const STORAGE_KEY = "inkdex-custom-repos";
+const STORAGE_KEY = "inkdex-custom-repositories";
 const DEFAULT_REPOS: Omit<CustomRepository, "displayName">[] = [
   { id: "inkdex", name: "extensions", owner: "inkdex", branch: "master" },
 ];
@@ -138,29 +132,8 @@ export const getLanguageName = (language: string | null): string => {
     return "Multi Language";
   }
 
-  const languageNames: Record<string, string> = {
-    en: "English",
-    es: "Spanish",
-    fr: "French",
-    de: "German",
-    it: "Italian",
-    pt: "Portuguese",
-    ru: "Russian",
-    ja: "Japanese",
-    zh: "Chinese",
-    ko: "Korean",
-    ar: "Arabic",
-    tr: "Turkish",
-    pl: "Polish",
-    nl: "Dutch",
-    id: "Indonesian",
-    th: "Thai",
-    vi: "Vietnamese",
-    hi: "Hindi",
-  };
-
   return (
-    languageNames[normalized] ||
+    LANGUAGE_NAMES_MAP[normalized] ||
     normalized.charAt(0).toUpperCase() + normalized.slice(1)
   );
 };
@@ -175,28 +148,7 @@ export const getLanguageEmoji = (language: string | null): string | null => {
     return "🌐";
   }
 
-  const emojiMap: Record<string, string> = {
-    en: "🇬🇧",
-    es: "🇪🇸",
-    fr: "🇫🇷",
-    de: "🇩🇪",
-    it: "🇮🇹",
-    pt: "🇵🇹",
-    ru: "🇷🇺",
-    ja: "🇯🇵",
-    zh: "🇨🇳",
-    ko: "🇰🇷",
-    ar: "🇸🇦",
-    tr: "🇹🇷",
-    pl: "🇵🇱",
-    nl: "🇳🇱",
-    id: "🇮🇩",
-    th: "🇹🇭",
-    vi: "🇻🇳",
-    hi: "🇮🇳",
-  };
-
-  return emojiMap[normalized] || null;
+  return LANGUAGE_EMOJI_MAP[normalized] || null;
 };
 
 export const buildIconUrl = (
@@ -215,88 +167,121 @@ export const buildBaseUrl = (repo: {
   return `https://raw.githubusercontent.com/${repo.owner}/${repo.name}/${repo.branch}/0.9/stable`;
 };
 
-// Cache for API responses with repo count * minutes TTL
-const MINUTE_MS = 60 * 1000; // 1 minute in milliseconds
-const CACHE_STORAGE_KEY = "inkdex_api_cache";
-
-interface CacheEntry {
-  data: any;
-  fetchTime: number; // When the data was fetched
-}
+const CACHE_STORAGE_KEY = "inkdex-github-cache";
 
-interface CacheStorage {
-  [key: string]: CacheEntry;
-}
-
-const loadCache = (): CacheStorage => {
-  if (typeof localStorage === "undefined") return {};
+const loadFromStorage = (key: string): any | null => {
+  if (typeof localStorage === "undefined") return null;
   try {
-    const stored = localStorage.getItem(CACHE_STORAGE_KEY);
-    return stored ? JSON.parse(stored) : {};
+    const stored = localStorage.getItem(`${CACHE_STORAGE_KEY}:${key}`);
+    return stored ? JSON.parse(stored) : null;
   } catch {
-    return {};
+    return null;
   }
 };
 
-const saveCache = (cache: CacheStorage): void => {
+const saveToStorage = (key: string, data: any): void => {
   if (typeof localStorage === "undefined") return;
   try {
-    localStorage.setItem(CACHE_STORAGE_KEY, JSON.stringify(cache));
+    localStorage.setItem(`${CACHE_STORAGE_KEY}:${key}`, JSON.stringify(data));
   } catch (e) {
-    console.warn("Failed to save cache to localStorage:", e);
+    console.warn("Failed to save to localStorage:", e);
   }
 };
 
-// Function to get cached data with information about expiration status
-const getCachedDataWithStatus = (
-  key: string,
-  allRepos: CustomRepository[] = [],
-): { data: any | null; isExpired: boolean } => {
-  const cache = loadCache();
-  const cached = cache[key];
-  if (!cached) return { data: null, isExpired: false };
-
-  // Calculate TTL based on current repo count
-  const ttlMs = calculateRepoBasedTtl(allRepos);
-  const isExpired = Date.now() - cached.fetchTime > ttlMs;
-
-  if (isExpired) {
-    return { data: cached.data, isExpired: true }; // Return expired data but indicate it's expired
-  }
-
-  return { data: cached.data, isExpired: false };
+const INKDEX_METADATA_KEY = "inkdex/extensions-metadata";
+
+const INKDEX_CATEGORY_TO_REPO: Record<string, string> = {
+  "general-extensions": "inkdex/general-extensions",
+  "madara-extensions": "inkdex/madara-extensions",
+  "mangabox-extensions": "inkdex/mangabox-extensions",
+  "mangastream-extensions": "inkdex/mangastream-extensions",
+  "mangaworld-extensions": "inkdex/mangaworld-extensions",
+  "liliana-extensions": "inkdex/liliana-extensions",
+  "animace-extensions": "inkdex/animace-extensions",
+  "tracker-extensions": "inkdex/tracker-extensions",
 };
 
-// Function to get only non-expired cached data
-const getCachedData = (
-  key: string,
-  allRepos: CustomRepository[] = [],
-): any | null => {
-  const result = getCachedDataWithStatus(key, allRepos);
-  if (result.isExpired) {
-    // Only remove expired cache when explicitly checked for non-expired data
-    const cache = loadCache();
-    delete cache[key];
-    saveCache(cache);
-    return null;
+export const fetchInkdexMetadata = async (): Promise<Record<
+  string,
+  string
+> | null> => {
+  const cached = loadFromStorage(INKDEX_METADATA_KEY);
+  if (cached) return cached;
+
+  const url =
+    "https://raw.githubusercontent.com/inkdex/extensions/refs/heads/master/0.9/stable/metadata.json";
+
+  try {
+    const response = await fetch(url);
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+    }
+    const data = await response.json();
+
+    const extensionToRepo: Record<string, string> = {};
+
+    for (const [category, extensions] of Object.entries(data)) {
+      const repo = INKDEX_CATEGORY_TO_REPO[category];
+      if (!repo) continue;
+
+      for (const extName of Object.keys(extensions as object)) {
+        extensionToRepo[extName] = repo;
+      }
+    }
+
+    saveToStorage(INKDEX_METADATA_KEY, extensionToRepo);
+    return extensionToRepo;
+  } catch (error) {
+    console.error("Failed to fetch Inkdex metadata:", error);
+    return cached;
   }
-  return result.data;
 };
 
-const setCachedData = (key: string, data: any): void => {
-  const cache = loadCache();
-  cache[key] = { data, fetchTime: Date.now() };
-  saveCache(cache);
+export const getInkdexSourceRepo = (
+  extensionName: string,
+  inkdexMetadata: Record<string, string> | null,
+): string | null => {
+  return inkdexMetadata?.[extensionName] || null;
 };
 
-// Calculate TTL based on repo count in minutes to stay within 60 req/hour limit
-const calculateRepoBasedTtl = (allRepos: CustomRepository[]): number => {
-  // Use the number of repos as cache TTL in minutes to prevent over-fetching
-  // If there are n repos, cache for n minutes to avoid exceeding 60 req/hour limit
-  const repoCount = allRepos.length;
-  // At least 1 minute to prevent spamming GitHub
-  const minutes = Math.max(repoCount, 1);
-  return minutes * MINUTE_MS;
+// Enhanced error handling for API calls
+export const fetchVersioningJson = async (repo: {
+  owner: string;
+  name: string;
+  branch: string;
+}): Promise<{ sources: ExtensionMetadata[] } | null> => {
+  const cacheKey = `${repo.owner}/${repo.name}/${repo.branch}`;
+
+  // Fetch fresh data from GitHub
+  const url = `https://raw.githubusercontent.com/${repo.owner}/${repo.name}/${repo.branch}/0.9/stable/versioning.json`;
+
+  try {
+    const response = await fetch(url);
+
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+    }
+
+    const data = await response.json();
+    saveToStorage(cacheKey, data);
+    return data;
+  } catch (error) {
+    const errorMessage =
+      error instanceof Error ? error.message : "Unknown error";
+    console.error(
+      `Failed to fetch metadata from ${repo.owner}/${repo.name}:`,
+      errorMessage,
+    );
+
+    // If fetch fails, try to use existing localStorage entry
+    const fallback = loadFromStorage(cacheKey);
+    if (fallback) {
+      console.warn(`Using stored data for ${repo.owner}/${repo.name}`);
+      return fallback;
+    }
+
+    return null;
+  }
 };
 
 // Capability flags (SourceIntents)
@@ -304,7 +289,7 @@ const CAPABILITY_CHAPTER_PROVIDING = 1 << 0; // 1
 const CAPABILITY_MANGA_PROGRESS_PROVIDING = 1 << 1; // 2
 const CAPABILITY_CLOUDFLARE_BYPASS_PROVIDING = 1 << 4; // 16
 
-export const hasCapability = (
+const hasCapability = (
   capabilities: number | number[],
   flag: number,
 ): boolean => {
@@ -358,62 +343,6 @@ export const saveCustomRepos = (repos: CustomRepository[]): void => {
   localStorage.setItem(STORAGE_KEY, JSON.stringify(repos));
 };
 
-// Enhanced error handling for API calls
-export const fetchVersioningJson = async (
-  repo: {
-    owner: string;
-    name: string;
-    branch: string;
-  },
-  allRepos: CustomRepository[] = [],
-): Promise<{ sources: ExtensionMetadata[] } | null> => {
-  const cacheKey = `versioning:${repo.owner}/${repo.name}/${repo.branch}`;
-
-  // First, check if there's any cached data (expired or not) to use as backup
-  const expiredCacheResult = getCachedDataWithStatus(cacheKey, allRepos);
-  const hasExpiredCache =
-    expiredCacheResult.isExpired && expiredCacheResult.data !== null;
-  const expiredCacheData = hasExpiredCache ? expiredCacheResult.data : null;
-
-  // Get non-expired cached data (this removes expired cache)
-  const cached = getCachedData(cacheKey, allRepos);
-
-  // If cache exists (and is not expired), return it
-  if (cached) {
-    return cached;
-  }
-
-  // Cache is expired or doesn't exist, fetch from GitHub
-  const url = `https://raw.githubusercontent.com/${repo.owner}/${repo.name}/${repo.branch}/0.9/stable/versioning.json`;
-
-  try {
-    const response = await fetch(url);
-
-    if (!response.ok) {
-      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-    }
-
-    const data = await response.json();
-    setCachedData(cacheKey, data);
-    return data;
-  } catch (error) {
-    const errorMessage =
-      error instanceof Error ? error.message : "Unknown error";
-    console.error(
-      `Failed to fetch metadata from ${repo.owner}/${repo.name}:`,
-      errorMessage,
-    );
-
-    // If fetch fails and we have expired cache, return it
-    if (expiredCacheData) {
-      console.warn(`Using expired cache for ${repo.owner}/${repo.name}`);
-      return expiredCacheData;
-    }
-
-    return null;
-  }
-};
-
 export const checkBranchExists = async (
   owner: string,
   name: string,
@@ -452,6 +381,7 @@ export const useExtensions = () => {
   const loading = ref(true);
   const error = ref<string | null>(null);
   const customRepos = ref<CustomRepository[]>([]);
+  const inkdexMetadata = ref<Record<string, string> | null>(null);
 
   const loadRepos = () => {
     customRepos.value = loadCustomRepos();
@@ -472,16 +402,17 @@ export const useExtensions = () => {
     error.value = null;
 
     try {
-      const allRepos = getAllRepos();
+      const [inkdexMeta, ...metadataResultsRaw] = await Promise.all([
+        fetchInkdexMetadata(),
+        ...getAllRepos().map(async (repo) => {
+          const data = await fetchVersioningJson(repo);
+          return data ? { repo, data } : null;
+        }),
+      ]);
 
-      const metadataPromises = allRepos.map(async (repo) => {
-        const data = await fetchVersioningJson(repo, allRepos);
-        return data ? { repo, data } : null;
-      });
+      inkdexMetadata.value = inkdexMeta;
 
-      const metadataResults = (await Promise.all(metadataPromises)).filter(
-        (r) => r !== null,
-      );
+      const metadataResults = metadataResultsRaw.filter((r) => r !== null);
 
       const allExtensions: Extension[] = [];
 
@@ -491,6 +422,11 @@ export const useExtensions = () => {
 
         // Always use versioning.json data directly - no need to fetch contents separately
         for (const source of data.sources) {
+          const sourceRepo =
+            repo.id === "inkdex" && inkdexMeta
+              ? inkdexMeta[source.id]
+              : undefined;
+
           allExtensions.push({
             name: source.id,
             source: repo.id,
@@ -501,6 +437,7 @@ export const useExtensions = () => {
             iconUrl: source.icon
               ? buildIconUrl(repo, source.id, source.icon)
               : "https://paperback.moe/pb-placeholder.png",
+            sourceRepo,
           });
         }
       }
@@ -517,6 +454,56 @@ export const useExtensions = () => {
     }
   };
 
+  const fetchExtensionsForRepo = async (
+    repo: CustomRepository,
+  ): Promise<void> => {
+    try {
+      const data = await fetchVersioningJson(repo);
+      if (!data) return;
+
+      const inkdexMeta = await fetchInkdexMetadata();
+      inkdexMetadata.value = inkdexMeta;
+
+      const newExtensions: Extension[] = [];
+
+      for (const source of data.sources) {
+        const sourceRepo =
+          repo.id === "inkdex" && inkdexMeta
+            ? inkdexMeta[source.id]
+            : undefined;
+
+        newExtensions.push({
+          name: source.id,
+          source: repo.id,
+          url: `${buildBaseUrl(repo)}/${source.id}/index.js`,
+          html_url: `https://github.com/${repo.owner}/${repo.name}/tree/${repo.branch}/0.9/stable/${source.id}`,
+          metadata: source,
+          repoId: repo.id,
+          iconUrl: source.icon
+            ? buildIconUrl(repo, source.id, source.icon)
+            : "https://paperback.moe/pb-placeholder.png",
+          sourceRepo,
+        });
+      }
+
+      const existingBySource = new Map(
+        extensions.value
+          .filter((e) => e.source !== repo.id)
+          .map((e) => [e.name, e]),
+      );
+
+      for (const ext of newExtensions) {
+        existingBySource.set(ext.name, ext);
+      }
+
+      extensions.value = Array.from(existingBySource.values()).sort((a, b) =>
+        a.name.localeCompare(b.name),
+      );
+    } catch (e) {
+      console.error(`Failed to fetch extensions for ${repo.id}:`, e);
+    }
+  };
+
   const addCustomRepo = async (
     repoUrl: string,
   ): Promise<{ success: boolean; error?: string }> => {
@@ -562,7 +549,7 @@ export const useExtensions = () => {
       branch = hasGhPages ? "gh-pages" : await getDefaultBranch(owner, name);
     }
 
-    const id = `${owner}-${name}`;
+    const id = `${owner}/${name}`;
     const existing = customRepos.value.find((r) => r.id === id);
     if (existing) {
       // Duplicate found, return success (treat as successful no-op)
@@ -596,9 +583,11 @@ export const useExtensions = () => {
     loading,
     error,
     customRepos,
+    inkdexMetadata,
     loadRepos,
     getAllRepos,
     fetchAllExtensions,
+    fetchExtensionsForRepo,
     addCustomRepo,
     removeCustomRepo,
   };
diff --git a/src/.vitepress/theme/lib/languageData.ts b/src/.vitepress/theme/lib/languageData.ts
new file mode 100644
index 0000000..7559830
--- /dev/null
+++ b/src/.vitepress/theme/lib/languageData.ts
@@ -0,0 +1,111 @@
+/* SPDX-License-Identifier: GPL-3.0-or-later */
+/* Copyright © 2025 Inkdex */
+
+export const LANGUAGE_NAMES_MAP: Record<string, string> = {
+  en: "English",
+  es: "Spanish",
+  fr: "French",
+  de: "German",
+  it: "Italian",
+  pt: "Portuguese",
+  ru: "Russian",
+  ja: "Japanese",
+  zh: "Chinese",
+  ko: "Korean",
+  ar: "Arabic",
+  tr: "Turkish",
+  pl: "Polish",
+  nl: "Dutch",
+  id: "Indonesian",
+  th: "Thai",
+  vi: "Vietnamese",
+  hi: "Hindi",
+  bn: "Bengali",
+  ur: "Urdu",
+  sw: "Swahili",
+  mr: "Marathi",
+  te: "Telugu",
+  ta: "Tamil",
+  gu: "Gujarati",
+  fa: "Persian",
+  uk: "Ukrainian",
+  ml: "Malayalam",
+  kn: "Kannada",
+  or: "Odia",
+  my: "Burmese",
+  pa: "Punjabi",
+  ro: "Romanian",
+  hu: "Hungarian",
+  el: "Greek",
+  cs: "Czech",
+  sv: "Swedish",
+  fi: "Finnish",
+  da: "Danish",
+  no: "Norwegian",
+  he: "Hebrew",
+  sk: "Slovak",
+  bg: "Bulgarian",
+  hr: "Croatian",
+  sr: "Serbian",
+  lt: "Lithuanian",
+  sl: "Slovenian",
+  et: "Estonian",
+  lv: "Latvian",
+};
+
+export const LANGUAGE_EMOJI_MAP: Record<string, string> = {
+  en: "🇬🇧",
+  es: "🇪🇸",
+  fr: "🇫🇷",
+  de: "🇩🇪",
+  it: "🇮🇹",
+  pt: "🇵🇹",
+  ru: "🇷🇺",
+  ja: "🇯🇵",
+  zh: "🇨🇳",
+  ko: "🇰🇷",
+  ar: "🇸🇦",
+  tr: "🇹🇷",
+  pl: "🇵🇱",
+  nl: "🇳🇱",
+  id: "🇮🇩",
+  th: "🇹🇭",
+  vi: "🇻🇳",
+  hi: "🇮🇳",
+  bn: "🇧🇩",
+  ur: "🇵🇰",
+  sw: "🇰🇪",
+  mr: "🇮🇳",
+  te: "🇮🇳",
+  ta: "🇮🇳",
+  gu: "🇮🇳",
+  fa: "🇮🇷",
+  uk: "🇺🇦",
+  ml: "🇮🇳",
+  kn: "🇮🇳",
+  or: "🇮🇳",
+  my: "🇲🇲",
+  pa: "🇮🇳",
+  ro: "🇷🇴",
+  hu: "🇭🇺",
+  el: "🇬🇷",
+  cs: "🇨🇿",
+  sv: "🇸🇪",
+  fi: "🇫🇮",
+  da: "🇩🇰",
+  no: "🇳🇴",
+  he: "🇮🇱",
+  sk: "🇸🇰",
+  bg: "🇧🇬",
+  hr: "🇭🇷",
+  sr: "🇷🇸",
+  lt: "🇱🇹",
+  sl: "🇸🇮",
+  et: "🇪🇪",
+  lv: "🇱🇻",
+};
+
+export const VALID_IETF_LANGUAGE_TAGS = new Set([
+  ...Object.keys(LANGUAGE_EMOJI_MAP),
+  "multi",
+]);