refactor: migrate app.config and Expo config plugins to TypeScript

Migrate the dynamic Expo config and all 12 local config plugins from CommonJS .js to typed TypeScript: - app.config.js -> app.config.ts (typed ConfigContext/ExpoConfig, behavior-identical port) - plugins/*.js -> plugins/*.ts with `ConfigPlugin` typings from expo/config-plugins; plugin options are now type-checked (withGitPod) - app.json plugin references updated to the .ts paths - imports unified on expo/config-plugins (some plugins used the @expo/config-plugins alias) Node evaluates the config at prebuild time and cannot parse TypeScript plugin modules on its own (verified empirically: Expo transpiles app.config.ts itself but not its imports), so the documented tsx approach is used: `import "tsx/cjs"` at the top of app.config.ts plus tsx as a devDependency. Validation: resolved prebuild configs (expo config --type prebuild) are byte-identical to the old JS config for both mobile and TV (modulo plugin path extensions and the builtAt timestamp); full `bun run prebuild` and `bun run prebuild:tv` pass and all Android plugin mods are present in the generated project (media3 exclusions, gradle properties, cast activity, network security config, alert colors).
2026-06-11 16:30:24 +01:00 · 2026-06-11 12:20:31 +02:00
36 changed files with 313 additions and 799 deletions
--- a/.github/workflows/build-apps.yml
+++ b/.github/workflows/build-apps.yml
@@ -11,7 +11,7 @@ on:
  push:
    branches: [develop, master]

-# Exposed to `expo prebuild` (app.config.js → extra.build) so Settings can show the
+# Exposed to `expo prebuild` (app.config.ts → extra.build) so Settings can show the
 # branch + commit + Actions run a CI build was made from. EAS cloud builds use
 # EAS_BUILD_* instead. The run number maps a sideloaded build back to its Actions
 # run (artifacts + logs) without needing Expo access.
--- a/app.config.ts
+++ b/app.config.ts
@@ -1,9 +1,13 @@
-const { execFileSync } = require("node:child_process");
+// Registers the tsx require hook so the TypeScript config plugins referenced
+// from app.json ("./plugins/*.ts") can be loaded by Node during config evaluation.
+import "tsx/cjs";
+import { execFileSync } from "node:child_process";
+import type { ConfigContext, ExpoConfig } from "expo/config";

 // Build metadata, injected into `extra.build` and read at runtime via
 // expo-constants (see utils/version.ts). Sources in priority order:
 // EAS cloud build → GitHub Actions → explicit EXPO_PUBLIC_* → local git → null.
-const git = (args) => {
+const git = (args: string[]): string | null => {
  try {
    return execFileSync("git", args, { stdio: ["ignore", "pipe", "ignore"] })
      .toString()
@@ -42,16 +46,16 @@ const buildMeta = {
  builtAt: new Date().toISOString(),
 };

-module.exports = ({ config }) => {
+export default ({ config }: ConfigContext): ExpoConfig => {
  if (process.env.EXPO_TV !== "1") {
-    config.plugins.push("expo-background-task");
+    config.plugins?.push("expo-background-task");

-    config.plugins.push([
+    config.plugins?.push([
      "react-native-google-cast",
      { useDefaultExpandedMediaControls: true },
    ]);

-    config.plugins.push([
+    config.plugins?.push([
      "expo-camera",
      {
        cameraPermission:
@@ -61,7 +65,7 @@ module.exports = ({ config }) => {
  }

  // Only override googleServicesFile if env var is set
-  const androidConfig = {};
+  const androidConfig: { googleServicesFile?: string } = {};
  if (process.env.GOOGLE_SERVICES_JSON) {
    androidConfig.googleServicesFile = process.env.GOOGLE_SERVICES_JSON;
  }
@@ -71,5 +75,5 @@ module.exports = ({ config }) => {
  return {
    ...(Object.keys(androidConfig).length > 0 && { android: androidConfig }),
    ...config,
-  };
+  } as ExpoConfig;
 };
--- a/app.json
+++ b/app.json
@@ -71,8 +71,8 @@
      ],
      "expo-router",
      "expo-font",
-      "./plugins/withExcludeMedia3Dash.js",
-      "./plugins/withTVUserManagement.js",
+      "./plugins/withExcludeMedia3Dash.ts",
+      "./plugins/withTVUserManagement.ts",
      [
        "expo-build-properties",
        {
@@ -131,17 +131,17 @@
        }
      ],
      "expo-web-browser",
-      ["./plugins/with-runtime-framework-headers.js"],
-      ["./plugins/withChangeNativeAndroidTextToWhite.js"],
-      ["./plugins/withAndroidAlertColors.js"],
-      ["./plugins/withAndroidManifest.js"],
-      ["./plugins/withTrustLocalCerts.js"],
-      ["./plugins/withGradleProperties.js"],
-      ["./plugins/withTVOSAppIcon.js"],
-      ["./plugins/withTVOSTopShelf.js"],
-      ["./plugins/withTVXcodeEnv.js"],
+      ["./plugins/with-runtime-framework-headers.ts"],
+      ["./plugins/withChangeNativeAndroidTextToWhite.ts"],
+      ["./plugins/withAndroidAlertColors.ts"],
+      ["./plugins/withAndroidManifest.ts"],
+      ["./plugins/withTrustLocalCerts.ts"],
+      ["./plugins/withGradleProperties.ts"],
+      ["./plugins/withTVOSAppIcon.ts"],
+      ["./plugins/withTVOSTopShelf.ts"],
+      ["./plugins/withTVXcodeEnv.ts"],
      [
-        "./plugins/withGitPod.js",
+        "./plugins/withGitPod.ts",
        {
          "podName": "MPVKit",
          "podspecUrl": "https://raw.githubusercontent.com/mpv-ios/MPVKit/0.41.0-av/MPVKit.podspec"
--- a/app/(auth)/(tabs)/(favorites)/index.tsx
+++ b/app/(auth)/(tabs)/(favorites)/index.tsx
@@ -1,24 +1,14 @@
 import { useCallback, useState } from "react";
-import { useTranslation } from "react-i18next";
 import { Platform, RefreshControl, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { FavoritesTabButtons } from "@/components/favorites/FavoritesTabButtons";
 import { Favorites } from "@/components/home/Favorites";
 import { Favorites as TVFavorites } from "@/components/home/Favorites.tv";
 import { useInvalidatePlaybackProgressCache } from "@/hooks/useRevalidatePlaybackProgressCache";
-import { useSettings } from "@/utils/atoms/settings";

 export default function FavoritesPage() {
  const invalidateCache = useInvalidatePlaybackProgressCache();
-  const { t } = useTranslation();
-  const { settings } = useSettings();

  const [loading, setLoading] = useState(false);
-  // KefinTweaks watchlist (Likes-backed) view, toggled in-place like Discover.
-  const watchlistEnabled = settings?.useKefinTweaks ?? false;
-  const [viewType, setViewType] = useState<"Favorites" | "Watchlist">(
-    "Favorites",
-  );
  const refetch = useCallback(async () => {
    setLoading(true);
    await invalidateCache();
@@ -30,8 +20,6 @@ export default function FavoritesPage() {
    return <TVFavorites />;
  }

-  const isWatchlist = watchlistEnabled && viewType === "Watchlist";
-
  return (
    <ScrollView
      nestedScrollEnabled
@@ -46,26 +34,7 @@ export default function FavoritesPage() {
      }}
    >
      <View style={{ paddingTop: Platform.OS === "android" ? 10 : 0 }}>
-        {watchlistEnabled && (
-          <View className='pl-4 pr-4 flex flex-row mb-2'>
-            <FavoritesTabButtons
-              viewType={viewType}
-              setViewType={setViewType}
-              t={t}
-            />
-          </View>
-        )}
-        {isWatchlist ? (
-          <Favorites
-            filter='Likes'
-            queryKeyBase='watchlist'
-            seeAllNamespace='kefintweaksWatchlist'
-            emptyTitleKey='kefintweaksWatchlist.noDataTitle'
-            emptyTextKey='kefintweaksWatchlist.noData'
-          />
-        ) : (
-          <Favorites />
-        )}
+        <Favorites />
      </View>
    </ScrollView>
  );
--- a/app/(auth)/(tabs)/(favorites)/see-all.tsx
+++ b/app/(auth)/(tabs)/(favorites)/see-all.tsx
@@ -2,7 +2,6 @@ import type { Api } from "@jellyfin/sdk";
 import type {
  BaseItemDto,
  BaseItemKind,
-  ItemFilter,
 } from "@jellyfin/sdk/lib/generated-client";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { FlashList } from "@shopify/flash-list";
@@ -11,7 +10,7 @@ import { Stack, useLocalSearchParams } from "expo-router";
 import { t } from "i18next";
 import { useAtom } from "jotai";
 import { useCallback, useMemo } from "react";
-import { Platform, useWindowDimensions, View } from "react-native";
+import { useWindowDimensions, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { Text } from "@/components/common/Text";
 import { TouchableItemRouter } from "@/components/common/TouchableItemRouter";
@@ -53,13 +52,9 @@ export default function FavoritesSeeAllScreen() {
  const searchParams = useLocalSearchParams<{
    type?: string;
    title?: string;
-    filter?: string;
  }>();
  const typeParam = searchParams.type;
  const titleParam = searchParams.title;
-  // Watchlist (KefinTweaks) reuses this screen with the "Likes" filter.
-  const filter: ItemFilter =
-    searchParams.filter === "Likes" ? "Likes" : "IsFavorite";

  const itemType = useMemo(() => {
    if (!isFavoriteType(typeParam)) return null;
@@ -82,7 +77,7 @@ export default function FavoritesSeeAllScreen() {
        userId: user.Id,
        sortBy: ["SeriesSortName", "SortName"],
        sortOrder: ["Ascending"],
-        filters: [filter],
+        filters: ["IsFavorite"],
        recursive: true,
        fields: ["PrimaryImageAspectRatio"],
        collapseBoxSetItems: false,
@@ -95,12 +90,12 @@ export default function FavoritesSeeAllScreen() {

      return response.data.Items || [];
    },
-    [api, itemType, user?.Id, filter],
+    [api, itemType, user?.Id],
  );

  const { data, isFetching, fetchNextPage, hasNextPage, isLoading } =
    useInfiniteQuery({
-      queryKey: ["favorites", "see-all", itemType, filter],
+      queryKey: ["favorites", "see-all", itemType],
      queryFn: ({ pageParam = 0 }) => fetchItems({ pageParam }),
      getNextPageParam: (lastPage, pages) => {
        if (!lastPage || lastPage.length < pageSize) return undefined;
@@ -160,7 +155,7 @@ export default function FavoritesSeeAllScreen() {
        options={{
          headerTitle: headerTitle,
          headerBlurEffect: "none",
-          headerTransparent: Platform.OS === "ios",
+          headerTransparent: true,
          headerShadowVisible: false,
        }}
      />
--- a/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/series/[id].tsx
+++ b/app/(auth)/(tabs)/(home,libraries,search,favorites,watchlists)/series/[id].tsx
@@ -9,7 +9,6 @@ import { useEffect, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { Platform, View } from "react-native";
 import { AddToFavorites } from "@/components/AddToFavorites";
-import { AddToKefinWatchlist } from "@/components/AddToKefinWatchlist";
 import { DownloadItems } from "@/components/DownloadItem";
 import { ParallaxScrollView } from "@/components/ParallaxPage";
 import { NextUp } from "@/components/series/NextUp";
@@ -19,7 +18,6 @@ import { TVSeriesPage } from "@/components/series/TVSeriesPage";
 import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { OfflineModeProvider } from "@/providers/OfflineModeProvider";
-import { useSettings } from "@/utils/atoms/settings";
 import {
  buildOfflineSeriesFromEpisodes,
  getDownloadedEpisodesForSeries,
@@ -32,7 +30,6 @@ import { storage } from "@/utils/mmkv";
 const page: React.FC = () => {
  const navigation = useNavigation();
  const { t } = useTranslation();
-  const { settings } = useSettings();
  const params = useLocalSearchParams();
  const {
    id: seriesId,
@@ -140,7 +137,6 @@ const page: React.FC = () => {
        !isLoading && item && allEpisodes && allEpisodes.length > 0 ? (
          <View className='flex flex-row items-center space-x-2'>
            <AddToFavorites item={item} />
-            {settings?.useKefinTweaks && <AddToKefinWatchlist item={item} />}
            {!Platform.isTV && (
              <DownloadItems
                size='large'
@@ -161,7 +157,7 @@ const page: React.FC = () => {
          </View>
        ) : null,
    });
-  }, [allEpisodes, isLoading, item, isOffline, settings?.useKefinTweaks]);
+  }, [allEpisodes, isLoading, item, isOffline]);

  // For offline mode, we can show the page even without backdropUrl
  if (!item || (!isOffline && !backdropUrl)) return null;
--- a/bun.lock
+++ b/bun.lock
@@ -112,6 +112,7 @@
        "husky": "9.1.7",
        "lint-staged": "17.0.5",
        "react-test-renderer": "19.2.3",
+        "tsx": "^4.22.4",
        "typescript": "5.9.3",
      },
    },
@@ -293,6 +294,58 @@

    "@epic-web/invariant": ["@epic-web/invariant@1.0.0", "", {}, "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA=="],

+    "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.28.0", "", { "os": "aix", "cpu": "ppc64" }, "sha512-lhRUCeuOyJQURhTxl4WkpFTjIsbDayJHih5kZC1giwE+MhIzAb7mEsQMqMf18rHLsrb5qI1tafG20mLxEWcWlA=="],
+
+    "@esbuild/android-arm": ["@esbuild/android-arm@0.28.0", "", { "os": "android", "cpu": "arm" }, "sha512-wqh0ByljabXLKHeWXYLqoJ5jKC4XBaw6Hk08OfMrCRd2nP2ZQ5eleDZC41XHyCNgktBGYMbqnrJKq/K/lzPMSQ=="],
+
+    "@esbuild/android-arm64": ["@esbuild/android-arm64@0.28.0", "", { "os": "android", "cpu": "arm64" }, "sha512-+WzIXQOSaGs33tLEgYPYe/yQHf0WTU0X42Jca3y8NWMbUVhp7rUnw+vAsRC/QiDrdD31IszMrZy+qwPOPjd+rw=="],
+
+    "@esbuild/android-x64": ["@esbuild/android-x64@0.28.0", "", { "os": "android", "cpu": "x64" }, "sha512-+VJggoaKhk2VNNqVL7f6S189UzShHC/mR9EE8rDdSkdpN0KflSwWY/gWjDrNxxisg8Fp1ZCD9jLMo4m0OUfeUA=="],
+
+    "@esbuild/darwin-arm64": ["@esbuild/darwin-arm64@0.28.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-0T+A9WZm+bZ84nZBtk1ckYsOvyA3x7e2Acj1KdVfV4/2tdG4fzUp91YHx+GArWLtwqp77pBXVCPn2We7Letr0Q=="],
+
+    "@esbuild/darwin-x64": ["@esbuild/darwin-x64@0.28.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-fyzLm/DLDl/84OCfp2f/XQ4flmORsjU7VKt8HLjvIXChJoFFOIL6pLJPH4Yhd1n1gGFF9mPwtlN5Wf82DZs+LQ=="],
+
+    "@esbuild/freebsd-arm64": ["@esbuild/freebsd-arm64@0.28.0", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-l9GeW5UZBT9k9brBYI+0WDffcRxgHQD8ShN2Ur4xWq/NFzUKm3k5lsH4PdaRgb2w7mI9u61nr2gI2mLI27Nh3Q=="],
+
+    "@esbuild/freebsd-x64": ["@esbuild/freebsd-x64@0.28.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-BXoQai/A0wPO6Es3yFJ7APCiKGc1tdAEOgeTNy3SsB491S3aHn4S4r3e976eUnPdU+NbdtmBuLncYir2tMU9Nw=="],
+
+    "@esbuild/linux-arm": ["@esbuild/linux-arm@0.28.0", "", { "os": "linux", "cpu": "arm" }, "sha512-CjaaREJagqJp7iTaNQjjidaNbCKYcd4IDkzbwwxtSvjI7NZm79qiHc8HqciMddQ6CKvJT6aBd8lO9kN/ZudLlw=="],
+
+    "@esbuild/linux-arm64": ["@esbuild/linux-arm64@0.28.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-RVyzfb3FWsGA55n6WY0MEIEPURL1FcbhFE6BffZEMEekfCzCIMtB5yyDcFnVbTnwk+CLAgTujmV/Lgvih56W+A=="],
+
+    "@esbuild/linux-ia32": ["@esbuild/linux-ia32@0.28.0", "", { "os": "linux", "cpu": "ia32" }, "sha512-KBnSTt1kxl9x70q+ydterVdl+Cn0H18ngRMRCEQfrbqdUuntQQ0LoMZv47uB97NljZFzY6HcfqEZ2SAyIUTQBQ=="],
+
+    "@esbuild/linux-loong64": ["@esbuild/linux-loong64@0.28.0", "", { "os": "linux", "cpu": "none" }, "sha512-zpSlUce1mnxzgBADvxKXX5sl8aYQHo2ezvMNI8I0lbblJtp8V4odlm3Yzlj7gPyt3T8ReksE6bK+pT3WD+aJRg=="],
+
+    "@esbuild/linux-mips64el": ["@esbuild/linux-mips64el@0.28.0", "", { "os": "linux", "cpu": "none" }, "sha512-2jIfP6mmjkdmeTlsX/9vmdmhBmKADrWqN7zcdtHIeNSCH1SqIoNI63cYsjQR8J+wGa4Y5izRcSHSm8K3QWmk3w=="],
+
+    "@esbuild/linux-ppc64": ["@esbuild/linux-ppc64@0.28.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-bc0FE9wWeC0WBm49IQMPSPILRocGTQt3j5KPCA8os6VprfuJ7KD+5PzESSrJ6GmPIPJK965ZJHTUlSA6GNYEhg=="],
+
+    "@esbuild/linux-riscv64": ["@esbuild/linux-riscv64@0.28.0", "", { "os": "linux", "cpu": "none" }, "sha512-SQPZOwoTTT/HXFXQJG/vBX8sOFagGqvZyXcgLA3NhIqcBv1BJU1d46c0rGcrij2B56Z2rNiSLaZOYW5cUk7yLQ=="],
+
+    "@esbuild/linux-s390x": ["@esbuild/linux-s390x@0.28.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-SCfR0HN8CEEjnYnySJTd2cw0k9OHB/YFzt5zgJEwa+wL/T/raGWYMBqwDNAC6dqFKmJYZoQBRfHjgwLHGSrn3Q=="],
+
+    "@esbuild/linux-x64": ["@esbuild/linux-x64@0.28.0", "", { "os": "linux", "cpu": "x64" }, "sha512-us0dSb9iFxIi8srnpl931Nvs65it/Jd2a2K3qs7fz2WfGPHqzfzZTfec7oxZJRNPXPnNYZtanmRc4AL/JwVzHQ=="],
+
+    "@esbuild/netbsd-arm64": ["@esbuild/netbsd-arm64@0.28.0", "", { "os": "none", "cpu": "arm64" }, "sha512-CR/RYotgtCKwtftMwJlUU7xCVNg3lMYZ0RzTmAHSfLCXw3NtZtNpswLEj/Kkf6kEL3Gw+BpOekRX0BYCtklhUw=="],
+
+    "@esbuild/netbsd-x64": ["@esbuild/netbsd-x64@0.28.0", "", { "os": "none", "cpu": "x64" }, "sha512-nU1yhmYutL+fQ71Kxnhg8uEOdC0pwEW9entHykTgEbna2pw2dkbFSMeqjjyHZoCmt8SBkOSvV+yNmm94aUrrqw=="],
+
+    "@esbuild/openbsd-arm64": ["@esbuild/openbsd-arm64@0.28.0", "", { "os": "openbsd", "cpu": "arm64" }, "sha512-cXb5vApOsRsxsEl4mcZ1XY3D4DzcoMxR/nnc4IyqYs0rTI8ZKmW6kyyg+11Z8yvgMfAEldKzP7AdP64HnSC/6g=="],
+
+    "@esbuild/openbsd-x64": ["@esbuild/openbsd-x64@0.28.0", "", { "os": "openbsd", "cpu": "x64" }, "sha512-8wZM2qqtv9UP3mzy7HiGYNH/zjTA355mpeuA+859TyR+e+Tc08IHYpLJuMsfpDJwoLo1ikIJI8jC3GFjnRClzA=="],
+
+    "@esbuild/openharmony-arm64": ["@esbuild/openharmony-arm64@0.28.0", "", { "os": "none", "cpu": "arm64" }, "sha512-FLGfyizszcef5C3YtoyQDACyg95+dndv79i2EekILBofh5wpCa1KuBqOWKrEHZg3zrL3t5ouE5jgr94vA+Wb2w=="],
+
+    "@esbuild/sunos-x64": ["@esbuild/sunos-x64@0.28.0", "", { "os": "sunos", "cpu": "x64" }, "sha512-1ZgjUoEdHZZl/YlV76TSCz9Hqj9h9YmMGAgAPYd+q4SicWNX3G5GCyx9uhQWSLcbvPW8Ni7lj4gDa1T40akdlw=="],
+
+    "@esbuild/win32-arm64": ["@esbuild/win32-arm64@0.28.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-Q9StnDmQ/enxnpxCCLSg0oo4+34B9TdXpuyPeTedN/6+iXBJ4J+zwfQI28u/Jl40nOYAxGoNi7mFP40RUtkmUA=="],
+
+    "@esbuild/win32-ia32": ["@esbuild/win32-ia32@0.28.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-zF3ag/gfiCe6U2iczcRzSYJKH1DCI+ByzSENHlM2FcDbEeo5Zd2C86Aq0tKUYAJJ1obRP84ymxIAksZUcdztHA=="],
+
+    "@esbuild/win32-x64": ["@esbuild/win32-x64@0.28.0", "", { "os": "win32", "cpu": "x64" }, "sha512-pEl1bO9mfAmIC+tW5btTmrKaujg3zGtUmWNdCw/xs70FBjwAL3o9OEKNHvNmnyylD6ubxUERiEhdsL0xBQ9efw=="],
+
    "@expo-google-fonts/material-symbols": ["@expo-google-fonts/material-symbols@0.4.38", "", {}, "sha512-IJkBtN1o8u9BW5fvSii1MyHPQ7Q0HxbWcVBvOrOzgMLpVtZw7R2w94wBTVR7kZwv3w1JNTESMmLA5Sqn1+Z36A=="],

    "@expo/cli": ["@expo/cli@56.1.12", "", { "dependencies": { "@expo/code-signing-certificates": "^0.0.6", "@expo/config": "~56.0.9", "@expo/config-plugins": "~56.0.8", "@expo/devcert": "^1.2.1", "@expo/env": "~2.3.0", "@expo/image-utils": "^0.10.1", "@expo/inline-modules": "^0.0.10", "@expo/json-file": "^10.2.0", "@expo/log-box": "^56.0.12", "@expo/metro": "~56.0.0", "@expo/metro-config": "~56.0.13", "@expo/metro-file-map": "^56.0.3", "@expo/osascript": "^2.6.0", "@expo/package-manager": "^1.12.0", "@expo/plist": "^0.7.0", "@expo/prebuild-config": "^56.0.13", "@expo/require-utils": "^56.1.3", "@expo/router-server": "^56.0.12", "@expo/schema-utils": "^56.0.0", "@expo/spawn-async": "^1.8.0", "@expo/ws-tunnel": "^1.0.1", "@expo/xcpretty": "^4.4.4", "@react-native/dev-middleware": "0.85.3", "accepts": "^1.3.8", "arg": "^5.0.2", "bplist-creator": "0.1.0", "bplist-parser": "^0.3.1", "chalk": "^4.0.0", "ci-info": "^3.3.0", "compression": "^1.7.4", "connect": "^3.7.0", "debug": "^4.3.4", "dnssd-advertise": "^1.1.4", "expo-server": "^56.0.4", "fetch-nodeshim": "^0.4.10", "getenv": "^2.0.0", "glob": "^13.0.0", "lan-network": "^0.2.1", "multitars": "^1.0.0", "node-forge": "^1.3.3", "npm-package-arg": "^11.0.0", "ora": "^3.4.0", "picomatch": "^4.0.4", "pretty-format": "^29.7.0", "progress": "^2.0.3", "prompts": "^2.3.2", "resolve-from": "^5.0.0", "semver": "^7.6.0", "send": "^0.19.0", "slugify": "^1.3.4", "stacktrace-parser": "^0.1.10", "structured-headers": "^0.4.1", "terminal-link": "^2.1.1", "toqr": "^0.1.1", "wrap-ansi": "^7.0.0", "ws": "^8.12.1", "zod": "^3.25.76" }, "peerDependencies": { "expo": "*", "expo-router": "*", "react-native": "*" }, "optionalPeers": ["expo-router", "react-native"], "bin": { "expo-internal": "main.js" } }, "sha512-Ya/13E1yDx1oAuPw5MDmqzIGyzwSs7KSr1EjgSObOF0VO0GD9jqJjvjOiwurjScLUfxcGZQgq23UzMlBVHwdvA=="],
@@ -917,6 +970,8 @@

    "es-set-tostringtag": ["es-set-tostringtag@2.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", "hasown": "^2.0.2" } }, "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA=="],

+    "esbuild": ["esbuild@0.28.0", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.28.0", "@esbuild/android-arm": "0.28.0", "@esbuild/android-arm64": "0.28.0", "@esbuild/android-x64": "0.28.0", "@esbuild/darwin-arm64": "0.28.0", "@esbuild/darwin-x64": "0.28.0", "@esbuild/freebsd-arm64": "0.28.0", "@esbuild/freebsd-x64": "0.28.0", "@esbuild/linux-arm": "0.28.0", "@esbuild/linux-arm64": "0.28.0", "@esbuild/linux-ia32": "0.28.0", "@esbuild/linux-loong64": "0.28.0", "@esbuild/linux-mips64el": "0.28.0", "@esbuild/linux-ppc64": "0.28.0", "@esbuild/linux-riscv64": "0.28.0", "@esbuild/linux-s390x": "0.28.0", "@esbuild/linux-x64": "0.28.0", "@esbuild/netbsd-arm64": "0.28.0", "@esbuild/netbsd-x64": "0.28.0", "@esbuild/openbsd-arm64": "0.28.0", "@esbuild/openbsd-x64": "0.28.0", "@esbuild/openharmony-arm64": "0.28.0", "@esbuild/sunos-x64": "0.28.0", "@esbuild/win32-arm64": "0.28.0", "@esbuild/win32-ia32": "0.28.0", "@esbuild/win32-x64": "0.28.0" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-sNR9MHpXSUV/XB4zmsFKN+QgVG82Cc7+/aaxJ8Adi8hyOac+EXptIp45QBPaVyX3N70664wRbTcLTOemCAnyqw=="],
+
    "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="],

    "escape-html": ["escape-html@1.0.3", "", {}, "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="],
@@ -1819,6 +1874,8 @@

    "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],

+    "tsx": ["tsx@4.22.4", "", { "dependencies": { "esbuild": "~0.28.0" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "bin": { "tsx": "dist/cli.mjs" } }, "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg=="],
+
    "type-fest": ["type-fest@0.7.1", "", {}, "sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg=="],

    "type-is": ["type-is@2.1.0", "", { "dependencies": { "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA=="],
--- a/components/AddToKefinWatchlist.tsx
+++ b/components/AddToKefinWatchlist.tsx
@@ -1,28 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import type { FC } from "react";
-import { View, type ViewProps } from "react-native";
-import { RoundButton } from "@/components/RoundButton";
-import { useWatchlist } from "@/hooks/useWatchlist";
-
-interface Props extends ViewProps {
-  item: BaseItemDto;
-}
-
-/**
- * KefinTweaks watchlist toggle, backed by Jellyfin's "Likes" rating.
- * Render only when settings.useKefinTweaks is enabled.
- */
-export const AddToKefinWatchlist: FC<Props> = ({ item, ...props }) => {
-  const { isWatchlisted, toggleWatchlist } = useWatchlist(item);
-
-  return (
-    <View {...props}>
-      <RoundButton
-        size='large'
-        icon={isWatchlisted ? "bookmark" : "bookmark-outline"}
-        color={isWatchlisted ? "purple" : "white"}
-        onPress={toggleWatchlist}
-      />
-    </View>
-  );
-};
--- a/components/ItemContent.tsx
+++ b/components/ItemContent.tsx
@@ -29,7 +29,6 @@ import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getLogoImageUrlById } from "@/utils/jellyfin/image/getLogoImageUrlById";
 import { AddToFavorites } from "./AddToFavorites";
-import { AddToKefinWatchlist } from "./AddToKefinWatchlist";
 import { AddToWatchlist } from "./AddToWatchlist";
 import { ItemHeader } from "./ItemHeader";
 import { ItemTechnicalDetails } from "./ItemTechnicalDetails";
@@ -139,9 +138,6 @@ const ItemContentMobile: React.FC<ItemContentProps> = ({

                  <PlayedStatus items={[item]} size='large' />
                  <AddToFavorites item={item} />
-                  {settings.useKefinTweaks && (
-                    <AddToKefinWatchlist item={item} />
-                  )}
                  {settings.streamyStatsServerUrl &&
                    !settings.hideWatchlistsTab && (
                      <AddToWatchlist item={item} />
@@ -164,9 +160,6 @@ const ItemContentMobile: React.FC<ItemContentProps> = ({

                  <PlayedStatus items={[item]} size='large' />
                  <AddToFavorites item={item} />
-                  {settings.useKefinTweaks && (
-                    <AddToKefinWatchlist item={item} />
-                  )}
                  {settings.streamyStatsServerUrl &&
                    !settings.hideWatchlistsTab && (
                      <AddToWatchlist item={item} />
@@ -185,7 +178,6 @@ const ItemContentMobile: React.FC<ItemContentProps> = ({
    settings.hideRemoteSessionButton,
    settings.streamyStatsServerUrl,
    settings.hideWatchlistsTab,
-    settings.useKefinTweaks,
  ]);

  useEffect(() => {
--- a/components/ItemContent.tv.tsx
+++ b/components/ItemContent.tv.tsx
@@ -39,7 +39,6 @@ import {
  TVRefreshButton,
  TVSeriesNavigation,
  TVTechnicalDetails,
-  TVWatchlistButton,
 } from "@/components/tv";
 import type { Track } from "@/components/video-player/controls/types";
 import { useScaledTVTypography } from "@/constants/TVTypography";
@@ -753,7 +752,6 @@ export const ItemContentTV: React.FC<ItemContentTVProps> = React.memo(
                  </Text>
                </TVButton>
                <TVFavoriteButton item={item} />
-                {settings.useKefinTweaks && <TVWatchlistButton item={item} />}
                <TVPlayedButton item={item} />
                <TVRefreshButton itemId={item.Id} />
              </View>
--- a/components/common/TouchableItemRouter.tsx
+++ b/components/common/TouchableItemRouter.tsx
@@ -11,10 +11,8 @@ import {
 import useRouter from "@/hooks/useAppRouter";
 import { useFavorite } from "@/hooks/useFavorite";
 import { useMarkAsPlayed } from "@/hooks/useMarkAsPlayed";
-import { useWatchlist } from "@/hooks/useWatchlist";
 import { useDownload } from "@/providers/DownloadProvider";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
-import { useSettings } from "@/utils/atoms/settings";

 interface Props extends TouchableOpacityProps {
  item: BaseItemDto;
@@ -157,8 +155,6 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
  const { showActionSheetWithOptions } = useActionSheet();
  const markAsPlayedStatus = useMarkAsPlayed([item]);
  const { isFavorite, toggleFavorite } = useFavorite(item);
-  const { isWatchlisted, toggleWatchlist } = useWatchlist(item);
-  const { settings } = useSettings();
  const router = useRouter();
  const isOffline = useOfflineMode();
  const { deleteFile } = useDownload();
@@ -187,66 +183,36 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
    )
      return;

-    // Build options as { label, action } so dynamic entries (watchlist,
-    // offline delete) don't break index-based handling.
-    const actions: {
-      label: string;
-      action: () => void;
-      destructive?: boolean;
-    }[] = [
-      {
-        label: t("common.mark_as_played"),
-        action: () => {
-          markAsPlayedStatus(true);
-        },
-      },
-      {
-        label: t("common.mark_as_not_played"),
-        action: () => {
-          markAsPlayedStatus(false);
-        },
-      },
-      {
-        label: isFavorite
-          ? t("music.track_options.remove_from_favorites")
-          : t("music.track_options.add_to_favorites"),
-        action: toggleFavorite,
-      },
+    const options: string[] = [
+      t("common.mark_as_played"),
+      t("common.mark_as_not_played"),
+      isFavorite
+        ? t("music.track_options.remove_from_favorites")
+        : t("music.track_options.add_to_favorites"),
+      ...(isOffline ? [t("home.downloads.delete_download")] : []),
+      t("common.cancel"),
    ];
-
-    if (settings?.useKefinTweaks) {
-      actions.push({
-        label: isWatchlisted
-          ? t("watchlists.remove_from_watchlist")
-          : t("watchlists.add_to_watchlist"),
-        action: toggleWatchlist,
-      });
-    }
-
-    if (isOffline && item.Id) {
-      const id = item.Id;
-      actions.push({
-        label: t("home.downloads.delete_download"),
-        action: () => deleteFile(id),
-        destructive: true,
-      });
-    }
-
-    const options = [...actions.map((a) => a.label), t("common.cancel")];
    const cancelButtonIndex = options.length - 1;
-    const destructiveButtonIndex = actions.findIndex((a) => a.destructive);
+    const destructiveButtonIndex = isOffline
+      ? cancelButtonIndex - 1
+      : undefined;

    showActionSheetWithOptions(
      {
        options,
        cancelButtonIndex,
-        destructiveButtonIndex:
-          destructiveButtonIndex === -1 ? undefined : destructiveButtonIndex,
+        destructiveButtonIndex,
      },
-      (selectedIndex) => {
-        if (selectedIndex === undefined || selectedIndex >= actions.length)
-          return;
-        actions[selectedIndex].action();
+      async (selectedIndex) => {
+        if (selectedIndex === 0) {
+          await markAsPlayedStatus(true);
+        } else if (selectedIndex === 1) {
+          await markAsPlayedStatus(false);
+        } else if (selectedIndex === 2) {
+          toggleFavorite();
+        } else if (isOffline && selectedIndex === 3 && item.Id) {
+          deleteFile(item.Id);
+        }
      },
    );
  }, [
@@ -254,9 +220,6 @@ export const TouchableItemRouter: React.FC<PropsWithChildren<Props>> = ({
    isFavorite,
    markAsPlayedStatus,
    toggleFavorite,
-    isWatchlisted,
-    toggleWatchlist,
-    settings?.useKefinTweaks,
    isOffline,
    deleteFile,
    item.Id,
--- a/components/favorites/FavoritesTabButtons.tsx
+++ b/components/favorites/FavoritesTabButtons.tsx
@@ -1,74 +0,0 @@
-import { Platform, TouchableOpacity, View } from "react-native";
-import { Tag } from "@/components/GenreTags";
-
-// @expo/ui's SwiftUI native module (ExpoUI) does not exist in tvOS builds.
-// A static top-level import crashes the route tree on tvOS at module load.
-// Load it lazily and only off-TV; TV never renders this component.
-const { Button, Host, HStack, Spacer } = Platform.isTV
-  ? ({} as typeof import("@expo/ui/swift-ui"))
-  : require("@expo/ui/swift-ui");
-const { buttonStyle } = Platform.isTV
-  ? ({} as typeof import("@expo/ui/swift-ui/modifiers"))
-  : require("@expo/ui/swift-ui/modifiers");
-
-type ViewType = "Favorites" | "Watchlist";
-
-interface FavoritesTabButtonsProps {
-  viewType: ViewType;
-  setViewType: (type: ViewType) => void;
-  t: (key: string) => string;
-}
-
-export const FavoritesTabButtons: React.FC<FavoritesTabButtonsProps> = ({
-  viewType,
-  setViewType,
-  t,
-}) => {
-  if (Platform.OS === "ios" && !Platform.isTV) {
-    return (
-      <Host style={{ height: 40, flex: 1 }}>
-        <HStack spacing={8}>
-          <Button
-            modifiers={[
-              buttonStyle(
-                viewType === "Favorites" ? "glassProminent" : "glass",
-              ),
-            ]}
-            onPress={() => setViewType("Favorites")}
-            label={t("tabs.favorites")}
-          />
-          <Button
-            modifiers={[
-              buttonStyle(
-                viewType === "Watchlist" ? "glassProminent" : "glass",
-              ),
-            ]}
-            onPress={() => setViewType("Watchlist")}
-            label={t("favorites.watchlist")}
-          />
-          <Spacer />
-        </HStack>
-      </Host>
-    );
-  }
-
-  // Android UI
-  return (
-    <View className='flex flex-row gap-1 mr-1'>
-      <TouchableOpacity onPress={() => setViewType("Favorites")}>
-        <Tag
-          text={t("tabs.favorites")}
-          textClass='p-1'
-          className={viewType === "Favorites" ? "bg-purple-600" : undefined}
-        />
-      </TouchableOpacity>
-      <TouchableOpacity onPress={() => setViewType("Watchlist")}>
-        <Tag
-          text={t("favorites.watchlist")}
-          textClass='p-1'
-          className={viewType === "Watchlist" ? "bg-purple-600" : undefined}
-        />
-      </TouchableOpacity>
-    </View>
-  );
-};
--- a/components/favorites/TVFavoritesTabBadges.tsx
+++ b/components/favorites/TVFavoritesTabBadges.tsx
@@ -1,117 +0,0 @@
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { Animated, Pressable, View } from "react-native";
-import { Text } from "@/components/common/Text";
-import { useTVFocusAnimation } from "@/components/tv/hooks/useTVFocusAnimation";
-import { useScaledTVTypography } from "@/constants/TVTypography";
-
-type ViewType = "Favorites" | "Watchlist";
-
-interface TVFavoritesTabBadgeProps {
-  label: string;
-  isSelected: boolean;
-  onPress: () => void;
-  hasTVPreferredFocus?: boolean;
-}
-
-const TVFavoritesTabBadge: React.FC<TVFavoritesTabBadgeProps> = ({
-  label,
-  isSelected,
-  onPress,
-  hasTVPreferredFocus = false,
-}) => {
-  const typography = useScaledTVTypography();
-  const { focused, handleFocus, handleBlur, animatedStyle } =
-    useTVFocusAnimation({ duration: 150 });
-
-  // Design language: white for focused/selected, transparent white for unfocused
-  const getBackgroundColor = () => {
-    if (focused) return "#fff";
-    if (isSelected) return "rgba(255,255,255,0.25)";
-    return "rgba(255,255,255,0.1)";
-  };
-
-  const getTextColor = () => {
-    if (focused) return "#000";
-    return "#fff";
-  };
-
-  return (
-    <Pressable
-      onPress={onPress}
-      onFocus={handleFocus}
-      onBlur={handleBlur}
-      hasTVPreferredFocus={hasTVPreferredFocus}
-    >
-      <Animated.View
-        style={[
-          animatedStyle,
-          {
-            paddingHorizontal: 24,
-            paddingVertical: 14,
-            borderRadius: 24,
-            backgroundColor: getBackgroundColor(),
-            shadowColor: "#fff",
-            shadowOffset: { width: 0, height: 0 },
-            shadowOpacity: focused ? 0.4 : 0,
-            shadowRadius: focused ? 12 : 0,
-          },
-        ]}
-      >
-        <Text
-          style={{
-            fontSize: typography.callout,
-            color: getTextColor(),
-            fontWeight: isSelected || focused ? "600" : "400",
-          }}
-        >
-          {label}
-        </Text>
-      </Animated.View>
-    </Pressable>
-  );
-};
-
-export interface TVFavoritesTabBadgesProps {
-  viewType: ViewType;
-  setViewType: (type: ViewType) => void;
-  /** Only render the toggle when the KefinTweaks watchlist is enabled. */
-  enabled: boolean;
-  hasTVPreferredFocus?: boolean;
-}
-
-export const TVFavoritesTabBadges: React.FC<TVFavoritesTabBadgesProps> = ({
-  viewType,
-  setViewType,
-  enabled,
-  hasTVPreferredFocus = false,
-}) => {
-  const { t } = useTranslation();
-
-  if (!enabled) {
-    return null;
-  }
-
-  return (
-    <View
-      style={{
-        flexDirection: "row",
-        gap: 16,
-        marginBottom: 24,
-      }}
-    >
-      <TVFavoritesTabBadge
-        label={t("tabs.favorites")}
-        isSelected={viewType === "Favorites"}
-        onPress={() => setViewType("Favorites")}
-        hasTVPreferredFocus={hasTVPreferredFocus && viewType === "Favorites"}
-      />
-      <TVFavoritesTabBadge
-        label={t("favorites.watchlist")}
-        isSelected={viewType === "Watchlist"}
-        onPress={() => setViewType("Watchlist")}
-        hasTVPreferredFocus={hasTVPreferredFocus && viewType === "Watchlist"}
-      />
-    </View>
-  );
-};
--- a/components/home/Favorites.tsx
+++ b/components/home/Favorites.tsx
@@ -1,8 +1,5 @@
 import type { Api } from "@jellyfin/sdk";
-import type {
-  BaseItemKind,
-  ItemFilter,
-} from "@jellyfin/sdk/lib/generated-client";
+import type { BaseItemKind } from "@jellyfin/sdk/lib/generated-client";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { Image } from "expo-image";
 import { t } from "i18next";
@@ -25,24 +22,7 @@ type FavoriteTypes =
  | "Playlist";
 type EmptyState = Record<FavoriteTypes, boolean>;

-interface FavoritesProps {
-  /** Jellyfin item filter. "IsFavorite" (default) or "Likes" for the watchlist view. */
-  filter?: ItemFilter;
-  /** Query key segment used to keep favorites/watchlist caches separate. */
-  queryKeyBase?: string;
-  emptyTitleKey?: string;
-  emptyTextKey?: string;
-  /** Namespace for the see-all page headers ("favorites" or "kefintweaksWatchlist"). */
-  seeAllNamespace?: string;
-}
-
-export const Favorites = ({
-  filter = "IsFavorite",
-  queryKeyBase = "favorites",
-  emptyTitleKey = "favorites.noDataTitle",
-  emptyTextKey = "favorites.noData",
-  seeAllNamespace = "favorites",
-}: FavoritesProps = {}) => {
+export const Favorites = () => {
  const router = useRouter();
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
@@ -66,7 +46,7 @@ export const Favorites = ({
        userId: user?.Id,
        sortBy: ["SeriesSortName", "SortName"],
        sortOrder: ["Ascending"],
-        filters: [filter],
+        filters: ["IsFavorite"],
        recursive: true,
        fields: ["PrimaryImageAspectRatio"],
        collapseBoxSetItems: false,
@@ -88,7 +68,7 @@ export const Favorites = ({

      return items;
    },
-    [api, user, filter],
+    [api, user],
  );

  // Reset empty state when component mounts or dependencies change
@@ -146,68 +126,44 @@ export const Favorites = ({
  const handleSeeAllSeries = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Series",
-        title: t(`${seeAllNamespace}.seeAllSeries`),
-        filter,
-      },
+      params: { type: "Series", title: t("favorites.series") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllMovies = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Movie",
-        title: t(`${seeAllNamespace}.seeAllMovies`),
-        filter,
-      },
+      params: { type: "Movie", title: t("favorites.movies") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllEpisodes = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Episode",
-        title: t(`${seeAllNamespace}.seeAllEpisodes`),
-        filter,
-      },
+      params: { type: "Episode", title: t("favorites.episodes") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllVideos = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Video",
-        title: t(`${seeAllNamespace}.seeAllVideos`),
-        filter,
-      },
+      params: { type: "Video", title: t("favorites.videos") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllBoxsets = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "BoxSet",
-        title: t(`${seeAllNamespace}.seeAllBoxsets`),
-        filter,
-      },
+      params: { type: "BoxSet", title: t("favorites.boxsets") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  const handleSeeAllPlaylists = useCallback(() => {
    router.push({
      pathname: "/(auth)/(tabs)/(favorites)/see-all",
-      params: {
-        type: "Playlist",
-        title: t(`${seeAllNamespace}.seeAllPlaylists`),
-        filter,
-      },
+      params: { type: "Playlist", title: t("favorites.playlists") },
    } as any);
-  }, [router, filter, seeAllNamespace]);
+  }, [router]);

  return (
    <View className='flex flex-co gap-y-4'>
@@ -220,16 +176,16 @@ export const Favorites = ({
            source={heart}
          />
          <Text className='text-xl font-semibold text-white mb-2'>
-            {t(emptyTitleKey)}
+            {t("favorites.noDataTitle")}
          </Text>
          <Text className='text-base text-white/70 text-center max-w-xs px-4'>
-            {t(emptyTextKey)}
+            {t("favorites.noData")}
          </Text>
        </View>
      )}
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteSeries}
-        queryKey={["home", queryKeyBase, "series"]}
+        queryKey={["home", "favorites", "series"]}
        title={t("favorites.series")}
        hideIfEmpty
        pageSize={pageSize}
@@ -237,7 +193,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteMovies}
-        queryKey={["home", queryKeyBase, "movies"]}
+        queryKey={["home", "favorites", "movies"]}
        title={t("favorites.movies")}
        hideIfEmpty
        orientation='vertical'
@@ -246,7 +202,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteEpisodes}
-        queryKey={["home", queryKeyBase, "episodes"]}
+        queryKey={["home", "favorites", "episodes"]}
        title={t("favorites.episodes")}
        hideIfEmpty
        pageSize={pageSize}
@@ -254,7 +210,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteVideos}
-        queryKey={["home", queryKeyBase, "videos"]}
+        queryKey={["home", "favorites", "videos"]}
        title={t("favorites.videos")}
        hideIfEmpty
        pageSize={pageSize}
@@ -262,7 +218,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoriteBoxsets}
-        queryKey={["home", queryKeyBase, "boxsets"]}
+        queryKey={["home", "favorites", "boxsets"]}
        title={t("favorites.boxsets")}
        hideIfEmpty
        pageSize={pageSize}
@@ -270,7 +226,7 @@ export const Favorites = ({
      />
      <InfiniteScrollingCollectionList
        queryFn={fetchFavoritePlaylists}
-        queryKey={["home", queryKeyBase, "playlists"]}
+        queryKey={["home", "favorites", "playlists"]}
        title={t("favorites.playlists")}
        hideIfEmpty
        pageSize={pageSize}
--- a/components/home/Favorites.tv.tsx
+++ b/components/home/Favorites.tv.tsx
@@ -1,8 +1,5 @@
 import type { Api } from "@jellyfin/sdk";
-import type {
-  BaseItemKind,
-  ItemFilter,
-} from "@jellyfin/sdk/lib/generated-client";
+import type { BaseItemKind } from "@jellyfin/sdk/lib/generated-client";
 import { getItemsApi } from "@jellyfin/sdk/lib/utils/api";
 import { Image } from "expo-image";
 import { useAtom } from "jotai";
@@ -12,12 +9,10 @@ import { ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import heart from "@/assets/icons/heart.fill.png";
 import { Text } from "@/components/common/Text";
-import { TVFavoritesTabBadges } from "@/components/favorites/TVFavoritesTabBadges";
 import { InfiniteScrollingCollectionList } from "@/components/home/InfiniteScrollingCollectionList.tv";
 import { Colors } from "@/constants/Colors";
 import { useScaledTVTypography } from "@/constants/TVTypography";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-import { useSettings } from "@/utils/atoms/settings";

 const HORIZONTAL_PADDING = 60;
 const TOP_PADDING = 100;
@@ -38,27 +33,7 @@ export const Favorites = () => {
  const insets = useSafeAreaInsets();
  const [api] = useAtom(apiAtom);
  const [user] = useAtom(userAtom);
-  const { settings } = useSettings();
  const pageSize = 20;
-
-  // KefinTweaks watchlist (Likes-backed) view, toggled in-place like Discover.
-  const watchlistEnabled = settings?.useKefinTweaks ?? false;
-  const [viewType, setViewType] = useState<"Favorites" | "Watchlist">(
-    "Favorites",
-  );
-  const filter: ItemFilter =
-    watchlistEnabled && viewType === "Watchlist" ? "Likes" : "IsFavorite";
-  const queryKeyBase =
-    watchlistEnabled && viewType === "Watchlist" ? "watchlist" : "favorites";
-  // Translation namespace for the empty state, swapped for the KefinTweaks
-  // watchlist (Likes-backed) view. Section titles stay generic ("Series").
-  const emptyNamespace =
-    watchlistEnabled && viewType === "Watchlist"
-      ? "kefintweaksWatchlist"
-      : "favorites";
-  const emptyTitleKey = `${emptyNamespace}.noDataTitle`;
-  const emptyTextKey = `${emptyNamespace}.noData`;
-
  const [emptyState, setEmptyState] = useState<EmptyState>({
    Series: false,
    Movie: false,
@@ -78,7 +53,7 @@ export const Favorites = () => {
        userId: user?.Id,
        sortBy: ["SeriesSortName", "SortName"],
        sortOrder: ["Ascending"],
-        filters: [filter],
+        filters: ["IsFavorite"],
        recursive: true,
        fields: ["PrimaryImageAspectRatio"],
        collapseBoxSetItems: false,
@@ -99,7 +74,7 @@ export const Favorites = () => {

      return items;
    },
-    [api, user, filter],
+    [api, user],
  );

  useEffect(() => {
@@ -111,7 +86,7 @@ export const Favorites = () => {
      BoxSet: false,
      Playlist: false,
    });
-  }, [api, user, viewType]);
+  }, [api, user]);

  const areAllEmpty = () => {
    const loadedCategories = Object.values(emptyState);
@@ -152,63 +127,46 @@ export const Favorites = () => {
    [fetchFavoritesByType, pageSize],
  );

-  const tabBadges = (
-    <TVFavoritesTabBadges
-      viewType={viewType}
-      setViewType={setViewType}
-      enabled={watchlistEnabled}
-      hasTVPreferredFocus={watchlistEnabled}
-    />
-  );
-
  if (areAllEmpty()) {
    return (
      <View
        style={{
          flex: 1,
-          paddingTop: insets.top + TOP_PADDING,
+          alignItems: "center",
+          justifyContent: "center",
          paddingHorizontal: HORIZONTAL_PADDING,
        }}
      >
-        {tabBadges}
-        <View
+        <Image
          style={{
-            flex: 1,
-            alignItems: "center",
-            justifyContent: "center",
+            width: 64,
+            height: 64,
+            marginBottom: 16,
+            tintColor: Colors.primary,
+          }}
+          contentFit='contain'
+          source={heart}
+        />
+        <Text
+          style={{
+            fontSize: typography.heading,
+            fontWeight: "bold",
+            marginBottom: 8,
+            color: "#FFFFFF",
          }}
        >
-          <Image
-            style={{
-              width: 64,
-              height: 64,
-              marginBottom: 16,
-              tintColor: Colors.primary,
-            }}
-            contentFit='contain'
-            source={heart}
-          />
-          <Text
-            style={{
-              fontSize: typography.heading,
-              fontWeight: "bold",
-              marginBottom: 8,
-              color: "#FFFFFF",
-            }}
-          >
-            {t(emptyTitleKey)}
-          </Text>
-          <Text
-            style={{
-              textAlign: "center",
-              opacity: 0.7,
-              fontSize: typography.body,
-              color: "#FFFFFF",
-            }}
-          >
-            {t(emptyTextKey)}
-          </Text>
-        </View>
+          {t("favorites.noDataTitle")}
+        </Text>
+        <Text
+          style={{
+            textAlign: "center",
+            opacity: 0.7,
+            fontSize: typography.body,
+            color: "#FFFFFF",
+          }}
+        >
+          {t("favorites.noData")}
+        </Text>
      </View>
    );
  }
@@ -223,22 +181,17 @@ export const Favorites = () => {
      }}
    >
      <View style={{ gap: SECTION_GAP }}>
-        {watchlistEnabled && (
-          <View style={{ paddingHorizontal: HORIZONTAL_PADDING }}>
-            {tabBadges}
-          </View>
-        )}
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteSeries}
-          queryKey={["home", queryKeyBase, "series"]}
+          queryKey={["home", "favorites", "series"]}
          title={t("favorites.series")}
          hideIfEmpty
          pageSize={pageSize}
-          isFirstSection={!watchlistEnabled}
+          isFirstSection
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteMovies}
-          queryKey={["home", queryKeyBase, "movies"]}
+          queryKey={["home", "favorites", "movies"]}
          title={t("favorites.movies")}
          hideIfEmpty
          orientation='vertical'
@@ -246,28 +199,28 @@ export const Favorites = () => {
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteEpisodes}
-          queryKey={["home", queryKeyBase, "episodes"]}
+          queryKey={["home", "favorites", "episodes"]}
          title={t("favorites.episodes")}
          hideIfEmpty
          pageSize={pageSize}
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteVideos}
-          queryKey={["home", queryKeyBase, "videos"]}
+          queryKey={["home", "favorites", "videos"]}
          title={t("favorites.videos")}
          hideIfEmpty
          pageSize={pageSize}
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoriteBoxsets}
-          queryKey={["home", queryKeyBase, "boxsets"]}
+          queryKey={["home", "favorites", "boxsets"]}
          title={t("favorites.boxsets")}
          hideIfEmpty
          pageSize={pageSize}
        />
        <InfiniteScrollingCollectionList
          queryFn={fetchFavoritePlaylists}
-          queryKey={["home", queryKeyBase, "playlists"]}
+          queryKey={["home", "favorites", "playlists"]}
          title={t("favorites.playlists")}
          hideIfEmpty
          pageSize={pageSize}
--- a/components/tv/TVWatchlistButton.tsx
+++ b/components/tv/TVWatchlistButton.tsx
@@ -1,36 +0,0 @@
-import { Ionicons } from "@expo/vector-icons";
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import React from "react";
-import { useWatchlist } from "@/hooks/useWatchlist";
-import { TVButton } from "./TVButton";
-
-export interface TVWatchlistButtonProps {
-  item: BaseItemDto;
-  disabled?: boolean;
-}
-
-/**
- * KefinTweaks watchlist toggle (Likes-backed) for TV detail pages.
- * Render only when settings.useKefinTweaks is enabled.
- */
-export const TVWatchlistButton: React.FC<TVWatchlistButtonProps> = ({
-  item,
-  disabled,
-}) => {
-  const { isWatchlisted, toggleWatchlist } = useWatchlist(item);
-
-  return (
-    <TVButton
-      onPress={toggleWatchlist}
-      variant='glass'
-      square
-      disabled={disabled}
-    >
-      <Ionicons
-        name={isWatchlisted ? "bookmark" : "bookmark-outline"}
-        size={28}
-        color='#FFFFFF'
-      />
-    </TVButton>
-  );
-};
--- a/components/tv/index.ts
+++ b/components/tv/index.ts
@@ -68,5 +68,3 @@ export { TVTrackCard } from "./TVTrackCard";
 // User switching
 export type { TVUserCardProps } from "./TVUserCard";
 export { TVUserCard } from "./TVUserCard";
-export type { TVWatchlistButtonProps } from "./TVWatchlistButton";
-export { TVWatchlistButton } from "./TVWatchlistButton";
--- a/docs/tv-discovery.md
+++ b/docs/tv-discovery.md
@@ -28,7 +28,7 @@ Apple TV uses a Top Shelf extension target, not the main app process.

 Relevant files:

- [plugins/withTVOSTopShelf.js](../plugins/withTVOSTopShelf.js)
+- [plugins/withTVOSTopShelf.ts](../plugins/withTVOSTopShelf.ts)
 - [targets/StreamyfinTopShelf/TopShelfProvider.swift](../targets/StreamyfinTopShelf/TopShelfProvider.swift)
 - [modules/top-shelf-cache/ios/TopShelfCacheModule.swift](../modules/top-shelf-cache/ios/TopShelfCacheModule.swift)
 - [utils/topshelf/cache.ts](../utils/topshelf/cache.ts)
--- a/hooks/useWatchlist.ts
+++ b/hooks/useWatchlist.ts
@@ -1,146 +0,0 @@
-import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { atom, useAtom } from "jotai";
-import { useCallback, useEffect, useMemo, useRef } from "react";
-import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
-
-// Shared atom to store watchlist (Likes) status across all components
-// Maps itemId -> isWatchlisted
-const watchlistAtom = atom<Record<string, boolean>>({});
-
-/**
- * KefinTweaks watchlist is backed by Jellyfin's native "Likes" rating.
- * Toggling watchlist membership toggles UserData.Likes on the item.
- */
-export const useWatchlist = (item: BaseItemDto) => {
-  const queryClient = useQueryClient();
-  const [api] = useAtom(apiAtom);
-  const [user] = useAtom(userAtom);
-  const [watchlist, setWatchlist] = useAtom(watchlistAtom);
-
-  const itemId = item.Id ?? "";
-
-  // Get current watchlist status from shared state, falling back to item data
-  const isWatchlisted = itemId
-    ? (watchlist[itemId] ?? item.UserData?.Likes)
-    : item.UserData?.Likes;
-
-  // Update shared state when item data changes
-  useEffect(() => {
-    if (itemId && item.UserData?.Likes !== undefined) {
-      setWatchlist((prev) => ({
-        ...prev,
-        [itemId]: item.UserData!.Likes!,
-      }));
-    }
-  }, [itemId, item.UserData?.Likes, setWatchlist]);
-
-  // Helper to update watchlist status in shared state
-  const setIsWatchlisted = useCallback(
-    (value: boolean | null | undefined) => {
-      if (itemId && typeof value === "boolean") {
-        setWatchlist((prev) => ({ ...prev, [itemId]: value }));
-      }
-    },
-    [itemId, setWatchlist],
-  );
-
-  // Use refs to avoid stale closure issues in mutationFn
-  const itemRef = useRef(item);
-  const apiRef = useRef(api);
-  const userRef = useRef(user);
-
-  // Keep refs updated
-  useEffect(() => {
-    itemRef.current = item;
-  }, [item]);
-
-  useEffect(() => {
-    apiRef.current = api;
-  }, [api]);
-
-  useEffect(() => {
-    userRef.current = user;
-  }, [user]);
-
-  const itemQueryKeyPrefix = useMemo(
-    () => ["item", item.Id] as const,
-    [item.Id],
-  );
-
-  const updateItemInQueries = useCallback(
-    (newData: Partial<BaseItemDto>) => {
-      queryClient.setQueriesData<BaseItemDto | null | undefined>(
-        { queryKey: itemQueryKeyPrefix },
-        (old) => {
-          if (!old) return old;
-          return {
-            ...old,
-            ...newData,
-            UserData: { ...old.UserData, ...newData.UserData },
-          };
-        },
-      );
-    },
-    [itemQueryKeyPrefix, queryClient],
-  );
-
-  const watchlistMutation = useMutation({
-    mutationFn: async (nextIsWatchlisted: boolean) => {
-      const currentApi = apiRef.current;
-      const currentUser = userRef.current;
-      const currentItem = itemRef.current;
-
-      if (!currentApi || !currentUser?.Id || !currentItem?.Id) {
-        return;
-      }
-
-      // Watchlist == Jellyfin "Likes" rating:
-      // POST /UserItems/{itemId}/Rating?userId={userId}&likes=true   - add to watchlist
-      // POST /UserItems/{itemId}/Rating?userId={userId}&likes=false  - remove from watchlist
-      const path = `/UserItems/${currentItem.Id}/Rating`;
-
-      const response = await currentApi.post(
-        path,
-        {},
-        { params: { userId: currentUser.Id, likes: nextIsWatchlisted } },
-      );
-      return response.data;
-    },
-    onMutate: async (nextIsWatchlisted: boolean) => {
-      await queryClient.cancelQueries({ queryKey: itemQueryKeyPrefix });
-
-      const previousIsWatchlisted = isWatchlisted;
-      const previousQueries = queryClient.getQueriesData<BaseItemDto | null>({
-        queryKey: itemQueryKeyPrefix,
-      });
-
-      setIsWatchlisted(nextIsWatchlisted);
-      updateItemInQueries({ UserData: { Likes: nextIsWatchlisted } });
-
-      return { previousIsWatchlisted, previousQueries };
-    },
-    onError: (_err, _nextIsWatchlisted, context) => {
-      if (context?.previousQueries) {
-        for (const [queryKey, data] of context.previousQueries) {
-          queryClient.setQueryData(queryKey, data);
-        }
-      }
-      setIsWatchlisted(context?.previousIsWatchlisted);
-    },
-    onSettled: () => {
-      queryClient.invalidateQueries({ queryKey: itemQueryKeyPrefix });
-      queryClient.invalidateQueries({ queryKey: ["home", "watchlist"] });
-    },
-  });
-
-  const toggleWatchlist = useCallback(() => {
-    watchlistMutation.mutate(!isWatchlisted);
-  }, [watchlistMutation, isWatchlisted]);
-
-  return {
-    isWatchlisted,
-    toggleWatchlist,
-    watchlistMutation,
-  };
-};
--- a/package.json
+++ b/package.json
@@ -135,6 +135,7 @@
    "husky": "9.1.7",
    "lint-staged": "17.0.5",
    "react-test-renderer": "19.2.3",
+    "tsx": "^4.22.4",
    "typescript": "5.9.3"
  },
  "expo": {
--- a/plugins/with-runtime-framework-headers.ts
+++ b/plugins/with-runtime-framework-headers.ts
@@ -1,4 +1,4 @@
-const { withPodfile } = require("expo/config-plugins");
+import { type ConfigPlugin, withPodfile } from "expo/config-plugins";

 const PATCH_START = "## >>> runtime-framework headers";
 const PATCH_END = "## <<< runtime-framework headers";
@@ -13,7 +13,7 @@ const EXTRA_HDRS = [
  `\${PODS_CONFIGURATION_BUILD_DIR}/React-rendererconsistency/React_rendererconsistency.framework/Headers`,
 ];

-function buildPatch() {
+function buildPatch(): string {
  return [
    PATCH_START,
    "  extra_hdrs = [",
@@ -91,7 +91,7 @@ function buildPatch() {
  ].join("\n");
 }

-module.exports = function withRuntimeFrameworkHeaders(config) {
+const withRuntimeFrameworkHeaders: ConfigPlugin = (config) => {
  return withPodfile(config, (config) => {
    let podfile = config.modResults.contents;

@@ -125,3 +125,5 @@ end
    return config;
  });
 };
+
+export default withRuntimeFrameworkHeaders;
--- a/plugins/withAndroidAlertColors.ts
+++ b/plugins/withAndroidAlertColors.ts
@@ -1,10 +1,20 @@
-const {
+import {
+  type ConfigPlugin,
  withAndroidColors,
  withAndroidColorsNight,
-} = require("expo/config-plugins");
+} from "expo/config-plugins";

-const withAndroidAlertColors = (config) => {
-  const setColor = (colorsList, name, value) => {
+interface ColorResourceItem {
+  $: { name: string };
+  _: string;
+}
+
+const withAndroidAlertColors: ConfigPlugin = (config) => {
+  const setColor = (
+    colorsList: ColorResourceItem[],
+    name: string,
+    value: string,
+  ) => {
    const existingColor = colorsList.find(
      (item) => item.$ && item.$.name === name,
    );
@@ -20,7 +30,7 @@ const withAndroidAlertColors = (config) => {

  config = withAndroidColors(config, (config) => {
    const colors = config.modResults;
-    const colorsList = colors.resources.color || [];
+    const colorsList = (colors.resources.color ?? []) as ColorResourceItem[];
    setColor(colorsList, "colorPrimary", "#000000");
    colors.resources.color = colorsList;
    return config;
@@ -28,7 +38,7 @@ const withAndroidAlertColors = (config) => {

  config = withAndroidColorsNight(config, (config) => {
    const colors = config.modResults;
-    const colorsList = colors.resources.color || [];
+    const colorsList = (colors.resources.color ?? []) as ColorResourceItem[];
    setColor(colorsList, "colorPrimary", "#FFFFFF");
    colors.resources.color = colorsList;
    return config;
@@ -37,4 +47,4 @@ const withAndroidAlertColors = (config) => {
  return config;
 };

-module.exports = withAndroidAlertColors;
+export default withAndroidAlertColors;
--- a/plugins/withAndroidManifest.ts
+++ b/plugins/withAndroidManifest.ts
@@ -1,8 +1,12 @@
-const { withAndroidManifest } = require("expo/config-plugins");
+import { type ConfigPlugin, withAndroidManifest } from "expo/config-plugins";

-const _withGoogleCastAndroidManifest = (config) =>
+const withGoogleCastAndroidManifest: ConfigPlugin = (config) =>
  withAndroidManifest(config, async (mod) => {
-    const mainApplication = mod.modResults.manifest.application[0];
+    const mainApplication = mod.modResults.manifest.application?.[0];
+
+    if (!mainApplication) {
+      return mod;
+    }

    // Initialize activity array if it doesn't exist
    if (!mainApplication.activity) {
@@ -39,4 +43,4 @@ const _withGoogleCastAndroidManifest = (config) =>
    return mod;
  });

-module.exports = _withGoogleCastAndroidManifest;
+export default withGoogleCastAndroidManifest;
--- a/plugins/withChangeNativeAndroidTextToWhite.ts
+++ b/plugins/withChangeNativeAndroidTextToWhite.ts
@@ -1,8 +1,8 @@
-const { readFileSync, writeFileSync } = require("node:fs");
-const { join } = require("node:path");
-const { withDangerousMod } = require("expo/config-plugins");
+import { readFileSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+import { type ConfigPlugin, withDangerousMod } from "expo/config-plugins";

-const withChangeNativeAndroidTextToWhite = (expoConfig) =>
+const withChangeNativeAndroidTextToWhite: ConfigPlugin = (expoConfig) =>
  withDangerousMod(expoConfig, [
    "android",
    (modConfig) => {
@@ -30,4 +30,4 @@ const withChangeNativeAndroidTextToWhite = (expoConfig) =>
    },
  ]);

-module.exports = withChangeNativeAndroidTextToWhite;
+export default withChangeNativeAndroidTextToWhite;
--- a/plugins/withExcludeMedia3Dash.ts
+++ b/plugins/withExcludeMedia3Dash.ts
@@ -1,6 +1,6 @@
-const { withAppBuildGradle } = require("expo/config-plugins");
+import { type ConfigPlugin, withAppBuildGradle } from "expo/config-plugins";

-module.exports = function withExcludeMedia3Dash(config) {
+const withExcludeMedia3Dash: ConfigPlugin = (config) => {
  return withAppBuildGradle(config, (config) => {
    const contents = config.modResults.contents;

@@ -32,3 +32,5 @@ configurations.all {
    return config;
  });
 };
+
+export default withExcludeMedia3Dash;
--- a/plugins/withGitPod.ts
+++ b/plugins/withGitPod.ts
@@ -1,6 +1,14 @@
-const { withPodfile } = require("@expo/config-plugins");
+import { type ConfigPlugin, withPodfile } from "expo/config-plugins";

-const withGitPod = (config, { podName, podspecUrl }) => {
+interface GitPodOptions {
+  podName: string;
+  podspecUrl: string;
+}
+
+const withGitPod: ConfigPlugin<GitPodOptions> = (
+  config,
+  { podName, podspecUrl },
+) => {
  return withPodfile(config, (config) => {
    const podfile = config.modResults.contents;

@@ -21,4 +29,4 @@ const withGitPod = (config, { podName, podspecUrl }) => {
  });
 };

-module.exports = withGitPod;
+export default withGitPod;
--- a/plugins/withGradleProperties.ts
+++ b/plugins/withGradleProperties.ts
@@ -1,12 +1,21 @@
-const { withGradleProperties } = require("expo/config-plugins");
+import type { ExpoConfig } from "expo/config";
+import {
+  AndroidConfig,
+  type ConfigPlugin,
+  withGradleProperties,
+} from "expo/config-plugins";

-function setGradlePropertiesValue(config, key, value) {
+function setGradlePropertiesValue(
+  config: ExpoConfig,
+  key: string,
+  value: string,
+): ExpoConfig {
  return withGradleProperties(config, (exportedConfig) => {
    const props = exportedConfig.modResults;
    const keyIdx = props.findIndex(
      (item) => item.type === "property" && item.key === key,
    );
-    const property = {
+    const property: AndroidConfig.Properties.PropertiesItem = {
      type: "property",
      key,
      value,
@@ -22,7 +31,7 @@ function setGradlePropertiesValue(config, key, value) {
  });
 }

-module.exports = function withCustomPlugin(config) {
+const withCustomGradleProperties: ConfigPlugin = (config) => {
  // Expo 52 is not setting this
  // https://github.com/expo/expo/issues/32558
  config = setGradlePropertiesValue(config, "android.enableJetifier", "true");
@@ -35,3 +44,5 @@ module.exports = function withCustomPlugin(config) {
  );
  return config;
 };
+
+export default withCustomGradleProperties;
--- a/plugins/withTVOSAppIcon.ts
+++ b/plugins/withTVOSAppIcon.ts
@@ -1,6 +1,6 @@
-const { withXcodeProject } = require("@expo/config-plugins");
+import { type ConfigPlugin, withXcodeProject } from "expo/config-plugins";

-const withTVOSAppIcon = (config) => {
+const withTVOSAppIcon: ConfigPlugin = (config) => {
  // Only apply for TV builds
  if (process.env.EXPO_TV !== "1") {
    return config;
@@ -28,4 +28,4 @@ const withTVOSAppIcon = (config) => {
  });
 };

-module.exports = withTVOSAppIcon;
+export default withTVOSAppIcon;
--- a/plugins/withTVOSTopShelf.ts
+++ b/plugins/withTVOSTopShelf.ts
@@ -1,8 +1,10 @@
-const {
+import type { ExpoConfig } from "expo/config";
+import {
+  type ConfigPlugin,
  withEntitlementsPlist,
  withInfoPlist,
  withXcodeProject,
-} = require("@expo/config-plugins");
+} from "expo/config-plugins";

 const EXTENSION_TARGET_NAME = "StreamyfinTopShelf";
 const TARGET_SOURCE_DIR = "../targets/StreamyfinTopShelf";
@@ -10,19 +12,29 @@ const APP_GROUP_INFO_PLIST_KEY = "StreamyfinAppGroupIdentifier";
 const KEYCHAIN_ACCESS_GROUP_INFO_PLIST_KEY =
  "StreamyfinKeychainAccessGroupIdentifier";

-function getBundleIdentifier(config) {
+interface AppExtensionConfig {
+  targetName: string;
+  bundleIdentifier: string;
+  entitlements: {
+    "com.apple.security.application-groups": string[];
+    "keychain-access-groups": string[];
+  };
+}
+
+function getBundleIdentifier(config: ExpoConfig): string {
  return config.ios?.bundleIdentifier || "com.fredrikburmester.streamyfin";
 }

-function getAppGroupIdentifier(config) {
+function getAppGroupIdentifier(config: ExpoConfig): string {
  return `group.${getBundleIdentifier(config)}.tvtopshelf`;
 }

-function getKeychainAccessGroupIdentifier(config) {
+function getKeychainAccessGroupIdentifier(config: ExpoConfig): string {
  return `$(AppIdentifierPrefix)${getBundleIdentifier(config)}`;
 }

-function getBuildConfigurations(project, configurationListId) {
+// The xcode project object has no usable typings — keep `any` here.
+function getBuildConfigurations(project: any, configurationListId: string) {
  const configurationList =
    project.hash.project.objects.XCConfigurationList[configurationListId];

@@ -30,18 +42,21 @@ function getBuildConfigurations(project, configurationListId) {

  const buildConfigurations = project.pbxXCBuildConfigurationSection();
  return configurationList.buildConfigurations
-    .map((config) => buildConfigurations[config.value])
+    .map((config: { value: string }) => buildConfigurations[config.value])
    .filter(Boolean);
 }

-function ensureAppGroup(value, appGroupIdentifier) {
+function ensureAppGroup(value: unknown, appGroupIdentifier: string): string[] {
  const groups = Array.isArray(value) ? value : [];
  return groups.includes(appGroupIdentifier)
    ? groups
    : [...groups, appGroupIdentifier];
 }

-function ensureKeychainAccessGroup(value, keychainAccessGroupIdentifier) {
+function ensureKeychainAccessGroup(
+  value: unknown,
+  keychainAccessGroupIdentifier: string,
+): string[] {
  const groups = Array.isArray(value) ? value : [];
  return groups.includes(keychainAccessGroupIdentifier)
    ? groups
@@ -49,13 +64,13 @@ function ensureKeychainAccessGroup(value, keychainAccessGroupIdentifier) {
 }

 function ensureAppExtension(
-  appExtensions,
-  targetName,
-  bundleIdentifier,
-  appGroupIdentifier,
-  keychainAccessGroupIdentifier,
-) {
-  const extensionConfig = {
+  appExtensions: unknown,
+  targetName: string,
+  bundleIdentifier: string,
+  appGroupIdentifier: string,
+  keychainAccessGroupIdentifier: string,
+): AppExtensionConfig[] {
+  const extensionConfig: AppExtensionConfig = {
    targetName,
    bundleIdentifier,
    entitlements: {
@@ -63,7 +78,9 @@ function ensureAppExtension(
      "keychain-access-groups": [keychainAccessGroupIdentifier],
    },
  };
-  const extensions = Array.isArray(appExtensions) ? appExtensions : [];
+  const extensions: AppExtensionConfig[] = Array.isArray(appExtensions)
+    ? appExtensions
+    : [];
  // Keep plugin runs idempotent and preserve unrelated app extension entries.
  const existingIndex = extensions.findIndex(
    (appExtension) => appExtension?.targetName === targetName,
@@ -78,7 +95,7 @@ function ensureAppExtension(
  );
 }

-const withTVOSTopShelf = (config) => {
+const withTVOSTopShelf: ConfigPlugin = (config) => {
  const appGroupIdentifier = getAppGroupIdentifier(config);
  const keychainAccessGroupIdentifier =
    getKeychainAccessGroupIdentifier(config);
@@ -193,4 +210,4 @@ const withTVOSTopShelf = (config) => {
  });
 };

-module.exports = withTVOSTopShelf;
+export default withTVOSTopShelf;
--- a/plugins/withTVUserManagement.ts
+++ b/plugins/withTVUserManagement.ts
@@ -1,9 +1,9 @@
-const { withEntitlementsPlist } = require("expo/config-plugins");
+import { type ConfigPlugin, withEntitlementsPlist } from "expo/config-plugins";

 /**
 * Expo config plugin to add User Management entitlement for tvOS profile linking
 */
-const withTVUserManagement = (config) => {
+const withTVUserManagement: ConfigPlugin = (config) => {
  // Only add for tvOS builds. The entitlement is restricted by Apple and must
  // be present in the provisioning profile, so injecting it into mobile builds
  // breaks signing ("Entitlement ... not found and could not be included in
@@ -24,4 +24,4 @@ const withTVUserManagement = (config) => {
  });
 };

-module.exports = withTVUserManagement;
+export default withTVUserManagement;
--- a/plugins/withTVXcodeEnv.ts
+++ b/plugins/withTVXcodeEnv.ts
@@ -1,7 +1,7 @@
-const { withDangerousMod } = require("@expo/config-plugins");
-const { execSync } = require("node:child_process");
-const fs = require("node:fs");
-const path = require("node:path");
+import { execSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { type ConfigPlugin, withDangerousMod } from "expo/config-plugins";

 /**
 * Expo config plugin that adds EXPO_TV=1 and NODE_BINARY to .xcode.env.local for TV builds.
@@ -12,7 +12,7 @@ const path = require("node:path");
 *
 * It also sets NODE_BINARY for nvm users since Xcode can't resolve shell functions.
 */
-const withTVXcodeEnv = (config) => {
+const withTVXcodeEnv: ConfigPlugin = (config) => {
  // Only apply for TV builds
  if (process.env.EXPO_TV !== "1") {
    return config;
@@ -70,7 +70,7 @@ const withTVXcodeEnv = (config) => {
 /**
 * Get the actual node binary path, handling nvm installations.
 */
-function getNodeBinaryPath() {
+function getNodeBinaryPath(): string | null {
  try {
    // First try to get node path directly (works for non-nvm installs)
    const directPath = execSync("which node 2>/dev/null", {
@@ -114,4 +114,4 @@ function getNodeBinaryPath() {
  return null;
 }

-module.exports = withTVXcodeEnv;
+export default withTVXcodeEnv;
--- a/plugins/withTrustLocalCerts.ts
+++ b/plugins/withTrustLocalCerts.ts
@@ -1,18 +1,29 @@
-const { AndroidConfig, withAndroidManifest } = require("expo/config-plugins");
-const path = require("node:path");
-const fs = require("node:fs");
+import fs from "node:fs";
+import path from "node:path";
+import {
+  AndroidConfig,
+  type ConfigPlugin,
+  type ExportedConfigWithProps,
+  withAndroidManifest,
+} from "expo/config-plugins";
+
 const fsPromises = fs.promises;

 const { getMainApplicationOrThrow } = AndroidConfig.Manifest;

-const withTrustLocalCerts = (config) => {
+type AndroidManifest = AndroidConfig.Manifest.AndroidManifest;
+
+const withTrustLocalCerts: ConfigPlugin = (config) => {
  return withAndroidManifest(config, async (mod) => {
    mod.modResults = await setCustomConfigAsync(mod, mod.modResults);
    return mod;
  });
 };

-async function setCustomConfigAsync(config, androidManifest) {
+async function setCustomConfigAsync(
+  config: ExportedConfigWithProps<AndroidManifest>,
+  androidManifest: AndroidManifest,
+): Promise<AndroidManifest> {
  const src_file_path = path.join(__dirname, "network_security_config.xml");
  const res_file_path = path.join(
    await AndroidConfig.Paths.getResourceFolderAsync(
@@ -45,4 +56,4 @@ async function setCustomConfigAsync(config, androidManifest) {
  return androidManifest;
 }

-module.exports = withTrustLocalCerts;
+export default withTrustLocalCerts;
--- a/translations/en.json
+++ b/translations/en.json
@@ -593,25 +593,8 @@
    "videos": "Videos",
    "boxsets": "Box sets",
    "playlists": "Playlists",
-    "seeAllSeries": "Favorited Series",
-    "seeAllMovies": "Favorited Movies",
-    "seeAllEpisodes": "Favorited Episodes",
-    "seeAllVideos": "Favorited Videos",
-    "seeAllBoxsets": "Favorited Box sets",
-    "seeAllPlaylists": "Favorited Playlists",
    "noDataTitle": "No favorites yet",
-    "noData": "Mark items as favorites to see them appear here for quick access.",
-    "watchlist": "Watchlist"
-  },
-  "kefintweaksWatchlist": {
-    "seeAllSeries": "Watchlisted Series",
-    "seeAllMovies": "Watchlisted Movies",
-    "seeAllEpisodes": "Watchlisted Episodes",
-    "seeAllVideos": "Watchlisted Videos",
-    "seeAllBoxsets": "Watchlisted Box sets",
-    "seeAllPlaylists": "Watchlisted Playlists",
-    "noDataTitle": "No watchlisted items yet",
-    "noData": "Add items to your watchlist to see them appear here."
+    "noData": "Mark items as favorites to see them appear here for quick access."
  },
  "custom_links": {
    "no_links": "No links"
--- a/translations/sv.json
+++ b/translations/sv.json
@@ -675,25 +675,8 @@
    "videos": "Videor",
    "boxsets": "Box Set",
    "playlists": "Spellistor",
-    "seeAllSeries": "Favoritmarkerade serier",
-    "seeAllMovies": "Favoritmarkerade filmer",
-    "seeAllEpisodes": "Favoritmarkerade avsnitt",
-    "seeAllVideos": "Favoritmarkerade videor",
-    "seeAllBoxsets": "Favoritmarkerade box set",
-    "seeAllPlaylists": "Favoritmarkerade spellistor",
    "noDataTitle": "Inga favoriter än",
-    "noData": "Markera objekt som favoriter för att se dem visas här för snabb åtkomst.",
-    "watchlist": "Bevakningslista"
-  },
-  "kefintweaksWatchlist": {
-    "seeAllSeries": "Bevakade serier",
-    "seeAllMovies": "Bevakade filmer",
-    "seeAllEpisodes": "Bevakade avsnitt",
-    "seeAllVideos": "Bevakade videor",
-    "seeAllBoxsets": "Bevakade box set",
-    "seeAllPlaylists": "Bevakade spellistor",
-    "noDataTitle": "Inga bevakade objekt än",
-    "noData": "Lägg till objekt i din bevakningslista för att se dem visas här."
+    "noData": "Markera objekt som favoriter för att se dem visas här för snabb åtkomst."
  },
  "custom_links": {
    "no_links": "Inga Länkar"
--- a/utils/atoms/filters.ts
+++ b/utils/atoms/filters.ts
@@ -82,6 +82,8 @@ export const useFilterOptions = () => {
        { key: FilterByOption.IsFavorite, value: "Is Favorite" },
        { key: FilterByOption.IsResumable, value: "Is Resumable" },
      ];
+  console.log("filterOptions");
+  console.log(filterOptions);
  return filterOptions;
 };

--- a/utils/version.ts
+++ b/utils/version.ts
@@ -5,7 +5,7 @@ import Constants from "expo-constants";
 * clientInfo auto-tracks the app version instead of a hardcoded string. */
 export const APP_VERSION = Application.nativeApplicationVersion ?? "unknown";

-/** Build metadata injected at build time by `app.config.js` into `extra.build`. */
+/** Build metadata injected at build time by `app.config.ts` into `extra.build`. */
 export interface BuildMeta {
  commit?: string | null;
  branch?: string | null;