From 23ab2f44b187f72048376bd3637395d781344276 Mon Sep 17 00:00:00 2001
From: g0ldyy <153996346+g0ldyy@users.noreply.github.com>
Date: Sun, 11 Jan 2026 13:45:05 +0100
Subject: [PATCH 1/5] feat: enhance caching policies and improve manifest
 handling

---
 comet/api/endpoints/chilllink.py     |    4 +-
 comet/api/endpoints/manifest.py      |    9 +-
 comet/api/endpoints/stream.py        |  106 +-
 comet/core/config_validation.py      |   55 +
 comet/templates/admin_dashboard.html |   85 +-
 comet/templates/admin_login.html     |   23 +-
 comet/templates/index.html           | 1879 +++++++++++++++-----------
 comet/utils/cache.py                 |   14 +
 8 files changed, 1280 insertions(+), 895 deletions(-)

diff --git a/comet/api/endpoints/chilllink.py b/comet/api/endpoints/chilllink.py
index bd0c852..b6b75a3 100644
--- a/comet/api/endpoints/chilllink.py
+++ b/comet/api/endpoints/chilllink.py
@@ -1,5 +1,3 @@
-import random
-import string
 from typing import Optional
 
 from fastapi import APIRouter, BackgroundTasks, Query, Request
@@ -28,7 +26,7 @@ async def chilllink_manifest(request: Request, b64config: str = None):
     config = config_check(b64config)
 
     manifest = {
-        "id": f"{settings.ADDON_ID}.{''.join(random.choice(string.ascii_letters) for _ in range(4))}",
+        "id": settings.ADDON_ID,
         "version": "2.0.0",
         "description": "Chillio's fastest debrid search add-on.",
         "supported_endpoints": {"feeds": None, "streams": "/streams"},
diff --git a/comet/api/endpoints/manifest.py b/comet/api/endpoints/manifest.py
index 5a0e3b6..e53a8a0 100644
--- a/comet/api/endpoints/manifest.py
+++ b/comet/api/endpoints/manifest.py
@@ -1,6 +1,3 @@
-import random
-import string
-
 from fastapi import APIRouter, Request
 
 from comet.core.config_validation import config_check
@@ -27,7 +24,7 @@ router = APIRouter()
 )
 async def manifest(request: Request, b64config: str = None):
     base_manifest = {
-        "id": f"{settings.ADDON_ID}.{''.join(random.choice(string.ascii_letters) for _ in range(4))}",
+        "id": settings.ADDON_ID,
         "description": "Stremio's fastest torrent/debrid search add-on.",
         "version": "2.0.0",
         "catalogs": [],
@@ -58,9 +55,7 @@ async def manifest(request: Request, b64config: str = None):
     )
 
     if settings.HTTP_CACHE_ENABLED:
-        base_manifest_etag_data = base_manifest.copy()
-        base_manifest_etag_data.pop("id", None)
-        etag = generate_etag(base_manifest_etag_data)
+        etag = generate_etag(base_manifest)
         if check_etag_match(request, etag):
             return not_modified_response(etag)
 
diff --git a/comet/api/endpoints/stream.py b/comet/api/endpoints/stream.py
index eaef725..fd33f1f 100644
--- a/comet/api/endpoints/stream.py
+++ b/comet/api/endpoints/stream.py
@@ -5,7 +5,7 @@ from urllib.parse import quote
 import aiohttp
 from fastapi import APIRouter, BackgroundTasks, Request
 
-from comet.core.config_validation import config_check
+from comet.core.config_validation import config_check, is_default_config
 from comet.core.logger import logger
 from comet.core.models import database, settings, trackers
 from comet.debrid.exceptions import DebridAuthError
@@ -31,6 +31,7 @@ def _build_stream_response(
     request: Request,
     content: dict,
     is_public: bool = False,
+    is_empty: bool = False,
     vary_headers: list = None,
 ):
     if not settings.HTTP_CACHE_ENABLED:
@@ -41,7 +42,10 @@ def _build_stream_response(
     if check_etag_match(request, etag):
         return not_modified_response(etag)
 
-    if is_public:
+    if is_empty:
+        cache_policy = CachePolicies.empty_results()
+        vary = ["Accept", "Accept-Encoding"]
+    elif is_public:
         cache_policy = CachePolicies.public_torrents()
         vary = ["Accept", "Accept-Encoding"]
     else:
@@ -177,12 +181,12 @@ async def stream(
 
     if media_type not in ["movie", "series"]:
         return _build_stream_response(
-            request, {"streams": []}, is_public=is_public_request
+            request, {"streams": []}, is_public=True, is_empty=True
         )
 
     if "tmdb:" in media_id:
         return _build_stream_response(
-            request, {"streams": []}, is_public=is_public_request
+            request, {"streams": []}, is_public=True, is_empty=True
         )
 
     media_id = media_id.replace("imdb_id:", "")
@@ -198,7 +202,12 @@ async def stream(
                 }
             ]
         }
-        return error_response
+        return _build_stream_response(
+            request, error_response, is_public=True, is_empty=True
+        )
+
+    if is_default_config(config):
+        is_public_request = True
 
     is_torrent = config["debridService"] == "torrent"
     if settings.DISABLE_TORRENT_STREAMS and is_torrent:
@@ -238,7 +247,8 @@ async def stream(
                             }
                         ]
                     },
-                    is_public=is_public_request,
+                    is_public=True,
+                    is_empty=True,
                 )
 
         # Check if metadata is already cached
@@ -335,15 +345,20 @@ async def stream(
             if lock_acquired and scrape_lock:
                 await scrape_lock.release()
             logger.log("SCRAPER", f"❌ Failed to fetch metadata for {media_id}")
-            return {
-                "streams": [
-                    {
-                        "name": "[⚠️] Comet",
-                        "description": "Unable to get metadata.",
-                        "url": "https://comet.feels.legal",
-                    }
-                ]
-            }
+            return _build_stream_response(
+                request,
+                {
+                    "streams": [
+                        {
+                            "name": "[⚠️] Comet",
+                            "description": "Unable to get metadata.",
+                            "url": "https://comet.feels.legal",
+                        }
+                    ]
+                },
+                is_public=True,
+                is_empty=True,
+            )
 
         title = metadata["title"]
         year = metadata["year"]
@@ -449,15 +464,20 @@ async def stream(
                 )
 
                 if len(torrent_manager.torrents) == 0:
-                    return {
-                        "streams": [
-                            {
-                                "name": "[🔄] Comet",
-                                "description": "Scraping in progress by another instance, please try again in a few seconds...",
-                                "url": "https://comet.feels.legal",
-                            }
-                        ]
-                    }
+                    return _build_stream_response(
+                        request,
+                        {
+                            "streams": [
+                                {
+                                    "name": "[🔄] Comet",
+                                    "description": "Scraping in progress by another instance, please try again in a few seconds...",
+                                    "url": "https://comet.feels.legal",
+                                }
+                            ]
+                        },
+                        is_public=True,
+                        is_empty=True,
+                    )
 
         elif is_first or cache_is_stale:
             # Background scrape if first search OR if cache is stale (needs refresh)
@@ -527,15 +547,20 @@ async def stream(
                     episode,
                 )
             except DebridAuthError as e:
-                return {
-                    "streams": [
-                        {
-                            "name": "[❌] Comet",
-                            "description": e.display_message,
-                            "url": "https://comet.feels.legal",
-                        }
-                    ]
-                }
+                return _build_stream_response(
+                    request,
+                    {
+                        "streams": [
+                            {
+                                "name": "[❌] Comet",
+                                "description": e.display_message,
+                                "url": "https://comet.feels.legal",
+                            }
+                        ]
+                    },
+                    is_public=False,
+                    is_empty=True,
+                )
 
         if debrid_service != "torrent":
             cached_count = sum(
@@ -641,14 +666,15 @@ async def stream(
                 non_cached_results.append(the_stream)
 
         if sort_mixed:
-            return _build_stream_response(
-                request,
-                {"streams": cached_results},
-                is_public=is_public_request,
-            )
+            final_streams = cached_results
+        else:
+            final_streams = cached_results + non_cached_results
+
+        has_results = len(final_streams) > 0
 
         return _build_stream_response(
             request,
-            {"streams": cached_results + non_cached_results},
-            is_public=is_public_request,
+            {"streams": final_streams},
+            is_public=is_public_request or not has_results,
+            is_empty=not has_results,
         )
diff --git a/comet/core/config_validation.py b/comet/core/config_validation.py
index dce9ca3..e2032a7 100644
--- a/comet/core/config_validation.py
+++ b/comet/core/config_validation.py
@@ -59,3 +59,58 @@ def config_check(b64config: str):
         return validated_config
     except Exception:
         return default_config  # if it doesn't pass, return default config
+
+
+def is_default_config(config: dict) -> bool:
+    if config is None:
+        return True
+
+    ignored_fields = {
+        "debridApiKey",
+        "debridStreamProxyPassword",
+        "rtnSettings",
+        "rtnRanking",
+        "debridService",
+    }
+
+    if config.get("debridService") != "torrent":
+        return False
+
+    for field, default_value in default_config.items():
+        if field in ignored_fields:
+            continue
+
+        config_value = config.get(field)
+
+        if field == "resolutions":
+            if isinstance(config_value, dict):
+                for res, enabled in config_value.items():
+                    if enabled is False:
+                        return False
+            continue
+
+        if field == "languages":
+            config_lang = config_value or {}
+            default_lang = default_value or {}
+            if config_lang.get("exclude", []) != default_lang.get("exclude", []):
+                return False
+            if config_lang.get("preferred", []) != default_lang.get("preferred", []):
+                return False
+            continue
+
+        if field == "options":
+            config_opts = config_value or {}
+            default_opts = default_value or {}
+            for key in [
+                "remove_ranks_under",
+                "allow_english_in_languages",
+                "remove_unknown_languages",
+            ]:
+                if config_opts.get(key) != default_opts.get(key):
+                    return False
+            continue
+
+        if config_value != default_value:
+            return False
+
+    return True
diff --git a/comet/templates/admin_dashboard.html b/comet/templates/admin_dashboard.html
index 6868eae..3299924 100644
--- a/comet/templates/admin_dashboard.html
+++ b/comet/templates/admin_dashboard.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html class="sl-theme-dark">
   <head>
     <meta charset="UTF-8" />
@@ -44,9 +44,19 @@
           #25292c 0%,
           #0c0d13 100%
         );
-        font-family: system-ui, -apple-system, "Segoe UI", Roboto,
-          "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif,
-          "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",
+        font-family:
+          system-ui,
+          -apple-system,
+          "Segoe UI",
+          Roboto,
+          "Helvetica Neue",
+          "Noto Sans",
+          "Liberation Sans",
+          Arial,
+          sans-serif,
+          "Apple Color Emoji",
+          "Segoe UI Emoji",
+          "Segoe UI Symbol",
           "Noto Color Emoji";
         font-size: 1rem;
         font-weight: 400;
@@ -308,7 +318,8 @@
         border-radius: 50%;
         filter: drop-shadow(0 0 6px currentColor);
         transform: translate3d(104em, 0, 0);
-        animation: fall var(--fall-duration) var(--fall-delay) linear infinite,
+        animation:
+          fall var(--fall-duration) var(--fall-delay) linear infinite,
           tail-fade var(--tail-fade-duration) var(--fall-delay) ease-out
             infinite;
       }
@@ -780,7 +791,7 @@
             star.style.setProperty("--top-offset", `${randomTopOffset}vh`);
             star.style.setProperty(
               "--star-tail-length",
-              `${randomTailLength}em`
+              `${randomTailLength}em`,
             );
             star.style.setProperty("--fall-duration", `${randomFallDuration}s`);
             star.style.setProperty("--fall-delay", "0s");
@@ -956,9 +967,21 @@
                   <h3><sl-icon name="download"></sl-icon> Torrents Analysis</h3>
                   <div class="metric-content">
                     <div class="metric-subsection">
-                      <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px;">
-                        <h4 style="margin: 0;">Top Trackers</h4>
-                        <sl-select id="tracker-limit" size="small" value="5" style="width: 110px;">
+                      <div
+                        style="
+                          display: flex;
+                          justify-content: space-between;
+                          align-items: center;
+                          margin-bottom: 12px;
+                        "
+                      >
+                        <h4 style="margin: 0">Top Trackers</h4>
+                        <sl-select
+                          id="tracker-limit"
+                          size="small"
+                          value="5"
+                          style="width: 110px"
+                        >
                           <sl-option value="5">Top 5</sl-option>
                           <sl-option value="10">Top 10</sl-option>
                           <sl-option value="20">Top 20</sl-option>
@@ -1133,7 +1156,7 @@
 
         // Logs refresh based on selected interval
         const interval = parseInt(
-          document.getElementById("refresh-interval").value
+          document.getElementById("refresh-interval").value,
         );
         logsInterval = setInterval(loadLogs, interval);
       }
@@ -1151,7 +1174,7 @@
         if (document.getElementById("auto-refresh").checked) {
           clearInterval(logsInterval);
           const interval = parseInt(
-            document.getElementById("refresh-interval").value
+            document.getElementById("refresh-interval").value,
           );
           logsInterval = setInterval(loadLogs, interval);
         }
@@ -1189,7 +1212,7 @@
           connections.length > 0
             ? Math.round(
                 connections.reduce((sum, c) => sum + c.duration, 0) /
-                  connections.length
+                  connections.length,
               )
             : 0;
 
@@ -1239,7 +1262,7 @@
                                     <td>
                                         <span class="connection-id">${conn.id.substring(
                                           0,
-                                          8
+                                          8,
                                         )}...</span>
                                     </td>
                                     <td>
@@ -1247,14 +1270,14 @@
                                     </td>
                                     <td>
                                         <span title="${escapeHtml(
-                                          conn.content
+                                          conn.content,
                                         )}">${
-                                  conn.content.length > 25
-                                    ? escapeHtml(
-                                        conn.content.substring(0, 25)
-                                      ) + "..."
-                                    : escapeHtml(conn.content)
-                                }</span>
+                                          conn.content.length > 25
+                                            ? escapeHtml(
+                                                conn.content.substring(0, 25),
+                                              ) + "..."
+                                            : escapeHtml(conn.content)
+                                        }</span>
                                     </td>
                                     <td>
                                         <span style="font-size: 0.875rem; color: #9ca3af;">${
@@ -1263,7 +1286,7 @@
                                     </td>
                                     <td>
                                         <span class="duration-tag">${Math.round(
-                                          conn.duration
+                                          conn.duration,
                                         )}s</span>
                                     </td>
                                     <td>
@@ -1284,7 +1307,7 @@
                                         }</span>
                                     </td>
                                 </tr>
-                            `
+                            `,
                               )
                               .join("")}
                         </tbody>
@@ -1297,7 +1320,7 @@
       async function loadLogs() {
         try {
           const response = await fetch(
-            `/admin/api/logs?since=${lastLogTimestamp}`
+            `/admin/api/logs?since=${lastLogTimestamp}`,
           );
           const data = await response.json();
 
@@ -1341,7 +1364,7 @@
           } ${log.level}</span> <span class="log-module">${log.module}.${
             log.function
           }</span> - <span class="log-message">${escapeHtml(
-            log.message
+            log.message,
           )}</span>`;
 
           container.appendChild(logEntry);
@@ -1388,7 +1411,7 @@
         const hideApiLogs = document.getElementById("hide-api-logs").checked;
         const container = document.getElementById("logs-container");
         const apiLogEntries = container.querySelectorAll(
-          '[data-api-log="true"]'
+          '[data-api-log="true"]',
         );
 
         apiLogEntries.forEach((entry) => {
@@ -1434,7 +1457,7 @@
         const trackerContainer = document.getElementById("tracker-stats");
         const limitSelect = document.getElementById("tracker-limit");
         const limit = limitSelect ? limitSelect.value : "5";
-        
+
         let displayTrackers = torrentsData.by_tracker;
         if (limit !== "all") {
           displayTrackers = displayTrackers.slice(0, parseInt(limit));
@@ -1449,7 +1472,7 @@
               (tracker) => `
             <div class="tracker-item">
               <div class="tracker-name">${escapeHtml(
-                tracker.tracker || "Unknown"
+                tracker.tracker || "Unknown",
               )}</div>
               <div class="tracker-stats">
                 <span class="tracker-count">${tracker.count.toLocaleString()} torrents</span>
@@ -1461,7 +1484,7 @@
                 } avg size</span>
               </div>
             </div>
-          `
+          `,
             )
             .join("");
         }
@@ -1552,7 +1575,7 @@
 
       function showMetricsError() {
         const sections = document.querySelectorAll(
-          ".metric-section .loading-state"
+          ".metric-section .loading-state",
         );
         sections.forEach((section) => {
           section.innerHTML =
@@ -1576,7 +1599,7 @@
               (service) => `
                 <div class="debrid-service-item">
                   <div class="debrid-service-name">${escapeHtml(
-                    service.service
+                    service.service,
                   )}</div>
                   <div class="debrid-service-stats">
                     <span class="service-count">${service.count.toLocaleString()} files</span>
@@ -1588,7 +1611,7 @@
                     }</span>
                   </div>
                 </div>
-              `
+              `,
             )
             .join("");
         }
diff --git a/comet/templates/admin_login.html b/comet/templates/admin_login.html
index eeb12a2..f0c73b8 100644
--- a/comet/templates/admin_login.html
+++ b/comet/templates/admin_login.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html class="sl-theme-dark">
   <head>
     <meta charset="UTF-8" />
@@ -44,9 +44,19 @@
           #25292c 0%,
           #0c0d13 100%
         );
-        font-family: system-ui, -apple-system, "Segoe UI", Roboto,
-          "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif,
-          "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",
+        font-family:
+          system-ui,
+          -apple-system,
+          "Segoe UI",
+          Roboto,
+          "Helvetica Neue",
+          "Noto Sans",
+          "Liberation Sans",
+          Arial,
+          sans-serif,
+          "Apple Color Emoji",
+          "Segoe UI Emoji",
+          "Segoe UI Symbol",
           "Noto Color Emoji";
         font-size: 1rem;
         font-weight: 400;
@@ -125,7 +135,8 @@
         border-radius: 50%;
         filter: drop-shadow(0 0 6px currentColor);
         transform: translate3d(104em, 0, 0);
-        animation: fall var(--fall-duration) var(--fall-delay) linear infinite,
+        animation:
+          fall var(--fall-duration) var(--fall-delay) linear infinite,
           tail-fade var(--tail-fade-duration) var(--fall-delay) ease-out
             infinite;
       }
@@ -235,7 +246,7 @@
             star.style.setProperty("--top-offset", `${randomTopOffset}vh`);
             star.style.setProperty(
               "--star-tail-length",
-              `${randomTailLength}em`
+              `${randomTailLength}em`,
             );
             star.style.setProperty("--fall-duration", `${randomFallDuration}s`);
             star.style.setProperty("--fall-delay", "0s");
diff --git a/comet/templates/index.html b/comet/templates/index.html
index d5c04ae..7d33ed4 100644
--- a/comet/templates/index.html
+++ b/comet/templates/index.html
@@ -1,369 +1,426 @@
-<!DOCTYPE html>
+<!doctype html>
 <html class="sl-theme-dark">
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta content="Comet" property="og:title" />
+    <meta
+      content="Stremio's fastest torrent/debrid search add-on."
+      property="og:description"
+    />
+    <meta content="https://comet.feels.legal" property="og:url" />
+    <meta
+      content="https://raw.githubusercontent.com/g0ldyy/comet/refs/heads/main/comet/assets/icon.png"
+      property="og:image"
+    />
+    <meta content="#6b6ef8" data-react-helmet="true" name="theme-color" />
 
-<head>
-  <meta charset="UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-  <meta content="Comet" property="og:title" />
-  <meta content="Stremio's fastest torrent/debrid search add-on." property="og:description" />
-  <meta content="https://comet.feels.legal" property="og:url" />
-  <meta content="https://raw.githubusercontent.com/g0ldyy/comet/refs/heads/main/comet/assets/icon.png" property="og:image" />
-  <meta content="#6b6ef8" data-react-helmet="true" name="theme-color" />
+    <title>Comet - Stremio's fastest torrent/debrid search add-on.</title>
+    <link
+      id="favicon"
+      rel="icon"
+      type="image/x-icon"
+      href="https://raw.githubusercontent.com/g0ldyy/comet/refs/heads/main/comet/assets/icon.png"
+    />
 
-  <title>Comet - Stremio's fastest torrent/debrid search add-on.</title>
-  <link id="favicon" rel="icon" type="image/x-icon" href="https://raw.githubusercontent.com/g0ldyy/comet/refs/heads/main/comet/assets/icon.png" />
+    <link
+      rel="stylesheet"
+      href="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.20.1/cdn/themes/dark.css"
+    />
+    <script
+      type="module"
+      src="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.20.1/cdn/shoelace-autoloader.js"
+    ></script>
 
-  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.20.1/cdn/themes/dark.css" />
-  <script type="module"
-    src="https://cdn.jsdelivr.net/npm/@shoelace-style/shoelace@2.20.1/cdn/shoelace-autoloader.js"></script>
-
-  <style>
-    :not(:defined) {
-      visibility: hidden;
-    }
-
-    body {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      min-height: 100vh;
-      margin: 0;
-      background: radial-gradient(ellipse at bottom,
-          #25292c 0%,
-          #0c0d13 100%);
-      font-family: system-ui, -apple-system, "Segoe UI", Roboto,
-        "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif,
-        "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",
-        "Noto Color Emoji";
-      font-size: 1rem;
-      font-weight: 400;
-    }
-
-    ::-webkit-scrollbar {
-      overflow: hidden;
-    }
-
-    .header {
-      text-align: center;
-      width: 40%;
-      margin-bottom: 20px;
-      margin-top: 50px;
-    }
-
-    .comet-text {
-      font-size: calc(1.375rem + 1.5vw);
-      font-weight: 500;
-      margin-bottom: 0;
-    }
-
-    .emoji {
-      width: 1em;
-      height: 1em;
-      vertical-align: middle;
-    }
-
-    .form-container {
-      background-color: #1a1d20;
-      padding: 2rem;
-      border-radius: 0.375rem;
-      box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
-      width: 80vw;
-      max-width: 950px;
-      margin-bottom: 50px;
-    }
-
-    .form-item {
-      margin-bottom: 0.75rem;
-    }
-
-    sl-details {
-      margin-bottom: 0.75rem;
-    }
-
-    .centered-item {
-      display: flex;
-      justify-content: center;
-    }
-
-    .margin-left-install {
-      margin-right: 10px;
-    }
-
-    .stars {
-      position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 120%;
-      transform: rotate(-45deg);
-      z-index: -1;
-    }
-
-    .star {
-      --star-color: var(--primary-color);
-      --star-tail-length: 6em;
-      --star-tail-height: 2px;
-      --star-width: calc(var(--star-tail-length) / 6);
-      --fall-duration: 9s;
-      --tail-fade-duration: var(--fall-duration);
-      position: absolute;
-      top: var(--top-offset);
-      left: 0;
-      width: var(--star-tail-length);
-      height: var(--star-tail-height);
-      color: var(--star-color);
-      background: linear-gradient(45deg, currentColor, transparent);
-      border-radius: 50%;
-      filter: drop-shadow(0 0 6px currentColor);
-      transform: translate3d(104em, 0, 0);
-      animation: fall var(--fall-duration) var(--fall-delay) linear infinite,
-        tail-fade var(--tail-fade-duration) var(--fall-delay) ease-out infinite;
-    }
-
-    @media screen and (max-width: 750px) {
-      .star {
-        animation: fall var(--fall-duration) var(--fall-delay) linear infinite;
+    <style>
+      :not(:defined) {
+        visibility: hidden;
       }
-    }
 
-    .star::before,
-    .star::after {
-      position: absolute;
-      content: "";
-      top: 0;
-      left: calc(var(--star-width) / -2);
-      width: var(--star-width);
-      height: 100%;
-      background: linear-gradient(45deg,
+      body {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        min-height: 100vh;
+        margin: 0;
+        background: radial-gradient(
+          ellipse at bottom,
+          #25292c 0%,
+          #0c0d13 100%
+        );
+        font-family:
+          system-ui,
+          -apple-system,
+          "Segoe UI",
+          Roboto,
+          "Helvetica Neue",
+          "Noto Sans",
+          "Liberation Sans",
+          Arial,
+          sans-serif,
+          "Apple Color Emoji",
+          "Segoe UI Emoji",
+          "Segoe UI Symbol",
+          "Noto Color Emoji";
+        font-size: 1rem;
+        font-weight: 400;
+      }
+
+      ::-webkit-scrollbar {
+        overflow: hidden;
+      }
+
+      .header {
+        text-align: center;
+        width: 40%;
+        margin-bottom: 20px;
+        margin-top: 50px;
+      }
+
+      .comet-text {
+        font-size: calc(1.375rem + 1.5vw);
+        font-weight: 500;
+        margin-bottom: 0;
+      }
+
+      .emoji {
+        width: 1em;
+        height: 1em;
+        vertical-align: middle;
+      }
+
+      .form-container {
+        background-color: #1a1d20;
+        padding: 2rem;
+        border-radius: 0.375rem;
+        box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+        width: 80vw;
+        max-width: 950px;
+        margin-bottom: 50px;
+      }
+
+      .form-item {
+        margin-bottom: 0.75rem;
+      }
+
+      sl-details {
+        margin-bottom: 0.75rem;
+      }
+
+      .centered-item {
+        display: flex;
+        justify-content: center;
+      }
+
+      .margin-left-install {
+        margin-right: 10px;
+      }
+
+      .stars {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 120%;
+        transform: rotate(-45deg);
+        z-index: -1;
+      }
+
+      .star {
+        --star-color: var(--primary-color);
+        --star-tail-length: 6em;
+        --star-tail-height: 2px;
+        --star-width: calc(var(--star-tail-length) / 6);
+        --fall-duration: 9s;
+        --tail-fade-duration: var(--fall-duration);
+        position: absolute;
+        top: var(--top-offset);
+        left: 0;
+        width: var(--star-tail-length);
+        height: var(--star-tail-height);
+        color: var(--star-color);
+        background: linear-gradient(45deg, currentColor, transparent);
+        border-radius: 50%;
+        filter: drop-shadow(0 0 6px currentColor);
+        transform: translate3d(104em, 0, 0);
+        animation:
+          fall var(--fall-duration) var(--fall-delay) linear infinite,
+          tail-fade var(--tail-fade-duration) var(--fall-delay) ease-out
+            infinite;
+      }
+
+      @media screen and (max-width: 750px) {
+        .star {
+          animation: fall var(--fall-duration) var(--fall-delay) linear infinite;
+        }
+      }
+
+      .star::before,
+      .star::after {
+        position: absolute;
+        content: "";
+        top: 0;
+        left: calc(var(--star-width) / -2);
+        width: var(--star-width);
+        height: 100%;
+        background: linear-gradient(
+          45deg,
           transparent,
           currentColor,
-          transparent);
-      border-radius: inherit;
-      animation: blink 2s linear infinite;
-    }
-
-    .star::before {
-      transform: rotate(45deg);
-    }
-
-    .star::after {
-      transform: rotate(-45deg);
-    }
-
-    @keyframes fall {
-      to {
-        transform: translate3d(-30em, 0, 0);
-      }
-    }
-
-    @keyframes tail-fade {
-
-      0%,
-      50% {
-        width: var(--star-tail-length);
-        opacity: 1;
+          transparent
+        );
+        border-radius: inherit;
+        animation: blink 2s linear infinite;
       }
 
-      70%,
-      80% {
-        width: 0;
-        opacity: 0.4;
+      .star::before {
+        transform: rotate(45deg);
       }
 
-      100% {
-        width: 0;
-        opacity: 0;
-      }
-    }
-
-    @keyframes blink {
-      50% {
-        opacity: 0.6;
-      }
-    }
-
-    /* Custom Styles */
-    .form-item label {
-      display: flex;
-      align-items: center;
-      margin-bottom: 8px;
-      font-weight: 500;
-    }
-
-    #apiKeyLink,
-    #referralLink {
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
-      background: rgba(255, 255, 255, 0.1);
-      backdrop-filter: blur(10px);
-      -webkit-backdrop-filter: blur(10px);
-      color: white;
-      padding: 4px 10px;
-      border-radius: 12px;
-      text-decoration: none;
-      font-size: 0.7rem;
-      font-weight: 600;
-      margin-left: 8px;
-      border: 1px solid rgba(255, 255, 255, 0.25);
-      box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-      transition: all 0.3s ease;
-      line-height: normal;
-      height: auto;
-    }
-
-    #apiKeyLink:hover,
-    #referralLink:hover {
-      background: rgba(255, 255, 255, 0.2);
-      border-color: rgba(255, 255, 255, 0.4);
-      transform: translateY(-1px);
-      box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
-    }
-
-    #apiKeyLink:empty,
-    #referralLink:empty {
-      display: none;
-    }
-
-    .discord-btn::part(base) {
-      background-color: #5865F2;
-      border-color: #5865F2;
-      color: white;
-      font-weight: 600;
-      display: flex;
-      align-items: center;
-    }
-
-    .discord-btn::part(base):hover {
-      background-color: #4752C4;
-      border-color: #4752C4;
-    }
-
-    .heart-button {
-      position: fixed;
-      top: 20px;
-      right: 20px;
-      z-index: 1000;
-      background: rgba(255, 255, 255, 0.1);
-      backdrop-filter: blur(10px);
-      border: 1px solid rgba(255, 255, 255, 0.2);
-      border-radius: 50%;
-      width: 45px;
-      height: 45px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      cursor: pointer;
-      transition: all 0.3s ease;
-      padding: 0;
-    }
-
-    .heart-button:hover {
-      background: rgba(255, 255, 255, 0.2);
-      transform: scale(1.1);
-    }
-
-    .heart-button sl-icon {
-      color: #ff4757;
-      font-size: 1.4rem;
-      display: flex;
-    }
-
-    @keyframes heartbeat {
-      0% {
-        transform: scale(1);
+      .star::after {
+        transform: rotate(-45deg);
       }
 
-      14% {
-        transform: scale(1.1);
-      }
-
-      28% {
-        transform: scale(1);
-      }
-
-      42% {
-        transform: scale(1.1);
-      }
-
-      70% {
-        transform: scale(1);
-      }
-    }
-  </style>
-</head>
-
-<body>
-  <div class="stars"></div>
-
-  <script>
-    let hasTouchScreen = false;
-    if ("maxTouchPoints" in navigator) {
-      hasTouchScreen = navigator.maxTouchPoints > 0;
-    } else if ("msMaxTouchPoints" in navigator) {
-      hasTouchScreen = navigator.msMaxTouchPoints > 0;
-    } else {
-      const mQ = matchMedia?.("(pointer:coarse)");
-      if (mQ?.media === "(pointer:coarse)") {
-        hasTouchScreen = !!mQ.matches;
-      } else if ("orientation" in window) {
-        hasTouchScreen = true;
-      } else {
-        const UA = navigator.userAgent;
-        hasTouchScreen =
-          /\b(BlackBerry|webOS|iPhone|IEMobile)\b/i.test(UA) ||
-          /\b(Android|Windows Phone|iPad|iPod)\b/i.test(UA);
-      }
-    }
-
-    if (!hasTouchScreen) {
-      document.addEventListener("DOMContentLoaded", function () {
-        const starsContainer = document.querySelector(".stars");
-        const starCount = 30;
-
-        for (let i = 0; i < starCount; i++) {
-          const star = document.createElement("div");
-          star.classList.add("star");
-
-          const randomTopOffset = Math.random() * 100;
-          const randomLeftOffset = 80 + Math.random() * 40;
-          const randomTailLength = 5 + Math.random() * 2.5;
-          const randomFallDuration = 6 + Math.random() * 6;
-
-          star.style.setProperty("--top-offset", `${randomTopOffset}vh`);
-          star.style.setProperty(
-            "--star-tail-length",
-            `${randomTailLength}em`
-          );
-          star.style.setProperty("--fall-duration", `${randomFallDuration}s`);
-          star.style.setProperty("--fall-delay", "0s");
-          star.style.transform = `translate3d(${randomLeftOffset}em, 0, 0)`;
-
-          starsContainer.appendChild(star);
+      @keyframes fall {
+        to {
+          transform: translate3d(-30em, 0, 0);
         }
-      });
-    }
-  </script>
-  <div class="header">
-    <div
-      style="display: flex; align-items: center; justify-content: center; gap: 15px; margin-bottom: 10px; height: 50px;">
-      <p class="comet-text" style="margin: 0; display: flex; align-items: center; line-height: 1;">
-        <img class="emoji" src="https://fonts.gstatic.com/s/e/notoemoji/latest/1f4ab/512.gif"
-          style="margin-right: 10px;" />
-        Comet
-      </p>
-      <sl-button href="https://discord.com/invite/UJEqpT42nb" target="_blank" size="small" pill class="discord-btn"
-        style="display: flex; align-items: center;">
-        <sl-icon slot="prefix" name="discord" style="font-size: 1rem;"></sl-icon>
-        Discord
-      </sl-button>
-    </div>
-    {{CUSTOM_HEADER_HTML|safe}}
-  </div>
+      }
 
-  <div class="form-container">
-    <!-- <div class="form-item">
+      @keyframes tail-fade {
+        0%,
+        50% {
+          width: var(--star-tail-length);
+          opacity: 1;
+        }
+
+        70%,
+        80% {
+          width: 0;
+          opacity: 0.4;
+        }
+
+        100% {
+          width: 0;
+          opacity: 0;
+        }
+      }
+
+      @keyframes blink {
+        50% {
+          opacity: 0.6;
+        }
+      }
+
+      /* Custom Styles */
+      .form-item label {
+        display: flex;
+        align-items: center;
+        margin-bottom: 8px;
+        font-weight: 500;
+      }
+
+      #apiKeyLink,
+      #referralLink {
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        background: rgba(255, 255, 255, 0.1);
+        backdrop-filter: blur(10px);
+        -webkit-backdrop-filter: blur(10px);
+        color: white;
+        padding: 4px 10px;
+        border-radius: 12px;
+        text-decoration: none;
+        font-size: 0.7rem;
+        font-weight: 600;
+        margin-left: 8px;
+        border: 1px solid rgba(255, 255, 255, 0.25);
+        box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+        transition: all 0.3s ease;
+        line-height: normal;
+        height: auto;
+      }
+
+      #apiKeyLink:hover,
+      #referralLink:hover {
+        background: rgba(255, 255, 255, 0.2);
+        border-color: rgba(255, 255, 255, 0.4);
+        transform: translateY(-1px);
+        box-shadow: 0 6px 12px rgba(0, 0, 0, 0.2);
+      }
+
+      #apiKeyLink:empty,
+      #referralLink:empty {
+        display: none;
+      }
+
+      .discord-btn::part(base) {
+        background-color: #5865f2;
+        border-color: #5865f2;
+        color: white;
+        font-weight: 600;
+        display: flex;
+        align-items: center;
+      }
+
+      .discord-btn::part(base):hover {
+        background-color: #4752c4;
+        border-color: #4752c4;
+      }
+
+      .heart-button {
+        position: fixed;
+        top: 20px;
+        right: 20px;
+        z-index: 1000;
+        background: rgba(255, 255, 255, 0.1);
+        backdrop-filter: blur(10px);
+        border: 1px solid rgba(255, 255, 255, 0.2);
+        border-radius: 50%;
+        width: 45px;
+        height: 45px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        padding: 0;
+      }
+
+      .heart-button:hover {
+        background: rgba(255, 255, 255, 0.2);
+        transform: scale(1.1);
+      }
+
+      .heart-button sl-icon {
+        color: #ff4757;
+        font-size: 1.4rem;
+        display: flex;
+      }
+
+      @keyframes heartbeat {
+        0% {
+          transform: scale(1);
+        }
+
+        14% {
+          transform: scale(1.1);
+        }
+
+        28% {
+          transform: scale(1);
+        }
+
+        42% {
+          transform: scale(1.1);
+        }
+
+        70% {
+          transform: scale(1);
+        }
+      }
+    </style>
+  </head>
+
+  <body>
+    <div class="stars"></div>
+
+    <script>
+      let hasTouchScreen = false;
+      if ("maxTouchPoints" in navigator) {
+        hasTouchScreen = navigator.maxTouchPoints > 0;
+      } else if ("msMaxTouchPoints" in navigator) {
+        hasTouchScreen = navigator.msMaxTouchPoints > 0;
+      } else {
+        const mQ = matchMedia?.("(pointer:coarse)");
+        if (mQ?.media === "(pointer:coarse)") {
+          hasTouchScreen = !!mQ.matches;
+        } else if ("orientation" in window) {
+          hasTouchScreen = true;
+        } else {
+          const UA = navigator.userAgent;
+          hasTouchScreen =
+            /\b(BlackBerry|webOS|iPhone|IEMobile)\b/i.test(UA) ||
+            /\b(Android|Windows Phone|iPad|iPod)\b/i.test(UA);
+        }
+      }
+
+      if (!hasTouchScreen) {
+        document.addEventListener("DOMContentLoaded", function () {
+          const starsContainer = document.querySelector(".stars");
+          const starCount = 30;
+
+          for (let i = 0; i < starCount; i++) {
+            const star = document.createElement("div");
+            star.classList.add("star");
+
+            const randomTopOffset = Math.random() * 100;
+            const randomLeftOffset = 80 + Math.random() * 40;
+            const randomTailLength = 5 + Math.random() * 2.5;
+            const randomFallDuration = 6 + Math.random() * 6;
+
+            star.style.setProperty("--top-offset", `${randomTopOffset}vh`);
+            star.style.setProperty(
+              "--star-tail-length",
+              `${randomTailLength}em`,
+            );
+            star.style.setProperty("--fall-duration", `${randomFallDuration}s`);
+            star.style.setProperty("--fall-delay", "0s");
+            star.style.transform = `translate3d(${randomLeftOffset}em, 0, 0)`;
+
+            starsContainer.appendChild(star);
+          }
+        });
+      }
+    </script>
+    <div class="header">
+      <div
+        style="
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          gap: 15px;
+          margin-bottom: 10px;
+          height: 50px;
+        "
+      >
+        <p
+          class="comet-text"
+          style="margin: 0; display: flex; align-items: center; line-height: 1"
+        >
+          <img
+            class="emoji"
+            src="https://fonts.gstatic.com/s/e/notoemoji/latest/1f4ab/512.gif"
+            style="margin-right: 10px"
+          />
+          Comet
+        </p>
+        <sl-button
+          href="https://discord.com/invite/UJEqpT42nb"
+          target="_blank"
+          size="small"
+          pill
+          class="discord-btn"
+          style="display: flex; align-items: center"
+        >
+          <sl-icon
+            slot="prefix"
+            name="discord"
+            style="font-size: 1rem"
+          ></sl-icon>
+          Discord
+        </sl-button>
+      </div>
+      {{CUSTOM_HEADER_HTML|safe}}
+    </div>
+
+    <div class="form-container">
+      <!-- <div class="form-item">
         <sl-select
           id="languages_required"
           multiple
@@ -373,106 +430,177 @@
         ></sl-select>
       </div> -->
 
-    <div class="form-item">
-      <sl-select id="languages_preferred" multiple clearable label="Preferred Languages"
-        placeholder="Select preferred languages"></sl-select>
-    </div>
-
-    <div class="form-item">
-      <sl-select id="languages_excluded" multiple clearable label="Excluded Languages"
-        placeholder="Select excluded languages"></sl-select>
-    </div>
-
-    <div class="form-item">
-      <sl-select id="resolutions" multiple clearable label="Resolutions" placeholder="Select resolutions">
-        <sl-option value="r2160p">4K - 2160p</sl-option>
-        <sl-option value="r1080p">Full HD - 1080p</sl-option>
-        <sl-option value="r720p">HD - 720p</sl-option>
-        <sl-option value="r480p">SD - 480p</sl-option>
-        <sl-option value="r360p">LD - 360p</sl-option>
-        <sl-option value="unknown">Unknown</sl-option>
-      </sl-select>
-    </div>
-
-    <div class="form-item">
-      <sl-input id="maxResultsPerResolution" type="number" min="0" value="0" label="Max Results Per Resolution"
-        placeholder="Enter max results per resolution"></sl-input>
-    </div>
-
-    <div class="form-item">
-      <sl-input id="maxSize" type="number" min="0" value="0" label="Max Size (GB)"
-        placeholder="Enter max size in gigabytes"></sl-input>
-    </div>
-
-    <div class="form-item" {% if not proxyDebridStream %}style="display: none" {% endif %}>
-      <sl-input id="debridStreamProxyPassword" label="Debrid Stream Proxy Password" placeholder="Enter password"
-        help-text="Debrid Stream Proxying allows you to use your Debrid Service from multiple IPs at same time!"></sl-input>
-    </div>
-
-    {% set default_debrid_service = 'realdebrid' if disableTorrentStreams else 'torrent' %}
-    <div class="form-item">
-      <sl-select
-        id="debridService"
-        value="{{ default_debrid_service }}"
-        data-default-service="{{ default_debrid_service }}"
-        data-disable-torrent="{{ 'true' if disableTorrentStreams else 'false' }}"
-        label="Debrid Service"
-        placeholder="Select debrid service"
-      >
-        {% if not disableTorrentStreams %}
-        <sl-option value="torrent">Torrent</sl-option>
-        {% endif %}
-        <sl-option value="torbox">TorBox</sl-option>
-        <sl-option value="realdebrid">Real-Debrid</sl-option>
-        <sl-option value="alldebrid">All-Debrid</sl-option>
-        <sl-option value="debridlink">Debrid-Link</sl-option>
-        <sl-option value="premiumize">Premiumize</sl-option>
-        <sl-option value="debrider">Debrider</sl-option>
-        <sl-option value="easydebrid">EasyDebrid</sl-option>
-        <sl-option value="offcloud">Offcloud</sl-option>
-        <sl-option value="pikpak">PikPak</sl-option>
-      </sl-select>
-    </div>
-
-    <div class="form-item">
-      <label for="debridService">
-        Debrid API Key
-        <a id="referralLink" href="" target="_blank"></a>
-        <a id="apiKeyLink" href="" target="_blank"></a>
-      </label>
-      <sl-input id="debridApiKey" placeholder="Enter API key"></sl-input>
-    </div>
-
-    <sl-details summary="Advanced Settings">
       <div class="form-item">
-        <sl-input id="rankThreshold" type="number" value="-10000000000" label="Minimum Rank Threshold"
-          placeholder="Enter minimum rank threshold"
-          help-text="Torrents ranked below this value will be excluded from results."></sl-input>
-        <sl-checkbox id="cachedOnly" help-text="Show only content that has already been cached.">Show Cached
-          Only</sl-checkbox>
-        <sl-checkbox id="sortCachedUncachedTogether" help-text="Disable the default behavior of sorting cached results first, and instead mixes cached and uncached results together.">Sort Cached and Uncached Together</sl-checkbox>
-        <sl-checkbox id="allowEnglishInLanguages"
-          help-text="Allows English language torrents to be included even if you excluded English from your language preferences.">Allow
-          English in Languages</sl-checkbox>
-        <sl-checkbox id="removeUnknownLanguages"
-          help-text="Exclude torrents that don't have a language in the title.">Remove Unknown Languages</sl-checkbox>
-        <sl-checkbox checked id="removeTrash"
-          help-text="Remove all trash from results (if disabled, your filters will not be applied - Adult Content, CAM, Clean Audio, PDTV, R5, Screener, Size, Telecine and Telesync)">Remove
-          Trash</sl-checkbox>
-        <sl-select id="resultFormat" multiple label="Result Format" placeholder="Select what to show in result title"
-          hoist max-options-visible="10">
+        <sl-select
+          id="languages_preferred"
+          multiple
+          clearable
+          label="Preferred Languages"
+          placeholder="Select preferred languages"
+        ></sl-select>
+      </div>
+
+      <div class="form-item">
+        <sl-select
+          id="languages_excluded"
+          multiple
+          clearable
+          label="Excluded Languages"
+          placeholder="Select excluded languages"
+        ></sl-select>
+      </div>
+
+      <div class="form-item">
+        <sl-select
+          id="resolutions"
+          multiple
+          clearable
+          label="Resolutions"
+          placeholder="Select resolutions"
+        >
+          <sl-option value="r2160p">4K - 2160p</sl-option>
+          <sl-option value="r1080p">Full HD - 1080p</sl-option>
+          <sl-option value="r720p">HD - 720p</sl-option>
+          <sl-option value="r480p">SD - 480p</sl-option>
+          <sl-option value="r360p">LD - 360p</sl-option>
+          <sl-option value="unknown">Unknown</sl-option>
         </sl-select>
       </div>
-    </sl-details>
 
-    <script>
-      const debridServiceElement = document.getElementById("debridService");
-      const torrentDisabled = debridServiceElement.dataset.disableTorrent === "true";
-      const defaultDebridService = debridServiceElement.dataset.defaultService;
-      window.disableTorrentStreams = torrentDisabled;
-      window.defaultDebridService = defaultDebridService;
+      <div class="form-item">
+        <sl-input
+          id="maxResultsPerResolution"
+          type="number"
+          min="0"
+          value="0"
+          label="Max Results Per Resolution"
+          placeholder="Enter max results per resolution"
+        ></sl-input>
+      </div>
 
-      debridServiceElement.addEventListener("sl-change", function (event) {
+      <div class="form-item">
+        <sl-input
+          id="maxSize"
+          type="number"
+          min="0"
+          value="0"
+          label="Max Size (GB)"
+          placeholder="Enter max size in gigabytes"
+        ></sl-input>
+      </div>
+
+      <div
+        class="form-item"
+        {%
+        if
+        not
+        proxyDebridStream
+        %}style="display: none"
+        {%
+        endif
+        %}
+      >
+        <sl-input
+          id="debridStreamProxyPassword"
+          label="Debrid Stream Proxy Password"
+          placeholder="Enter password"
+          help-text="Debrid Stream Proxying allows you to use your Debrid Service from multiple IPs at same time!"
+        ></sl-input>
+      </div>
+
+      {% set default_debrid_service = 'realdebrid' if disableTorrentStreams else
+      'torrent' %}
+      <div class="form-item">
+        <sl-select
+          id="debridService"
+          value="{{ default_debrid_service }}"
+          data-default-service="{{ default_debrid_service }}"
+          data-disable-torrent="{{ 'true' if disableTorrentStreams else 'false' }}"
+          label="Debrid Service"
+          placeholder="Select debrid service"
+        >
+          {% if not disableTorrentStreams %}
+          <sl-option value="torrent">Torrent</sl-option>
+          {% endif %}
+          <sl-option value="torbox">TorBox</sl-option>
+          <sl-option value="realdebrid">Real-Debrid</sl-option>
+          <sl-option value="alldebrid">All-Debrid</sl-option>
+          <sl-option value="debridlink">Debrid-Link</sl-option>
+          <sl-option value="premiumize">Premiumize</sl-option>
+          <sl-option value="debrider">Debrider</sl-option>
+          <sl-option value="easydebrid">EasyDebrid</sl-option>
+          <sl-option value="offcloud">Offcloud</sl-option>
+          <sl-option value="pikpak">PikPak</sl-option>
+        </sl-select>
+      </div>
+
+      <div class="form-item">
+        <label for="debridService">
+          Debrid API Key
+          <a id="referralLink" href="" target="_blank"></a>
+          <a id="apiKeyLink" href="" target="_blank"></a>
+        </label>
+        <sl-input id="debridApiKey" placeholder="Enter API key"></sl-input>
+      </div>
+
+      <sl-details summary="Advanced Settings">
+        <div class="form-item">
+          <sl-input
+            id="rankThreshold"
+            type="number"
+            value="-10000000000"
+            label="Minimum Rank Threshold"
+            placeholder="Enter minimum rank threshold"
+            help-text="Torrents ranked below this value will be excluded from results."
+          ></sl-input>
+          <sl-checkbox
+            id="cachedOnly"
+            help-text="Show only content that has already been cached."
+            >Show Cached Only</sl-checkbox
+          >
+          <sl-checkbox
+            id="sortCachedUncachedTogether"
+            help-text="Disable the default behavior of sorting cached results first, and instead mixes cached and uncached results together."
+            >Sort Cached and Uncached Together</sl-checkbox
+          >
+          <sl-checkbox
+            id="allowEnglishInLanguages"
+            help-text="Allows English language torrents to be included even if you excluded English from your language preferences."
+            >Allow English in Languages</sl-checkbox
+          >
+          <sl-checkbox
+            id="removeUnknownLanguages"
+            help-text="Exclude torrents that don't have a language in the title."
+            >Remove Unknown Languages</sl-checkbox
+          >
+          <sl-checkbox
+            checked
+            id="removeTrash"
+            help-text="Remove all trash from results (if disabled, your filters will not be applied - Adult Content, CAM, Clean Audio, PDTV, R5, Screener, Size, Telecine and Telesync)"
+            >Remove Trash</sl-checkbox
+          >
+          <sl-select
+            id="resultFormat"
+            multiple
+            label="Result Format"
+            placeholder="Select what to show in result title"
+            hoist
+            max-options-visible="10"
+          >
+          </sl-select>
+        </div>
+      </sl-details>
+
+      <script>
+        const debridServiceElement = document.getElementById("debridService");
+        const torrentDisabled =
+          debridServiceElement.dataset.disableTorrent === "true";
+        const defaultDebridService =
+          debridServiceElement.dataset.defaultService;
+        window.disableTorrentStreams = torrentDisabled;
+        window.defaultDebridService = defaultDebridService;
+
+        debridServiceElement.addEventListener("sl-change", function (event) {
           const selectedService = event.target.value;
           const apiKeyLink = document.getElementById("apiKeyLink");
           const apiKeyInput = document.getElementById("debridApiKey");
@@ -509,7 +637,8 @@
             apiKeyLink.textContent = "Get it here";
             apiKeyLink.style.display = "inline-block";
 
-            referralLink.href = "https://torbox.app/subscription?referral=1ffb2238-1c5f-402e-a2ce-3d7a86c52d02";
+            referralLink.href =
+              "https://torbox.app/subscription?referral=1ffb2238-1c5f-402e-a2ce-3d7a86c52d02";
             referralLink.textContent = "Sign up here";
             referralLink.style.display = "inline-block";
           } else if (selectedService === "debrider") {
@@ -538,10 +667,7 @@
             apiKeyLink.style.display = "inline-block";
           }
 
-          if (
-            selectedService === "offcloud" ||
-            selectedService === "pikpak"
-          ) {
+          if (selectedService === "offcloud" || selectedService === "pikpak") {
             apiKeyInput.helpText = "Format: `email:password`";
           } else if (!torrentDisabled && selectedService === "torrent") {
             apiKeyInput.helpText = "";
@@ -555,369 +681,506 @@
             apiKeyInput.disabled = false;
           }
         });
-    </script>
-
-    <div class="centered-item">
-      <sl-button id="install" variant="neutral" class="margin-left-install">Install</sl-button>
-      <sl-alert id="installAlert" variant="neutral" duration="3000" closable>
-        <sl-icon slot="icon" name="clipboard2-check"></sl-icon>
-        <strong>Attempting to add the addon to Stremio...</strong>
-      </sl-alert>
-
-      <sl-button id="copy-link" variant="neutral">Copy Link</sl-button>
-      <sl-alert id="copyAlert" variant="neutral" duration="3000" closable>
-        <sl-icon slot="icon" name="clipboard2-check"></sl-icon>
-        <strong>The Stremio addon link has been automatically copied.</strong>
-      </sl-alert>
-
-      <script type="module">
-        const languagesEmojis = {
-          "multi": "🌎",
-          "en": "🇬🇧",  // English
-          "ja": "🇯🇵",  // Japanese
-          "zh": "🇨🇳",  // Chinese
-          "ru": "🇷🇺",  // Russian
-          "ar": "🇸🇦",  // Arabic
-          "pt": "🇵🇹",  // Portuguese
-          "es": "🇪🇸",  // Spanish
-          "fr": "🇫🇷",  // French
-          "de": "🇩🇪",  // German
-          "it": "🇮🇹",  // Italian
-          "ko": "🇰🇷",  // Korean
-          "hi": "🇮🇳",  // Hindi
-          "bn": "🇧🇩",  // Bengali
-          "pa": "🇵🇰",  // Punjabi
-          "mr": "🇮🇳",  // Marathi
-          "gu": "🇮🇳",  // Gujarati
-          "ta": "🇮🇳",  // Tamil
-          "te": "🇮🇳",  // Telugu
-          "kn": "🇮🇳",  // Kannada
-          "ml": "🇮🇳",  // Malayalam
-          "th": "🇹🇭",  // Thai
-          "vi": "🇻🇳",  // Vietnamese
-          "id": "🇮🇩",  // Indonesian
-          "tr": "🇹🇷",  // Turkish
-          "he": "🇮🇱",  // Hebrew
-          "fa": "🇮🇷",  // Persian
-          "uk": "🇺🇦",  // Ukrainian
-          "el": "🇬🇷",  // Greek
-          "lt": "🇱🇹",  // Lithuanian
-          "lv": "🇱🇻",  // Latvian
-          "et": "🇪🇪",  // Estonian
-          "pl": "🇵🇱",  // Polish
-          "cs": "🇨🇿",  // Czech
-          "sk": "🇸🇰",  // Slovak
-          "hu": "🇭🇺",  // Hungarian
-          "ro": "🇷🇴",  // Romanian
-          "bg": "🇧🇬",  // Bulgarian
-          "sr": "🇷🇸",  // Serbian
-          "hr": "🇭🇷",  // Croatian
-          "sl": "🇸🇮",  // Slovenian
-          "nl": "🇳🇱",  // Dutch
-          "da": "🇩🇰",  // Danish
-          "fi": "🇫🇮",  // Finnish
-          "sv": "🇸🇪",  // Swedish
-          "no": "🇳🇴",  // Norwegian
-          "ms": "🇲🇾",  // Malay
-          "la": "💃🏻",  // Latino
-        };
-        let defaultResultFormat = [];
-
-        document.addEventListener("DOMContentLoaded", async () => {
-          await Promise.allSettled([
-            customElements.whenDefined("sl-button"),
-            customElements.whenDefined("sl-alert"),
-            customElements.whenDefined("sl-select"),
-            customElements.whenDefined("sl-input"),
-            customElements.whenDefined("sl-option"),
-            customElements.whenDefined("sl-icon"),
-            customElements.whenDefined("sl-checkbox")
-          ]);
-
-          const webConfig = {{ webConfig| tojson
-        }};
-
-        const resolutionsSelect = document.getElementById("resolutions");
-        resolutionsSelect.value = ["r2160p", "r1080p", "r720p", "r480p", "r360p", "unknown"];
-
-        populateSelect("resultFormat", webConfig.resultFormat);
-        defaultResultFormat = webConfig.resultFormat;
-        const resultFormatSelect = document.getElementById("resultFormat");
-        resultFormatSelect.value = defaultResultFormat;
-
-        // try populate the form from previous settings
-        try {
-          const settings = getSettingsFromUrl();
-          if (settings != null) { populateFormFromSettings(settings); }
-        } catch (error) {
-          console.log("Failed to retrieve or parse settings from URL:", error);
-        }
-
-        // trigger sl-change event on debridService to set initial state
-        const debridServiceSelect = document.getElementById("debridService");
-        debridServiceSelect.dispatchEvent(new Event("sl-change"));
-
-        // Populate language selects
-        // populateSelect("languages_required", Object.keys(languagesEmojis));
-        populateSelect("languages_excluded", Object.keys(languagesEmojis));
-        populateSelect("languages_preferred", Object.keys(languagesEmojis));
-
-        document.body.classList.add("ready");
-              });
-
-        function populateSelect(selectId, options) {
-          const selectElement = document.getElementById(selectId);
-
-          const languageNames = {
-            "multi": "Multi",
-            "en": "English",
-            "ja": "Japanese",
-            "zh": "Chinese",
-            "ru": "Russian",
-            "ar": "Arabic",
-            "pt": "Portuguese",
-            "es": "Spanish",
-            "fr": "French",
-            "de": "German",
-            "it": "Italian",
-            "ko": "Korean",
-            "hi": "Hindi",
-            "bn": "Bengali",
-            "pa": "Punjabi",
-            "mr": "Marathi",
-            "gu": "Gujarati",
-            "ta": "Tamil",
-            "te": "Telugu",
-            "kn": "Kannada",
-            "ml": "Malayalam",
-            "th": "Thai",
-            "vi": "Vietnamese",
-            "id": "Indonesian",
-            "tr": "Turkish",
-            "he": "Hebrew",
-            "fa": "Persian",
-            "uk": "Ukrainian",
-            "el": "Greek",
-            "lt": "Lithuanian",
-            "lv": "Latvian",
-            "et": "Estonian",
-            "pl": "Polish",
-            "cs": "Czech",
-            "sk": "Slovak",
-            "hu": "Hungarian",
-            "ro": "Romanian",
-            "bg": "Bulgarian",
-            "sr": "Serbian",
-            "hr": "Croatian",
-            "sl": "Slovenian",
-            "nl": "Dutch",
-            "da": "Danish",
-            "fi": "Finnish",
-            "sv": "Swedish",
-            "no": "Norwegian",
-            "ms": "Malay",
-            "la": "Latino"
-          };
-
-          options.forEach(option => {
-            const optionElement = document.createElement("sl-option");
-            optionElement.value = option;
-
-            if (selectId.startsWith('languages')) {
-              const flag = languagesEmojis[option] || '';
-              const fullName = languageNames[option] || option;
-              optionElement.textContent = `${flag} ${fullName}`;
-            } else {
-              optionElement.textContent = option;
-            }
-
-            selectElement.appendChild(optionElement);
-          });
-        }
-
-        const installButton = document.querySelector("#install");
-        const installAlert = document.querySelector('#installAlert');
-        const copyLinkButton = document.querySelector("#copy-link");
-        const copyAlert = document.querySelector('#copyAlert');
-
-        function getSettings() {
-          // const languages_required = Array.from(document.getElementById("languages_required").selectedOptions).map(option => option.value);
-          const languages_excluded = Array.from(document.getElementById("languages_excluded").selectedOptions).map(option => option.value);
-          const languages_preferred = Array.from(document.getElementById("languages_preferred").selectedOptions).map(option => option.value);
-          const selectedResolutions = Array.from(document.getElementById("resolutions").selectedOptions).map(option => option.value);
-          const allResolutions = ["r2160p", "r1080p", "r720p", "r480p", "r360p", "unknown"];
-          const resolutions = allResolutions.reduce((obj, res) => {
-            // Only include resolutions that are NOT selected (disabled) as false
-            if (!selectedResolutions.includes(res)) {
-              obj[res] = false;
-            }
-            return obj;
-          }, {});
-          const rankThreshold = document.getElementById("rankThreshold").value;
-          const maxResultsPerResolution = document.getElementById("maxResultsPerResolution").value;
-          const maxSize = document.getElementById("maxSize").value;
-          const cachedOnly = document.getElementById("cachedOnly").checked;
-          const sortCachedUncachedTogether = document.getElementById("sortCachedUncachedTogether").checked;
-          const removeTrash = document.getElementById("removeTrash").checked;
-          const allowEnglishInLanguages = document.getElementById("allowEnglishInLanguages").checked;
-          const removeUnknownLanguages = document.getElementById("removeUnknownLanguages").checked;
-          const resultFormat = Array.from(document.getElementById("resultFormat").selectedOptions).map(option => option.value);
-          let debridService = document.getElementById("debridService").value;
-          if (window.disableTorrentStreams && debridService === "torrent") {
-            debridService = window.defaultDebridService;
-          }
-          const debridApiKey = document.getElementById("debridApiKey").value;
-          const debridStreamProxyPassword = document.getElementById("debridStreamProxyPassword").value;
-
-          const selectedResultFormat = resultFormat.length === defaultResultFormat.length && resultFormat.every((val, index) => val === defaultResultFormat[index]) ? ["all"] : resultFormat;
-
-          return {
-            maxResultsPerResolution: parseInt(maxResultsPerResolution),
-            maxSize: parseFloat(maxSize * 1073741824),
-            cachedOnly: cachedOnly,
-            sortCachedUncachedTogether: sortCachedUncachedTogether,
-            removeTrash: removeTrash,
-            resultFormat: selectedResultFormat,
-            debridService: debridService,
-            debridApiKey: debridApiKey,
-            debridStreamProxyPassword: debridStreamProxyPassword,
-            languages: {
-              // required: languages_required,
-              exclude: languages_excluded,
-              preferred: languages_preferred
-            },
-            resolutions: resolutions,
-            options: {
-              remove_ranks_under: parseFloat(rankThreshold),
-              allow_english_in_languages: allowEnglishInLanguages,
-              remove_unknown_languages: removeUnknownLanguages
-            }
-          };
-        }
-
-        copyLinkButton.addEventListener("click", () => {
-          const settings = getSettings();
-          const settingsString = btoa(JSON.stringify(settings))
-
-          const textArea = document.createElement("textarea");
-          textArea.value = `${window.location.origin}/${settingsString}/manifest.json`;
-          document.body.appendChild(textArea);
-          textArea.focus();
-          textArea.select();
-          document.execCommand("copy");
-          document.body.removeChild(textArea);
-
-          console.log(settingsString);
-
-          copyAlert.toast();
-        });
-
-        installButton.addEventListener("click", () => {
-          const settings = getSettings();
-          const settingsString = btoa(JSON.stringify(settings))
-          window.location.href = `stremio://${window.location.host}/${settingsString}/manifest.json`;
-          console.log(settingsString);
-          installAlert.toast();
-        });
-
-        function getSettingsFromUrl() {
-          const url = window.location.href;
-          // Try parse settings from the URL
-          if (url.split("/").length < 5) {
-            console.log("no previous settings"); return null;
-          }
-          const settingsString = url.split("/")[3];
-          if (typeof settingsString === "undefined") {
-            console.log("can't fetch previous settings", settingsString)
-            return null;
-          }
-          const settingsJson = atob(settingsString);
-          return JSON.parse(settingsJson);
-        }
-
-        function populateFormFromSettings(settings) {
-          if (settings.cachedOnly !== null)
-            document.getElementById("cachedOnly").checked = settings.cachedOnly;
-          if (settings.sortCachedUncachedTogether !== undefined && settings.sortCachedUncachedTogether !== null)
-            document.getElementById("sortCachedUncachedTogether").checked = settings.sortCachedUncachedTogether;
-          if (settings.removeTrash !== null)
-            document.getElementById("removeTrash").checked = settings.removeTrash;
-          if (settings.maxResultsPerResolution !== null)
-            document.getElementById("maxResultsPerResolution").value = settings.maxResultsPerResolution;
-          if (settings.maxSize !== null)
-            document.getElementById("maxSize").value = settings.maxSize / 1073741824;
-          if (settings.debridService !== null) {
-            const debridServiceSelect = document.getElementById("debridService");
-            const requestedService = settings.debridService;
-            if (window.disableTorrentStreams && requestedService === "torrent") {
-              debridServiceSelect.value = window.defaultDebridService;
-            } else {
-              debridServiceSelect.value = requestedService;
-            }
-          }
-          if (settings.debridApiKey !== null)
-            document.getElementById("debridApiKey").value = settings.debridApiKey;
-          if (settings.debridStreamProxyPassword !== null)
-            document.getElementById("debridStreamProxyPassword").value = settings.debridStreamProxyPassword;
-          if (settings.resultFormat !== null && settings.resultFormat != "all")
-            document.getElementById("resultFormat").value = settings.resultFormat;
-          if (settings.languages) {
-            // if (settings.languages.required)
-            //     document.getElementById("languages_required").value = settings.languages.required;
-            if (settings.languages.exclude)
-              document.getElementById("languages_excluded").value = settings.languages.exclude;
-            if (settings.languages.preferred)
-              document.getElementById("languages_preferred").value = settings.languages.preferred;
-          }
-          if (settings.resolutions) {
-            const allResolutions = ["r2160p", "r1080p", "r720p", "r480p", "r360p", "unknown"];
-            const enabledResolutions = allResolutions.filter(res => settings.resolutions[res] !== false);
-            document.getElementById("resolutions").value = enabledResolutions;
-          }
-          if (settings.options?.remove_ranks_under !== undefined)
-            document.getElementById("rankThreshold").value = settings.options.remove_ranks_under;
-          if (settings.options?.allow_english_in_languages !== undefined)
-            document.getElementById("allowEnglishInLanguages").checked = settings.options.allow_english_in_languages;
-          if (settings.options?.remove_unknown_languages !== undefined)
-            document.getElementById("removeUnknownLanguages").checked = settings.options.remove_unknown_languages;
-        }
       </script>
-    </div>
-  </div>
 
-  <div class="heart-button" id="support-trigger">
-    <sl-icon name="heart-fill"></sl-icon>
-  </div>
+      <div class="centered-item">
+        <sl-button id="install" variant="neutral" class="margin-left-install"
+          >Install</sl-button
+        >
+        <sl-alert id="installAlert" variant="neutral" duration="3000" closable>
+          <sl-icon slot="icon" name="clipboard2-check"></sl-icon>
+          <strong>Attempting to add the addon to Stremio...</strong>
+        </sl-alert>
 
-  <sl-dialog label="Support Comet" id="support-dialog" style="--width: 400px;">
-    <div
-      style="display: flex; flex-direction: column; align-items: center; text-align: center; gap: 0.5rem; margin-top: -15px;">
-      <div style="font-size: 2.5rem; animation: heartbeat 1.5s ease-in-out infinite;">❤️</div>
-      <h3 style="margin: 0;">Donate to Me</h3>
-      <p style="color: var(--sl-color-neutral-500); margin: 0; font-size: 0.9rem;">
-        Comet is a passion project fueled by late nights and coffee. Your support helps keep the lights on and the
-        updates rolling!
-      </p>
+        <sl-button id="copy-link" variant="neutral">Copy Link</sl-button>
+        <sl-alert id="copyAlert" variant="neutral" duration="3000" closable>
+          <sl-icon slot="icon" name="clipboard2-check"></sl-icon>
+          <strong>The Stremio addon link has been automatically copied.</strong>
+        </sl-alert>
 
-      <div style="display: flex; flex-direction: column; gap: 8px; width: 100%; margin-top: 10px;">
-        <sl-button href="https://github.com/sponsors/g0ldyy" target="_blank" outline style="width: 100%;">
-          <sl-icon slot="prefix" name="github"></sl-icon>
-          GitHub Sponsors
-        </sl-button>
-        <sl-button href="https://ko-fi.com/g0ldyy" target="_blank" outline
-          style="width: 100%; --sl-color-primary-600: #FF5E5B;">
-          <sl-icon slot="prefix" name="cup-hot"></sl-icon>
-          Ko-fi
-        </sl-button>
+        <script type="module">
+          const languagesEmojis = {
+            "multi": "🌎",
+            "en": "🇬🇧",  // English
+            "ja": "🇯🇵",  // Japanese
+            "zh": "🇨🇳",  // Chinese
+            "ru": "🇷🇺",  // Russian
+            "ar": "🇸🇦",  // Arabic
+            "pt": "🇵🇹",  // Portuguese
+            "es": "🇪🇸",  // Spanish
+            "fr": "🇫🇷",  // French
+            "de": "🇩🇪",  // German
+            "it": "🇮🇹",  // Italian
+            "ko": "🇰🇷",  // Korean
+            "hi": "🇮🇳",  // Hindi
+            "bn": "🇧🇩",  // Bengali
+            "pa": "🇵🇰",  // Punjabi
+            "mr": "🇮🇳",  // Marathi
+            "gu": "🇮🇳",  // Gujarati
+            "ta": "🇮🇳",  // Tamil
+            "te": "🇮🇳",  // Telugu
+            "kn": "🇮🇳",  // Kannada
+            "ml": "🇮🇳",  // Malayalam
+            "th": "🇹🇭",  // Thai
+            "vi": "🇻🇳",  // Vietnamese
+            "id": "🇮🇩",  // Indonesian
+            "tr": "🇹🇷",  // Turkish
+            "he": "🇮🇱",  // Hebrew
+            "fa": "🇮🇷",  // Persian
+            "uk": "🇺🇦",  // Ukrainian
+            "el": "🇬🇷",  // Greek
+            "lt": "🇱🇹",  // Lithuanian
+            "lv": "🇱🇻",  // Latvian
+            "et": "🇪🇪",  // Estonian
+            "pl": "🇵🇱",  // Polish
+            "cs": "🇨🇿",  // Czech
+            "sk": "🇸🇰",  // Slovak
+            "hu": "🇭🇺",  // Hungarian
+            "ro": "🇷🇴",  // Romanian
+            "bg": "🇧🇬",  // Bulgarian
+            "sr": "🇷🇸",  // Serbian
+            "hr": "🇭🇷",  // Croatian
+            "sl": "🇸🇮",  // Slovenian
+            "nl": "🇳🇱",  // Dutch
+            "da": "🇩🇰",  // Danish
+            "fi": "🇫🇮",  // Finnish
+            "sv": "🇸🇪",  // Swedish
+            "no": "🇳🇴",  // Norwegian
+            "ms": "🇲🇾",  // Malay
+            "la": "💃🏻",  // Latino
+          };
+          let defaultResultFormat = [];
+
+          document.addEventListener("DOMContentLoaded", async () => {
+            await Promise.allSettled([
+              customElements.whenDefined("sl-button"),
+              customElements.whenDefined("sl-alert"),
+              customElements.whenDefined("sl-select"),
+              customElements.whenDefined("sl-input"),
+              customElements.whenDefined("sl-option"),
+              customElements.whenDefined("sl-icon"),
+              customElements.whenDefined("sl-checkbox")
+            ]);
+
+            const webConfig = {{ webConfig| tojson }};
+
+
+          const resolutionsSelect = document.getElementById("resolutions");
+          resolutionsSelect.value = ["r2160p", "r1080p", "r720p", "r480p", "r360p", "unknown"];
+
+          populateSelect("resultFormat", webConfig.resultFormat);
+          defaultResultFormat = webConfig.resultFormat;
+          const resultFormatSelect = document.getElementById("resultFormat");
+          resultFormatSelect.value = defaultResultFormat;
+
+          // try populate the form from previous settings
+          try {
+            const settings = getSettingsFromUrl();
+            if (settings != null) { populateFormFromSettings(settings); }
+          } catch (error) {
+            console.log("Failed to retrieve or parse settings from URL:", error);
+          }
+
+          // trigger sl-change event on debridService to set initial state
+          const debridServiceSelect = document.getElementById("debridService");
+          debridServiceSelect.dispatchEvent(new Event("sl-change"));
+
+          // Populate language selects
+          // populateSelect("languages_required", Object.keys(languagesEmojis));
+          populateSelect("languages_excluded", Object.keys(languagesEmojis));
+          populateSelect("languages_preferred", Object.keys(languagesEmojis));
+
+          document.body.classList.add("ready");
+                });
+
+          function populateSelect(selectId, options) {
+            const selectElement = document.getElementById(selectId);
+
+            const languageNames = {
+              "multi": "Multi",
+              "en": "English",
+              "ja": "Japanese",
+              "zh": "Chinese",
+              "ru": "Russian",
+              "ar": "Arabic",
+              "pt": "Portuguese",
+              "es": "Spanish",
+              "fr": "French",
+              "de": "German",
+              "it": "Italian",
+              "ko": "Korean",
+              "hi": "Hindi",
+              "bn": "Bengali",
+              "pa": "Punjabi",
+              "mr": "Marathi",
+              "gu": "Gujarati",
+              "ta": "Tamil",
+              "te": "Telugu",
+              "kn": "Kannada",
+              "ml": "Malayalam",
+              "th": "Thai",
+              "vi": "Vietnamese",
+              "id": "Indonesian",
+              "tr": "Turkish",
+              "he": "Hebrew",
+              "fa": "Persian",
+              "uk": "Ukrainian",
+              "el": "Greek",
+              "lt": "Lithuanian",
+              "lv": "Latvian",
+              "et": "Estonian",
+              "pl": "Polish",
+              "cs": "Czech",
+              "sk": "Slovak",
+              "hu": "Hungarian",
+              "ro": "Romanian",
+              "bg": "Bulgarian",
+              "sr": "Serbian",
+              "hr": "Croatian",
+              "sl": "Slovenian",
+              "nl": "Dutch",
+              "da": "Danish",
+              "fi": "Finnish",
+              "sv": "Swedish",
+              "no": "Norwegian",
+              "ms": "Malay",
+              "la": "Latino"
+            };
+
+            options.forEach(option => {
+              const optionElement = document.createElement("sl-option");
+              optionElement.value = option;
+
+              if (selectId.startsWith('languages')) {
+                const flag = languagesEmojis[option] || '';
+                const fullName = languageNames[option] || option;
+                optionElement.textContent = `${flag} ${fullName}`;
+              } else {
+                optionElement.textContent = option;
+              }
+
+              selectElement.appendChild(optionElement);
+            });
+          }
+
+          const installButton = document.querySelector("#install");
+          const installAlert = document.querySelector('#installAlert');
+          const copyLinkButton = document.querySelector("#copy-link");
+          const copyAlert = document.querySelector('#copyAlert');
+
+          function getSettings() {
+            // const languages_required = Array.from(document.getElementById("languages_required").selectedOptions).map(option => option.value);
+            const languages_excluded = Array.from(document.getElementById("languages_excluded").selectedOptions).map(option => option.value);
+            const languages_preferred = Array.from(document.getElementById("languages_preferred").selectedOptions).map(option => option.value);
+            const selectedResolutions = Array.from(document.getElementById("resolutions").selectedOptions).map(option => option.value);
+            const allResolutions = ["r2160p", "r1080p", "r720p", "r480p", "r360p", "unknown"];
+            const resolutions = allResolutions.reduce((obj, res) => {
+              // Only include resolutions that are NOT selected (disabled) as false
+              if (!selectedResolutions.includes(res)) {
+                obj[res] = false;
+              }
+              return obj;
+            }, {});
+            const rankThreshold = document.getElementById("rankThreshold").value;
+            const maxResultsPerResolution = document.getElementById("maxResultsPerResolution").value;
+            const maxSize = document.getElementById("maxSize").value;
+            const cachedOnly = document.getElementById("cachedOnly").checked;
+            const sortCachedUncachedTogether = document.getElementById("sortCachedUncachedTogether").checked;
+            const removeTrash = document.getElementById("removeTrash").checked;
+            const allowEnglishInLanguages = document.getElementById("allowEnglishInLanguages").checked;
+            const removeUnknownLanguages = document.getElementById("removeUnknownLanguages").checked;
+            const resultFormat = Array.from(document.getElementById("resultFormat").selectedOptions).map(option => option.value);
+            let debridService = document.getElementById("debridService").value;
+            if (window.disableTorrentStreams && debridService === "torrent") {
+              debridService = window.defaultDebridService;
+            }
+            const debridApiKey = document.getElementById("debridApiKey").value;
+            const debridStreamProxyPassword = document.getElementById("debridStreamProxyPassword").value;
+
+            const selectedResultFormat = resultFormat.length === defaultResultFormat.length && resultFormat.every((val, index) => val === defaultResultFormat[index]) ? ["all"] : resultFormat;
+
+            return {
+              maxResultsPerResolution: parseInt(maxResultsPerResolution),
+              maxSize: parseFloat(maxSize * 1073741824),
+              cachedOnly: cachedOnly,
+              sortCachedUncachedTogether: sortCachedUncachedTogether,
+              removeTrash: removeTrash,
+              resultFormat: selectedResultFormat,
+              debridService: debridService,
+              debridApiKey: debridApiKey,
+              debridStreamProxyPassword: debridStreamProxyPassword,
+              languages: {
+                // required: languages_required,
+                exclude: languages_excluded,
+                preferred: languages_preferred
+              },
+              resolutions: resolutions,
+              options: {
+                remove_ranks_under: parseFloat(rankThreshold),
+                allow_english_in_languages: allowEnglishInLanguages,
+                remove_unknown_languages: removeUnknownLanguages
+              }
+            };
+          }
+
+          // Check if config matches all default values
+          // If so, use /manifest.json instead of /{b64config}/manifest.json for better CDN caching
+          function isDefaultConfig(settings) {
+            // Must be torrent mode
+            if (settings.debridService !== "torrent") {
+              return false;
+            }
+
+            // Check all filtering fields match defaults
+            // maxResultsPerResolution default is 0
+            if (settings.maxResultsPerResolution !== 0) {
+              return false;
+            }
+
+            // maxSize default is 0
+            if (settings.maxSize !== 0) {
+              return false;
+            }
+
+            // cachedOnly default is false
+            if (settings.cachedOnly !== false) {
+              return false;
+            }
+
+            // sortCachedUncachedTogether default is false
+            if (settings.sortCachedUncachedTogether !== false) {
+              return false;
+            }
+
+            // removeTrash default is true
+            if (settings.removeTrash !== true) {
+              return false;
+            }
+
+            // resultFormat default is ["all"]
+            if (!settings.resultFormat || 
+                settings.resultFormat.length !== 1 || 
+                settings.resultFormat[0] !== "all") {
+              return false;
+            }
+
+            // resolutions: all should be enabled (no false values in the object)
+            // An empty object means all are enabled (default)
+            for (const [res, enabled] of Object.entries(settings.resolutions || {})) {
+              if (enabled === false) {
+                return false;
+              }
+            }
+
+            // languages: no excludes or preferences (empty arrays)
+            if (settings.languages) {
+              if (settings.languages.exclude && settings.languages.exclude.length > 0) {
+                return false;
+              }
+              if (settings.languages.preferred && settings.languages.preferred.length > 0) {
+                return false;
+              }
+            }
+
+            // options: check defaults
+            if (settings.options) {
+              // remove_ranks_under default is -10000000000
+              if (settings.options.remove_ranks_under !== -10000000000) {
+                return false;
+              }
+              // allow_english_in_languages default is false
+              if (settings.options.allow_english_in_languages !== false) {
+                return false;
+              }
+              // remove_unknown_languages default is false
+              if (settings.options.remove_unknown_languages !== false) {
+                return false;
+              }
+            }
+
+            return true;
+          }
+
+          // Generate the manifest URL - use /manifest.json for default configs
+          function getManifestUrl(settings, forInstall = false) {
+            const isDefault = isDefaultConfig(settings);
+            const protocol = forInstall ? "stremio:" : window.location.protocol;
+            const host = window.location.host;
+
+            if (isDefault) {
+              // Default config: use public manifest URL (better CDN caching)
+              return forInstall
+                ? `stremio://${host}/manifest.json`
+                : `${window.location.origin}/manifest.json`;
+            } else {
+              // Custom config: use b64config in URL
+              const settingsString = btoa(JSON.stringify(settings));
+              return forInstall
+                ? `stremio://${host}/${settingsString}/manifest.json`
+                : `${window.location.origin}/${settingsString}/manifest.json`;
+            }
+          }
+
+          copyLinkButton.addEventListener("click", () => {
+            const settings = getSettings();
+            const manifestUrl = getManifestUrl(settings, false);
+
+            const textArea = document.createElement("textarea");
+            textArea.value = manifestUrl;
+            document.body.appendChild(textArea);
+            textArea.focus();
+            textArea.select();
+            document.execCommand("copy");
+            document.body.removeChild(textArea);
+
+            console.log(isDefaultConfig(settings) ? "Using default manifest URL" : btoa(JSON.stringify(settings)));
+
+            copyAlert.toast();
+          });
+
+          installButton.addEventListener("click", () => {
+            const settings = getSettings();
+            const manifestUrl = getManifestUrl(settings, true);
+            window.location.href = manifestUrl;
+            console.log(isDefaultConfig(settings) ? "Installing with default manifest" : btoa(JSON.stringify(settings)));
+            installAlert.toast();
+          });
+
+          function getSettingsFromUrl() {
+            const url = window.location.href;
+            // Try parse settings from the URL
+            if (url.split("/").length < 5) {
+              console.log("no previous settings"); return null;
+            }
+            const settingsString = url.split("/")[3];
+            if (typeof settingsString === "undefined") {
+              console.log("can't fetch previous settings", settingsString)
+              return null;
+            }
+            const settingsJson = atob(settingsString);
+            return JSON.parse(settingsJson);
+          }
+
+          function populateFormFromSettings(settings) {
+            if (settings.cachedOnly !== null)
+              document.getElementById("cachedOnly").checked = settings.cachedOnly;
+            if (settings.sortCachedUncachedTogether !== undefined && settings.sortCachedUncachedTogether !== null)
+              document.getElementById("sortCachedUncachedTogether").checked = settings.sortCachedUncachedTogether;
+            if (settings.removeTrash !== null)
+              document.getElementById("removeTrash").checked = settings.removeTrash;
+            if (settings.maxResultsPerResolution !== null)
+              document.getElementById("maxResultsPerResolution").value = settings.maxResultsPerResolution;
+            if (settings.maxSize !== null)
+              document.getElementById("maxSize").value = settings.maxSize / 1073741824;
+            if (settings.debridService !== null) {
+              const debridServiceSelect = document.getElementById("debridService");
+              const requestedService = settings.debridService;
+              if (window.disableTorrentStreams && requestedService === "torrent") {
+                debridServiceSelect.value = window.defaultDebridService;
+              } else {
+                debridServiceSelect.value = requestedService;
+              }
+            }
+            if (settings.debridApiKey !== null)
+              document.getElementById("debridApiKey").value = settings.debridApiKey;
+            if (settings.debridStreamProxyPassword !== null)
+              document.getElementById("debridStreamProxyPassword").value = settings.debridStreamProxyPassword;
+            if (settings.resultFormat !== null && settings.resultFormat != "all")
+              document.getElementById("resultFormat").value = settings.resultFormat;
+            if (settings.languages) {
+              // if (settings.languages.required)
+              //     document.getElementById("languages_required").value = settings.languages.required;
+              if (settings.languages.exclude)
+                document.getElementById("languages_excluded").value = settings.languages.exclude;
+              if (settings.languages.preferred)
+                document.getElementById("languages_preferred").value = settings.languages.preferred;
+            }
+            if (settings.resolutions) {
+              const allResolutions = ["r2160p", "r1080p", "r720p", "r480p", "r360p", "unknown"];
+              const enabledResolutions = allResolutions.filter(res => settings.resolutions[res] !== false);
+              document.getElementById("resolutions").value = enabledResolutions;
+            }
+            if (settings.options?.remove_ranks_under !== undefined)
+              document.getElementById("rankThreshold").value = settings.options.remove_ranks_under;
+            if (settings.options?.allow_english_in_languages !== undefined)
+              document.getElementById("allowEnglishInLanguages").checked = settings.options.allow_english_in_languages;
+            if (settings.options?.remove_unknown_languages !== undefined)
+              document.getElementById("removeUnknownLanguages").checked = settings.options.remove_unknown_languages;
+          }
+        </script>
       </div>
     </div>
-  </sl-dialog>
 
-  <script>
-    const dialog = document.querySelector('#support-dialog');
-    const openButton = document.querySelector('#support-trigger');
-    openButton.addEventListener('click', () => dialog.show());
-  </script>
-</body>
+    <div class="heart-button" id="support-trigger">
+      <sl-icon name="heart-fill"></sl-icon>
+    </div>
 
-</html>
\ No newline at end of file
+    <sl-dialog label="Support Comet" id="support-dialog" style="--width: 400px">
+      <div
+        style="
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          text-align: center;
+          gap: 0.5rem;
+          margin-top: -15px;
+        "
+      >
+        <div
+          style="
+            font-size: 2.5rem;
+            animation: heartbeat 1.5s ease-in-out infinite;
+          "
+        >
+          ❤️
+        </div>
+        <h3 style="margin: 0">Donate to Me</h3>
+        <p
+          style="
+            color: var(--sl-color-neutral-500);
+            margin: 0;
+            font-size: 0.9rem;
+          "
+        >
+          Comet is a passion project fueled by late nights and coffee. Your
+          support helps keep the lights on and the updates rolling!
+        </p>
+
+        <div
+          style="
+            display: flex;
+            flex-direction: column;
+            gap: 8px;
+            width: 100%;
+            margin-top: 10px;
+          "
+        >
+          <sl-button
+            href="https://github.com/sponsors/g0ldyy"
+            target="_blank"
+            outline
+            style="width: 100%"
+          >
+            <sl-icon slot="prefix" name="github"></sl-icon>
+            GitHub Sponsors
+          </sl-button>
+          <sl-button
+            href="https://ko-fi.com/g0ldyy"
+            target="_blank"
+            outline
+            style="width: 100%; --sl-color-primary-600: #ff5e5b"
+          >
+            <sl-icon slot="prefix" name="cup-hot"></sl-icon>
+            Ko-fi
+          </sl-button>
+        </div>
+      </div>
+    </sl-dialog>
+
+    <script>
+      const dialog = document.querySelector("#support-dialog");
+      const openButton = document.querySelector("#support-trigger");
+      openButton.addEventListener("click", () => dialog.show());
+    </script>
+  </body>
+</html>
diff --git a/comet/utils/cache.py b/comet/utils/cache.py
index 2db9160..e3a03b2 100644
--- a/comet/utils/cache.py
+++ b/comet/utils/cache.py
@@ -203,6 +203,20 @@ class CachePolicies:
 
         return CacheControl().public().max_age(300).s_maxage(3600)
 
+    @staticmethod
+    def empty_results():
+        """
+        For empty/temporary responses (no torrents found, processing, errors).
+        Short public cache to prevent spam while allowing quick retries.
+        """
+        return (
+            CacheControl()
+            .public()
+            .max_age(15)  # Browser cache 15 seconds
+            .s_maxage(30)  # CDN cache 30 seconds
+            .stale_if_error(60)  # Serve stale on error for 1 minute
+        )
+
     @staticmethod
     def no_cache():
         """

From 60c90bc2e842808c7fbf91d861bcf1a5916fc054 Mon Sep 17 00:00:00 2001
From: g0ldyy <153996346+g0ldyy@users.noreply.github.com>
Date: Sun, 11 Jan 2026 14:40:09 +0100
Subject: [PATCH 2/5] feat: add manifest and configure page caching settings

---
 .env-sample                          |  8 ++++++++
 comet/core/logger.py                 |  2 +-
 comet/core/models.py                 |  2 ++
 comet/utils/cache.py                 | 16 +++++++++-------
 deployment/cloudflare-cache-rules.md | 15 +++++++++++++--
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/.env-sample b/.env-sample
index 83aa61f..66afc91 100644
--- a/.env-sample
+++ b/.env-sample
@@ -290,3 +290,11 @@ HTTP_CACHE_PRIVATE_STREAMS_TTL=60 # 1 minute (recommended: 30-120)
 # Stale-While-Revalidate: serve stale content while fetching fresh in background
 # Improves perceived performance - users get instant response with cached data
 HTTP_CACHE_STALE_WHILE_REVALIDATE=60 # 1 minute
+
+# MANIFEST TTL (for /manifest.json and /{config}/manifest.json)
+# Manifest rarely changes, can be cached longer
+HTTP_CACHE_MANIFEST_TTL=86400 # 24 hours (recommended: 3600-86400)
+
+# CONFIGURE page TTL (for /configure and /{config}/configure)
+# Static page, can be cached for a long time
+HTTP_CACHE_CONFIGURE_TTL=86400 # 24 hours (recommended: 3600-86400)
diff --git a/comet/core/logger.py b/comet/core/logger.py
index 30be3d4..f42e301 100644
--- a/comet/core/logger.py
+++ b/comet/core/logger.py
@@ -436,7 +436,7 @@ def log_startup_info(settings):
     logger.log("COMET", f"Custom Header HTML: {bool(settings.CUSTOM_HEADER_HTML)}")
 
     http_cache_info = (
-        f" - Public Streams TTL: {settings.HTTP_CACHE_PUBLIC_STREAMS_TTL}s - Private Streams TTL: {settings.HTTP_CACHE_PRIVATE_STREAMS_TTL}s - Stale While Revalidate: {settings.HTTP_CACHE_STALE_WHILE_REVALIDATE}s"
+        f" - Public Streams TTL: {settings.HTTP_CACHE_PUBLIC_STREAMS_TTL}s - Private Streams TTL: {settings.HTTP_CACHE_PRIVATE_STREAMS_TTL}s - Manifest TTL: {settings.HTTP_CACHE_MANIFEST_TTL}s - Configure TTL: {settings.HTTP_CACHE_CONFIGURE_TTL}s - SWR: {settings.HTTP_CACHE_STALE_WHILE_REVALIDATE}s"
         if settings.HTTP_CACHE_ENABLED
         else ""
     )
diff --git a/comet/core/models.py b/comet/core/models.py
index 25abd80..18e6d1a 100644
--- a/comet/core/models.py
+++ b/comet/core/models.py
@@ -141,6 +141,8 @@ class AppSettings(BaseSettings):
     HTTP_CACHE_PUBLIC_STREAMS_TTL: Optional[int] = 300
     HTTP_CACHE_PRIVATE_STREAMS_TTL: Optional[int] = 60
     HTTP_CACHE_STALE_WHILE_REVALIDATE: Optional[int] = 60
+    HTTP_CACHE_MANIFEST_TTL: Optional[int] = 86400
+    HTTP_CACHE_CONFIGURE_TTL: Optional[int] = 86400
 
     @field_validator("INDEXER_MANAGER_TYPE")
     def set_indexer_manager_type(cls, v, values):
diff --git a/comet/utils/cache.py b/comet/utils/cache.py
index e3a03b2..46f509f 100644
--- a/comet/utils/cache.py
+++ b/comet/utils/cache.py
@@ -187,21 +187,23 @@ class CachePolicies:
     def manifest():
         """
         For manifest.json responses.
-        Very short cache as it can change based on config.
+        Long cache as manifest rarely changes.
         """
-        return CacheControl().private().max_age(60).must_revalidate()
+        ttl = settings.HTTP_CACHE_MANIFEST_TTL
+        swr = settings.HTTP_CACHE_STALE_WHILE_REVALIDATE
+
+        return CacheControl().public().max_age(ttl).stale_while_revalidate(swr)
 
     @staticmethod
     def configure_page():
         """
         For the /configure page.
-        Cacheable if no custom HTML, otherwise private.
+        Long cache as the page is mostly static.
         """
+        ttl = settings.HTTP_CACHE_CONFIGURE_TTL
+        swr = settings.HTTP_CACHE_STALE_WHILE_REVALIDATE
 
-        if settings.CUSTOM_HEADER_HTML:
-            return CacheControl().private().max_age(300)
-
-        return CacheControl().public().max_age(300).s_maxage(3600)
+        return CacheControl().public().max_age(ttl).stale_while_revalidate(swr)
 
     @staticmethod
     def empty_results():
diff --git a/deployment/cloudflare-cache-rules.md b/deployment/cloudflare-cache-rules.md
index f260f30..f7c35df 100644
--- a/deployment/cloudflare-cache-rules.md
+++ b/deployment/cloudflare-cache-rules.md
@@ -20,12 +20,23 @@ Cache the configuration page.
 *   **Action**: Eligible for Cache
 *   **Edge TTL**: Use cache-control header if present (first option)
 *   **Browser TTL**: Respect origin
+*   **Serve stale content while revalidating**: On
 
-## 3. Tiered Cache
+## 3. Manifest (Cache Rule)
+Cache the add-on manifest.
+
+*   **Rule Name**: Manifest
+*   **Expression**: `(http.request.uri.path contains "/manifest.json")`
+*   **Action**: Eligible for Cache
+*   **Edge TTL**: Use cache-control header if present (first option)
+*   **Browser TTL**: Respect origin
+*   **Serve stale content while revalidating**: On
+
+## 4. Tiered Cache
 Enable **Tiered Cache** in **Caching > Tiered Cache**.
 This minimizes requests to your origin by checking other Cloudflare datacenters first.
 
-## 4. Network Optimizations
+## 5. Network Optimizations
 In **Speed > Protocol**:
 
 *   **HTTP/3 (QUIC)**: On (faster connections, especially on mobile)

From 0fb306310729180a32b52cb063852aad4b2e62fb Mon Sep 17 00:00:00 2001
From: g0ldyy <153996346+g0ldyy@users.noreply.github.com>
Date: Sun, 11 Jan 2026 14:57:19 +0100
Subject: [PATCH 3/5] refactor: unify stream caching settings and update
 related policies

- Consolidated public and private stream TTL settings into a single HTTP_CACHE_STREAMS_TTL.
- Updated cache policies to reflect the new unified stream caching approach.
- Adjusted logging to display the new stream TTL setting.
- Revised documentation to clarify caching behavior for all stream results.
---
 .env-sample                          | 13 ++++------
 comet/api/endpoints/stream.py        | 36 ++++++----------------------
 comet/core/logger.py                 |  2 +-
 comet/core/models.py                 |  3 +--
 comet/utils/cache.py                 | 17 +++----------
 deployment/cloudflare-cache-rules.md |  2 +-
 6 files changed, 17 insertions(+), 56 deletions(-)

diff --git a/.env-sample b/.env-sample
index 66afc91..862dba4 100644
--- a/.env-sample
+++ b/.env-sample
@@ -277,15 +277,10 @@ STREMTHRU_URL=https://stremthru.13377001.xyz # needed to use debrid services
 
 HTTP_CACHE_ENABLED=False # Master switch for HTTP cache headers
 
-# PUBLIC streams TTL (for /stream/movie/tt1234567.json without user config)
-# These can be cached at edge and shared between all users.
-# Higher = less origin traffic, lower = fresher results
-HTTP_CACHE_PUBLIC_STREAMS_TTL=300 # 5 minutes (recommended: 120-600)
-
-# PRIVATE streams TTL (for /{config}/stream/... with user config)  
-# Only cached in user's browser (private cache).
-# These contain user-specific debrid availability info.
-HTTP_CACHE_PRIVATE_STREAMS_TTL=60 # 1 minute (recommended: 30-120)
+# STREAMS streams TTL (for /stream/movie/tt1234567.json)
+# These results are cached at edge and shared between all users.
+# Higher = less traffic to origin, Lower = faster updates for new content
+HTTP_CACHE_STREAMS_TTL=300 # 5 minutes
 
 # Stale-While-Revalidate: serve stale content while fetching fresh in background
 # Improves perceived performance - users get instant response with cached data
diff --git a/comet/api/endpoints/stream.py b/comet/api/endpoints/stream.py
index fd33f1f..a53d328 100644
--- a/comet/api/endpoints/stream.py
+++ b/comet/api/endpoints/stream.py
@@ -5,7 +5,7 @@ from urllib.parse import quote
 import aiohttp
 from fastapi import APIRouter, BackgroundTasks, Request
 
-from comet.core.config_validation import config_check, is_default_config
+from comet.core.config_validation import config_check
 from comet.core.logger import logger
 from comet.core.models import database, settings, trackers
 from comet.debrid.exceptions import DebridAuthError
@@ -30,7 +30,6 @@ streams = APIRouter()
 def _build_stream_response(
     request: Request,
     content: dict,
-    is_public: bool = False,
     is_empty: bool = False,
     vary_headers: list = None,
 ):
@@ -45,12 +44,9 @@ def _build_stream_response(
     if is_empty:
         cache_policy = CachePolicies.empty_results()
         vary = ["Accept", "Accept-Encoding"]
-    elif is_public:
-        cache_policy = CachePolicies.public_torrents()
-        vary = ["Accept", "Accept-Encoding"]
     else:
-        cache_policy = CachePolicies.private_streams()
-        vary = ["Accept", "Accept-Encoding", "Authorization"]
+        cache_policy = CachePolicies.streams()
+        vary = ["Accept", "Accept-Encoding"]
 
     if vary_headers:
         vary.extend(vary_headers)
@@ -177,17 +173,11 @@ async def stream(
     b64config: str = None,
     chilllink: bool = False,
 ):
-    is_public_request = b64config is None
-
     if media_type not in ["movie", "series"]:
-        return _build_stream_response(
-            request, {"streams": []}, is_public=True, is_empty=True
-        )
+        return _build_stream_response(request, {"streams": []}, is_empty=True)
 
     if "tmdb:" in media_id:
-        return _build_stream_response(
-            request, {"streams": []}, is_public=True, is_empty=True
-        )
+        return _build_stream_response(request, {"streams": []}, is_empty=True)
 
     media_id = media_id.replace("imdb_id:", "")
 
@@ -202,12 +192,7 @@ async def stream(
                 }
             ]
         }
-        return _build_stream_response(
-            request, error_response, is_public=True, is_empty=True
-        )
-
-    if is_default_config(config):
-        is_public_request = True
+        return _build_stream_response(request, error_response, is_empty=True)
 
     is_torrent = config["debridService"] == "torrent"
     if settings.DISABLE_TORRENT_STREAMS and is_torrent:
@@ -218,9 +203,7 @@ async def stream(
         if settings.TORRENT_DISABLED_STREAM_URL:
             placeholder_stream["url"] = settings.TORRENT_DISABLED_STREAM_URL
 
-        return _build_stream_response(
-            request, {"streams": [placeholder_stream]}, is_public=is_public_request
-        )
+        return _build_stream_response(request, {"streams": [placeholder_stream]})
 
     connector = aiohttp.TCPConnector(limit=0)
     async with aiohttp.ClientSession(connector=connector) as session:
@@ -247,7 +230,6 @@ async def stream(
                             }
                         ]
                     },
-                    is_public=True,
                     is_empty=True,
                 )
 
@@ -356,7 +338,6 @@ async def stream(
                         }
                     ]
                 },
-                is_public=True,
                 is_empty=True,
             )
 
@@ -475,7 +456,6 @@ async def stream(
                                 }
                             ]
                         },
-                        is_public=True,
                         is_empty=True,
                     )
 
@@ -558,7 +538,6 @@ async def stream(
                             }
                         ]
                     },
-                    is_public=False,
                     is_empty=True,
                 )
 
@@ -675,6 +654,5 @@ async def stream(
         return _build_stream_response(
             request,
             {"streams": final_streams},
-            is_public=is_public_request or not has_results,
             is_empty=not has_results,
         )
diff --git a/comet/core/logger.py b/comet/core/logger.py
index f42e301..60f94c8 100644
--- a/comet/core/logger.py
+++ b/comet/core/logger.py
@@ -436,7 +436,7 @@ def log_startup_info(settings):
     logger.log("COMET", f"Custom Header HTML: {bool(settings.CUSTOM_HEADER_HTML)}")
 
     http_cache_info = (
-        f" - Public Streams TTL: {settings.HTTP_CACHE_PUBLIC_STREAMS_TTL}s - Private Streams TTL: {settings.HTTP_CACHE_PRIVATE_STREAMS_TTL}s - Manifest TTL: {settings.HTTP_CACHE_MANIFEST_TTL}s - Configure TTL: {settings.HTTP_CACHE_CONFIGURE_TTL}s - SWR: {settings.HTTP_CACHE_STALE_WHILE_REVALIDATE}s"
+        f" - Streams TTL: {settings.HTTP_CACHE_STREAMS_TTL}s - Manifest TTL: {settings.HTTP_CACHE_MANIFEST_TTL}s - Configure TTL: {settings.HTTP_CACHE_CONFIGURE_TTL}s - SWR: {settings.HTTP_CACHE_STALE_WHILE_REVALIDATE}s"
         if settings.HTTP_CACHE_ENABLED
         else ""
     )
diff --git a/comet/core/models.py b/comet/core/models.py
index 18e6d1a..a073fa6 100644
--- a/comet/core/models.py
+++ b/comet/core/models.py
@@ -138,8 +138,7 @@ class AppSettings(BaseSettings):
     RATELIMIT_RETRY_BASE_DELAY: Optional[float] = 1.0
     RTN_FILTER_DEBUG: Optional[bool] = False
     HTTP_CACHE_ENABLED: Optional[bool] = False
-    HTTP_CACHE_PUBLIC_STREAMS_TTL: Optional[int] = 300
-    HTTP_CACHE_PRIVATE_STREAMS_TTL: Optional[int] = 60
+    HTTP_CACHE_STREAMS_TTL: Optional[int] = 300
     HTTP_CACHE_STALE_WHILE_REVALIDATE: Optional[int] = 60
     HTTP_CACHE_MANIFEST_TTL: Optional[int] = 86400
     HTTP_CACHE_CONFIGURE_TTL: Optional[int] = 86400
diff --git a/comet/utils/cache.py b/comet/utils/cache.py
index 46f509f..5c9550f 100644
--- a/comet/utils/cache.py
+++ b/comet/utils/cache.py
@@ -154,13 +154,13 @@ def not_modified_response(etag: str):
 
 class CachePolicies:
     @staticmethod
-    def public_torrents():
+    def streams():
         """
-        For public torrent lists (without user config).
+        For all stream results.
         Cache for a short time at CDN, revalidate often.
         """
 
-        ttl = settings.HTTP_CACHE_PUBLIC_STREAMS_TTL
+        ttl = settings.HTTP_CACHE_STREAMS_TTL
         swr = settings.HTTP_CACHE_STALE_WHILE_REVALIDATE
 
         return (
@@ -172,17 +172,6 @@ class CachePolicies:
             .stale_if_error(300)
         )
 
-    @staticmethod
-    def private_streams():
-        """
-        For user-specific stream results (with b64config).
-        Private cache only, short TTL.
-        """
-
-        ttl = settings.HTTP_CACHE_PRIVATE_STREAMS_TTL
-
-        return CacheControl().private().max_age(ttl).must_revalidate()
-
     @staticmethod
     def manifest():
         """
diff --git a/deployment/cloudflare-cache-rules.md b/deployment/cloudflare-cache-rules.md
index f7c35df..0fa2def 100644
--- a/deployment/cloudflare-cache-rules.md
+++ b/deployment/cloudflare-cache-rules.md
@@ -3,7 +3,7 @@
 To optimize performance, configure Cloudflare to offload traffic from your server. We use **Cache Rules** to cache responses while respecting the application's cache headers.
 
 ## 1. Streams (Cache Rule)
-Cache all stream results (public and private). Comet controls the TTL via headers.
+Cache all stream results. Comet controls the TTL via headers.
 
 *   **Rule Name**: Streams
 *   **Expression**: `(http.request.uri.path contains "/stream/")`

From feca4e03aa84468f575491311dd2de517541d06e Mon Sep 17 00:00:00 2001
From: g0ldyy <153996346+g0ldyy@users.noreply.github.com>
Date: Sun, 11 Jan 2026 15:04:04 +0100
Subject: [PATCH 4/5] refactor: remove unused default configuration validation
 logic

---
 comet/core/config_validation.py | 55 ---------------------------------
 1 file changed, 55 deletions(-)

diff --git a/comet/core/config_validation.py b/comet/core/config_validation.py
index e2032a7..dce9ca3 100644
--- a/comet/core/config_validation.py
+++ b/comet/core/config_validation.py
@@ -59,58 +59,3 @@ def config_check(b64config: str):
         return validated_config
     except Exception:
         return default_config  # if it doesn't pass, return default config
-
-
-def is_default_config(config: dict) -> bool:
-    if config is None:
-        return True
-
-    ignored_fields = {
-        "debridApiKey",
-        "debridStreamProxyPassword",
-        "rtnSettings",
-        "rtnRanking",
-        "debridService",
-    }
-
-    if config.get("debridService") != "torrent":
-        return False
-
-    for field, default_value in default_config.items():
-        if field in ignored_fields:
-            continue
-
-        config_value = config.get(field)
-
-        if field == "resolutions":
-            if isinstance(config_value, dict):
-                for res, enabled in config_value.items():
-                    if enabled is False:
-                        return False
-            continue
-
-        if field == "languages":
-            config_lang = config_value or {}
-            default_lang = default_value or {}
-            if config_lang.get("exclude", []) != default_lang.get("exclude", []):
-                return False
-            if config_lang.get("preferred", []) != default_lang.get("preferred", []):
-                return False
-            continue
-
-        if field == "options":
-            config_opts = config_value or {}
-            default_opts = default_value or {}
-            for key in [
-                "remove_ranks_under",
-                "allow_english_in_languages",
-                "remove_unknown_languages",
-            ]:
-                if config_opts.get(key) != default_opts.get(key):
-                    return False
-            continue
-
-        if config_value != default_value:
-            return False
-
-    return True

From c6f0790d683bf9b00c6f6ef5f06f3b7e12c7503f Mon Sep 17 00:00:00 2001
From: g0ldyy <153996346+g0ldyy@users.noreply.github.com>
Date: Sun, 11 Jan 2026 15:56:36 +0100
Subject: [PATCH 5/5] refactor: enhance filtering logic with media type and
 year range handling

- Updated the filter_worker function to include media_type as a parameter.
- Introduced min_year and max_year calculations to improve year filtering logic.
- Adjusted year mismatch logging to reflect new expected formats based on media type.
---
 comet/services/filtering.py     | 41 ++++++++++++++++++++++-----------
 comet/services/orchestration.py |  1 +
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/comet/services/filtering.py b/comet/services/filtering.py
index 7aca56c..20b1deb 100644
--- a/comet/services/filtering.py
+++ b/comet/services/filtering.py
@@ -17,13 +17,28 @@ def quick_alias_match(text_normalized: str, ez_aliases_normalized: list[str]):
     return any(alias in text_normalized for alias in ez_aliases_normalized)
 
 
-def filter_worker(torrents, title, year, year_end, aliases, remove_adult_content):
+def filter_worker(
+    torrents, title, year, year_end, media_type, aliases, remove_adult_content
+):
     results = []
 
     ez_aliases = aliases.get("ez", [])
     if ez_aliases:
         ez_aliases_normalized = [normalize_title(a) for a in ez_aliases]
 
+    min_year = 0
+    max_year = float("inf")
+
+    if year:
+        if year_end:
+            min_year = year
+            max_year = year_end
+        elif media_type == "series":
+            min_year = year - 1
+        else:
+            min_year = year - 1
+            max_year = year + 1
+
     for torrent in torrents:
         torrent_title = torrent["title"]
         torrent_title_lower = torrent_title.lower()
@@ -53,18 +68,18 @@ def filter_worker(torrents, title, year, year_end, aliases, remove_adult_content
                 continue
 
         if year and parsed.year:
-            if year_end is not None:
-                if not (year <= parsed.year <= year_end):
-                    _log_exclusion(
-                        f"📅 Rejected (Year Mismatch) | {torrent_title} | Year: {parsed.year} | Expected: {year}-{year_end}"
-                    )
-                    continue
-            else:
-                if year < (parsed.year - 1) or year > (parsed.year + 1):
-                    _log_exclusion(
-                        f"📅 Rejected (Year Mismatch) | {torrent_title} | Year: {parsed.year} | Expected: ~{year}"
-                    )
-                    continue
+            if not (min_year <= parsed.year <= max_year):
+                if year_end:
+                    expected = f"{year}-{year_end}"
+                elif media_type == "series":
+                    expected = f">{year}"
+                else:
+                    expected = f"~{year}"
+
+                _log_exclusion(
+                    f"📅 Rejected (Year Mismatch) | {torrent_title} | Year: {parsed.year} | Expected: {expected}"
+                )
+                continue
 
         torrent["parsed"] = parsed
         results.append(torrent)
diff --git a/comet/services/orchestration.py b/comet/services/orchestration.py
index 6c4bfe2..0e3452e 100644
--- a/comet/services/orchestration.py
+++ b/comet/services/orchestration.py
@@ -225,6 +225,7 @@ class TorrentManager:
                 self.title,
                 self.year,
                 self.year_end,
+                self.media_type,
                 self.aliases,
                 self.remove_adult_content,
             )