diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
new file mode 100644
index 00000000..4b6fcbcc
--- /dev/null
+++ b/.claude/CLAUDE.md
@@ -0,0 +1,5 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+@../AGENTS.md
diff --git a/.cursor/mcp.json b/.cursor/mcp.json
new file mode 100644
index 00000000..0127976e
--- /dev/null
+++ b/.cursor/mcp.json
@@ -0,0 +1,12 @@
+{
+  "mcpServers": {
+    "dart": {
+      "command": "dart",
+      "args": ["mcp-server", "--force-roots-fallback"]
+    },
+    "next-devtools": {
+      "command": "node",
+      "args": ["web/node_modules/next-devtools-mcp/dist/index.js"]
+    }
+  }
+}
diff --git a/.env.example b/.env.example
new file mode 100644
index 00000000..4d4439a4
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,2 @@
+CLIENT_ID=
+SECRET=
diff --git a/.forgejo/workflows/actions-probe.yml b/.forgejo/workflows/actions-probe.yml
new file mode 100644
index 00000000..a9e9414d
--- /dev/null
+++ b/.forgejo/workflows/actions-probe.yml
@@ -0,0 +1,14 @@
+# Temporary probe: does this repo schedule Actions at all?
+name: Actions probe
+
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+
+jobs:
+  probe:
+    runs-on: desktop-release
+    steps:
+      - name: ping
+        run: echo "frosty actions probe ok"
diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml
new file mode 100644
index 00000000..8e8ac8fd
--- /dev/null
+++ b/.forgejo/workflows/release.yml
@@ -0,0 +1,304 @@
+# Builds a signed Frosty release APK and publishes a Forgejo release for Obtainium.
+# Pattern: finamp-fork / jellyfin-android-fork on host runner `desktop-release`.
+#
+# Required repository secrets:
+#   RELEASE_KEYSTORE_BASE64, STORE_PASSWORD, KEY_ALIAS, KEY_PASSWORD
+#   CLIENT_ID, SECRET  (Twitch Helix app credentials — --dart-define)
+#
+# Obtainium:
+#   Source: Forgejo
+#   URL: https://forgejo.fsociety00.cc/api/v1/repos/copilot/frosty/releases
+#   APK filter: frosty-arm64-v8a-v.*\.apk
+#   Trim version: v?([0-9]+\.[0-9]+\.[0-9]+)
+#   Match group: 1
+# Private repo → Forgejo API token in Obtainium.
+
+name: Release APK
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+concurrency:
+  group: frosty-release
+  cancel-in-progress: true
+
+jobs:
+  build-and-release:
+    name: Build & publish release
+    runs-on: desktop-release
+
+    steps:
+      - name: Clone repository
+        shell: bash
+        env:
+          FORGEJO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -euo pipefail
+          rm -rf .git
+          git init .
+          origin_url="${GITHUB_SERVER_URL#https://}"
+          origin_url="${origin_url#http://}"
+          git remote add origin "https://copilot:${FORGEJO_TOKEN}@${origin_url}/${GITHUB_REPOSITORY}.git"
+          git -c http.sslVerify=false fetch --depth=1 origin "${GITHUB_SHA}"
+          git checkout --force FETCH_HEAD
+          test -f pubspec.yaml
+          test -f android/app/build.gradle.kts
+          echo "Checked out ${GITHUB_REPOSITORY}@${GITHUB_SHA}"
+
+      - name: Set up JDK
+        shell: bash
+        run: |
+          set -euo pipefail
+          pkg_install() {
+            if [ "$(id -u)" -eq 0 ]; then "$@"
+            elif command -v sudo >/dev/null 2>&1; then sudo "$@"
+            else "$@"; fi
+          }
+          if ! command -v java >/dev/null 2>&1; then
+            if command -v dnf >/dev/null 2>&1; then pkg_install dnf install -y java-21-openjdk-devel
+            elif command -v apt-get >/dev/null 2>&1; then
+              pkg_install apt-get update
+              pkg_install apt-get install -y openjdk-21-jdk
+            elif command -v apk >/dev/null 2>&1; then pkg_install apk add --no-cache openjdk21
+            fi
+          fi
+          java -version
+          if command -v javac >/dev/null 2>&1; then
+            java_home="$(dirname "$(dirname "$(readlink -f "$(command -v javac)")")")"
+            echo "JAVA_HOME=$java_home" >> "$GITHUB_ENV"
+          fi
+
+      - name: Set up Android SDK
+        shell: bash
+        run: |
+          set -euo pipefail
+          sdk_candidates=(
+            "${ANDROID_HOME:-}"
+            "${ANDROID_SDK_ROOT:-}"
+            "/home/yuna/Android/Sdk"
+            "${HOME}/Android/Sdk"
+            "/opt/android-sdk-linux"
+            "/root/Android/Sdk"
+          )
+          sdk_dir=""
+          for candidate in "${sdk_candidates[@]}"; do
+            if [ -n "$candidate" ] && [ -d "$candidate/platforms" ] && [ -d "$candidate/build-tools" ]; then
+              sdk_dir="$candidate"
+              break
+            fi
+          done
+          if [ -z "$sdk_dir" ]; then
+            echo "Android SDK not found on desktop-release host."
+            exit 1
+          fi
+          echo "ANDROID_HOME=$sdk_dir" >> "$GITHUB_ENV"
+          echo "ANDROID_SDK_ROOT=$sdk_dir" >> "$GITHUB_ENV"
+          printf 'sdk.dir=%s\n' "$sdk_dir" > android/local.properties
+          echo "Using Android SDK: $sdk_dir"
+
+      - name: Set up Flutter
+        shell: bash
+        run: |
+          set -euo pipefail
+          pkg_install() {
+            if [ "$(id -u)" -eq 0 ]; then "$@"
+            elif command -v sudo >/dev/null 2>&1; then sudo "$@"
+            else "$@"; fi
+          }
+          if ! command -v curl >/dev/null 2>&1; then
+            if command -v apk >/dev/null 2>&1; then pkg_install apk add --no-cache curl bash git unzip xz
+            elif command -v dnf >/dev/null 2>&1; then pkg_install dnf install -y curl git unzip
+            elif command -v apt-get >/dev/null 2>&1; then
+              pkg_install apt-get update
+              pkg_install apt-get install -y curl git unzip
+            fi
+          fi
+          # Prefer pinned SDK already on the desktop-release host.
+          flutter_version="$(awk '/^[[:space:]]*flutter:/{print $2; exit}' pubspec.yaml)"
+          flutter_version="${flutter_version:-3.47.0}"
+          candidates=(
+            "/home/yuna/.local/flutter-${flutter_version}"
+            "${HOME}/.cache/frosty-ci-flutter-${flutter_version}"
+            "/home/yuna/.local/flutter"
+          )
+          flutter_home=""
+          for c in "${candidates[@]}"; do
+            if [ -x "${c}/bin/flutter" ]; then
+              flutter_home="$c"
+              break
+            fi
+          done
+          if [ -z "$flutter_home" ]; then
+            flutter_home="${HOME}/.cache/frosty-ci-flutter-${flutter_version}"
+            rm -rf "${flutter_home}"
+            git clone --depth 1 --branch "${flutter_version}" https://github.com/flutter/flutter.git "${flutter_home}"
+          fi
+          echo "${flutter_home}/bin" >> "$GITHUB_PATH"
+          echo "PATH=${flutter_home}/bin:${PATH}" >> "$GITHUB_ENV"
+          export PATH="${flutter_home}/bin:${PATH}"
+          flutter --version
+          flutter precache --android
+
+      - name: Decode keystore
+        shell: bash
+        env:
+          RELEASE_KEYSTORE_BASE64: ${{ secrets.RELEASE_KEYSTORE_BASE64 }}
+          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+        run: |
+          set -euo pipefail
+          if [ -z "${RELEASE_KEYSTORE_BASE64:-}" ] || [ -z "${STORE_PASSWORD:-}" ] || [ -z "${KEY_ALIAS:-}" ] || [ -z "${KEY_PASSWORD:-}" ]; then
+            echo "Missing signing secrets: RELEASE_KEYSTORE_BASE64, STORE_PASSWORD, KEY_ALIAS, KEY_PASSWORD"
+            exit 1
+          fi
+          printf '%s' "$RELEASE_KEYSTORE_BASE64" | base64 -d > android/upload-keystore.jks
+          test -s android/upload-keystore.jks
+          {
+            echo "storePassword=${STORE_PASSWORD}"
+            echo "keyPassword=${KEY_PASSWORD}"
+            echo "keyAlias=${KEY_ALIAS}"
+            echo "storeFile=${GITHUB_WORKSPACE}/android/upload-keystore.jks"
+          } > android/key.properties
+          echo "Keystore ready ($(wc -c < android/upload-keystore.jks) bytes)."
+
+      - name: Resolve version metadata
+        id: version
+        shell: bash
+        run: |
+          set -euo pipefail
+          raw="$(grep -E '^version:' pubspec.yaml | head -1 | awk '{print $2}')"
+          VERSION_NAME="${raw%%+*}"
+          VERSION_CODE="${raw##*+}"
+          [ "$VERSION_CODE" != "$raw" ] || VERSION_CODE=1
+          SHORT_SHA="${GITHUB_SHA::7}"
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            TAG="${GITHUB_REF#refs/tags/}"
+          else
+            TAG="build-${VERSION_NAME}-${VERSION_CODE}-${SHORT_SHA}"
+          fi
+          echo "version_name=${VERSION_NAME}" >> "$GITHUB_OUTPUT"
+          echo "version_code=${VERSION_CODE}" >> "$GITHUB_OUTPUT"
+          echo "short_sha=${SHORT_SHA}" >> "$GITHUB_OUTPUT"
+          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
+          echo "tag=${TAG} version=${VERSION_NAME}+${VERSION_CODE}"
+
+      - name: Build signed release APK
+        id: build
+        shell: bash
+        env:
+          CLIENT_ID: ${{ secrets.CLIENT_ID }}
+          SECRET: ${{ secrets.SECRET }}
+          VERSION_NAME: ${{ steps.version.outputs.version_name }}
+          VERSION_CODE: ${{ steps.version.outputs.version_code }}
+        run: |
+          set -euo pipefail
+          if [ -z "${CLIENT_ID:-}" ] || [ -z "${SECRET:-}" ]; then
+            echo "Missing Twitch secrets CLIENT_ID / SECRET (Helix OAuth app)."
+            exit 1
+          fi
+          flutter pub get
+          flutter build apk --release \
+            --build-name="${VERSION_NAME}" \
+            --build-number="${VERSION_CODE}" \
+            --dart-define="CLIENT_ID=${CLIENT_ID}" \
+            --dart-define="SECRET=${SECRET}"
+          mkdir -p dist
+          cp build/app/outputs/flutter-apk/app-release.apk \
+            "dist/frosty-v${VERSION_NAME}.apk"
+          flutter build apk --release --split-per-abi \
+            --build-name="${VERSION_NAME}" \
+            --build-number="${VERSION_CODE}" \
+            --dart-define="CLIENT_ID=${CLIENT_ID}" \
+            --dart-define="SECRET=${SECRET}" || true
+          for abi in arm64-v8a armeabi-v7a x86_64; do
+            src="build/app/outputs/flutter-apk/app-${abi}-release.apk"
+            if [ -f "$src" ]; then
+              cp "$src" "dist/frosty-${abi}-v${VERSION_NAME}.apk"
+            fi
+          done
+          ls -lh dist/
+
+      - name: Publish Forgejo release
+        shell: bash
+        env:
+          FORGEJO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG: ${{ steps.version.outputs.tag }}
+          VERSION_NAME: ${{ steps.version.outputs.version_name }}
+          VERSION_CODE: ${{ steps.version.outputs.version_code }}
+          SHORT_SHA: ${{ steps.version.outputs.short_sha }}
+        run: |
+          set -euo pipefail
+          pkg_install() {
+            if [ "$(id -u)" -eq 0 ]; then "$@"
+            elif command -v sudo >/dev/null 2>&1; then sudo "$@"
+            else return 1; fi
+          }
+          for pkg in curl jq; do
+            command -v "$pkg" >/dev/null 2>&1 && continue
+            if command -v apk >/dev/null 2>&1; then pkg_install apk add --no-cache "$pkg"
+            elif command -v dnf >/dev/null 2>&1; then pkg_install dnf install -y "$pkg"
+            elif command -v apt-get >/dev/null 2>&1; then
+              pkg_install apt-get update
+              pkg_install apt-get install -y "$pkg"
+            fi
+          done
+
+          API="${GITHUB_API_URL:-${GITHUB_SERVER_URL}/api/v1}/repos/${GITHUB_REPOSITORY}"
+          AUTH="Authorization: token ${FORGEJO_TOKEN}"
+
+          BODY_FILE="$(mktemp)"
+          cat > "${BODY_FILE}" <<BODY_EOF
+          Frosty fork (Twitch client) — native player + TwitchAdSolutions adblock.
+
+          | | |
+          |---|---|
+          | Version | ${VERSION_NAME} (${VERSION_CODE}) |
+          | Commit | ${SHORT_SHA} |
+          | Package | \`com.tommychow.frosty\` |
+
+          **Obtainium:** Forgejo source → \`…/copilot/frosty/releases\`, APK filter \`frosty-arm64-v8a-v.*\\.apk\`, trim \`v?([0-9]+\\.[0-9]+\\.[0-9]+)\` group \`1\`.
+
+          Stock Play Frosty uses a different signing key — uninstall it before installing this fork, or Obtainium cannot update in place.
+          BODY_EOF
+
+          # Create or update release for TAG
+          existing="$(curl -sS -H "$AUTH" "${API}/releases/tags/${TAG}" || true)"
+          release_id="$(printf '%s' "$existing" | jq -r '.id // empty')"
+          if [ -z "$release_id" ]; then
+            payload="$(jq -n \
+              --arg tag "$TAG" \
+              --arg name "Frosty ${VERSION_NAME} (${SHORT_SHA})" \
+              --rawfile body "$BODY_FILE" \
+              '{tag_name:$tag, name:$name, body:$body, draft:false, prerelease:false}')"
+            resp="$(curl -sS -X POST -H "$AUTH" -H 'Content-Type: application/json' \
+              -d "$payload" "${API}/releases")"
+            release_id="$(printf '%s' "$resp" | jq -r '.id')"
+          else
+            payload="$(jq -n \
+              --arg name "Frosty ${VERSION_NAME} (${SHORT_SHA})" \
+              --rawfile body "$BODY_FILE" \
+              '{name:$name, body:$body, draft:false, prerelease:false}')"
+            curl -sS -X PATCH -H "$AUTH" -H 'Content-Type: application/json' \
+              -d "$payload" "${API}/releases/${release_id}" >/dev/null
+          fi
+          test -n "$release_id" && test "$release_id" != "null"
+
+          for apk in dist/*.apk; do
+            [ -f "$apk" ] || continue
+            name="$(basename "$apk")"
+            echo "Uploading ${name}…"
+            curl -sS -X POST -H "$AUTH" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary @"${apk}" \
+              "${API}/releases/${release_id}/assets?name=${name}" \
+              | jq -r '.name // .message'
+          done
+          echo "Published ${TAG} as release ${release_id}"
+          rm -f "$BODY_FILE"
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index e82f4c98..0ce3b2a1 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,3 @@
 github: tommyxchow
-custom: ["buymeacoffee.com/tommychow", "paypal.com/donate/?business=NF33JDG6KBU6W"]
+buy_me_a_coffee: tommychow
+custom: https://www.tesla.com/referral/tommy414363
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..9d449f02
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,33 @@
+version: 2
+updates:
+  # Keep GitHub Actions up to date
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "ci"
+    groups:
+      actions:
+        patterns:
+          - "*"
+
+  # Keep Ruby gems (fastlane) up to date
+  - package-ecosystem: "bundler"
+    directory: "/android"
+    schedule:
+      interval: "monthly"
+
+  - package-ecosystem: "bundler"
+    directory: "/ios"
+    schedule:
+      interval: "monthly"
+
+  # Keep Dart/Flutter packages up to date
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54414437..d6c5c96b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,18 +3,57 @@ on:
   push:
     branches: [main]
 jobs:
-  test:
-    name: Check and test on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+  # Linux runner: analyze + test once (both are OS-independent) and compile a
+  # release APK to catch release-only breakage. Debug-signed via the build.gradle
+  # fallback (ALLOW_DEBUG_SIGNED_RELEASE) — no signing secrets needed.
+  android:
+    name: Analyze, test, and build Android
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
+      # Match the JDK the release workflows build with, so this compile check
+      # faithfully catches what would break a real release.
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 21
       - uses: subosito/flutter-action@v2
         with:
+          flutter-version-file: pubspec.yaml
           cache: true
       - run: flutter doctor -v
       - run: flutter pub get
+      # Fail if committed generated files (*.g.dart) are stale — CI never runs
+      # build_runner otherwise, so forgetting to regenerate after editing a MobX
+      # store or @JsonSerializable model slips past analyze/test/build.
+      - run: dart run build_runner build --delete-conflicting-outputs
+      - name: Verify generated files are up to date
+        run: |
+          if [ -n "$(git status --porcelain)" ]; then
+            echo '::error::Generated files are out of date. Run `dart run build_runner build --delete-conflicting-outputs` and commit the result.'
+            git status --porcelain
+            git diff
+            exit 1
+          fi
       - run: flutter analyze
       - run: flutter test
+      - run: flutter build apk --release
+        env:
+          ALLOW_DEBUG_SIGNED_RELEASE: '1'
+  # macOS runner: release-compile iOS (no codesign, no secrets) — the only thing
+  # that must run on macOS. analyze/test already covered on the Linux job.
+  ios:
+    name: Build iOS
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v6
+      # Match release workflows and avoid GitHub's lagging default Xcode.
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version-file: pubspec.yaml
+          cache: true
+      - run: flutter pub get
+      - run: flutter build ios --release --no-codesign
diff --git a/.github/workflows/gh-release.yml b/.github/workflows/gh-release.yml
index 95816783..a0d23fd7 100644
--- a/.github/workflows/gh-release.yml
+++ b/.github/workflows/gh-release.yml
@@ -9,6 +9,7 @@ jobs:
   android:
     name: Draft release and attach APK
     runs-on: ubuntu-latest
+    environment: release-android
     env:
       UPLOAD_KEYSTORE: ${{ secrets.UPLOAD_KEYSTORE }}
       STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
@@ -18,19 +19,20 @@ jobs:
       SECRET: ${{ secrets.SECRET }}
     steps:
       - name: Checkout Frosty repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       
       # Setup Java so that we can build the APK.
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
-          distribution: zulu
-          java-version: 11
+          distribution: temurin
+          java-version: 21
       
       # Setup and cache Flutter to install packages and build.
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
+          flutter-version-file: pubspec.yaml
           cache: true
       
       # Decode and create the upload-keystore.jks file, used for signing the app.
@@ -50,14 +52,54 @@ jobs:
         run: |
           flutter build apk --dart-define CLIENT_ID=$CLIENT_ID --dart-define SECRET=$SECRET
           mv build/app/outputs/flutter-apk/app-release.apk frosty-${{ github.ref_name }}.apk
-      
+
+      # Extract release notes from assets/release-notes.md for the current version.
+      - name: Extract release notes
+        id: release_notes
+        run: |
+          VERSION="${{ github.ref_name }}"
+          RELEASE_NOTES_FILE="assets/release-notes.md"
+
+          # Extract the section for this version using awk
+          # Starts at "## vX.X.X", skips date line, stops at next "---" or "## v" header
+          NOTES=$(awk -v version="$VERSION" '
+            BEGIN { found=0; output="" }
+            $0 ~ "^## " version "$" { found=1; next }
+            found && /^[A-Z][a-z]+ [0-9]+, [0-9]+$/ { next }
+            found && /^---$/ { exit }
+            found && /^## v[0-9]+\.[0-9]+\.[0-9]+$/ { exit }
+            found { output = output $0 "\n" }
+            END { print output }
+          ' "$RELEASE_NOTES_FILE")
+
+          # Clean up "on GitHub" suffix (redundant since we're on GitHub)
+          NOTES=$(echo "$NOTES" | sed 's/ on GitHub)/)/')
+
+          # Trim leading/trailing whitespace
+          NOTES=$(echo "$NOTES" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+
+          if [ -n "$NOTES" ]; then
+            # Get the previous tag for the Full Changelog link
+            PREV_TAG=$(git describe --tags --abbrev=0 "$VERSION^" 2>/dev/null || echo "")
+
+            echo "found=true" >> $GITHUB_OUTPUT
+            echo "body<<EOF" >> $GITHUB_OUTPUT
+            echo "$NOTES" >> $GITHUB_OUTPUT
+            if [ -n "$PREV_TAG" ]; then
+              echo "" >> $GITHUB_OUTPUT
+              echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${PREV_TAG}...${VERSION}" >> $GITHUB_OUTPUT
+            fi
+            echo "EOF" >> $GITHUB_OUTPUT
+          else
+            echo "found=false" >> $GITHUB_OUTPUT
+            echo "::warning::No release notes found for $VERSION in $RELEASE_NOTES_FILE"
+          fi
+
       # Create a draft release on GitHub.
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v3
         with:
           draft: true
-          generate_release_notes: true
+          generate_release_notes: ${{ steps.release_notes.outputs.found != 'true' }}
+          body: ${{ steps.release_notes.outputs.found == 'true' && steps.release_notes.outputs.body || '' }}
           files: frosty-${{ github.ref_name }}.apk
-          
-
-        
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
index cdd59011..1c3e9897 100644
--- a/.github/workflows/pr-check.yml
+++ b/.github/workflows/pr-check.yml
@@ -7,11 +7,37 @@ jobs:
     name: Check and test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
+      # Match the JDK the release workflows build with, so the release-mode APK
+      # check below faithfully catches what would break a real release.
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 21
       - uses: subosito/flutter-action@v2
         with:
+          flutter-version-file: pubspec.yaml
           cache: true
       - run: flutter doctor -v
       - run: flutter pub get
+      # Fail if committed generated files (*.g.dart) are stale — CI never runs
+      # build_runner otherwise, so forgetting to regenerate after editing a MobX
+      # store or @JsonSerializable model slips past analyze/test/build.
+      - run: dart run build_runner build --delete-conflicting-outputs
+      - name: Verify generated files are up to date
+        run: |
+          if [ -n "$(git status --porcelain)" ]; then
+            echo '::error::Generated files are out of date. Run `dart run build_runner build --delete-conflicting-outputs` and commit the result.'
+            git status --porcelain
+            git diff
+            exit 1
+          fi
       - run: flutter analyze
       - run: flutter test
+      # Release-mode compile check (no signing secrets needed — Android falls back
+      # to debug signing via ALLOW_DEBUG_SIGNED_RELEASE). Catches release-only
+      # breakage that debug builds and tests miss (AOT compile, icon tree-shaking,
+      # plugin/Gradle release incompatibility).
+      - run: flutter build apk --release
+        env:
+          ALLOW_DEBUG_SIGNED_RELEASE: '1'
diff --git a/.github/workflows/release-dryrun.yml b/.github/workflows/release-dryrun.yml
new file mode 100644
index 00000000..0b905936
--- /dev/null
+++ b/.github/workflows/release-dryrun.yml
@@ -0,0 +1,126 @@
+# Dry-runs the full store release pipeline without publishing, to catch
+# credential, signing, dependency, and store-validation breakage before an
+# actual release. Mirrors store-release.yml but stops short of publishing:
+# Android validates the AAB against Google Play (validate_only); iOS builds a
+# fully signed archive via match (readonly) and skips the App Store upload.
+name: Release dry-run
+on:
+  # Run on demand before cutting a release.
+  workflow_dispatch:
+  # Monthly heartbeat so cert expiry, secret rotation, and dependency drift
+  # surface on their own between releases.
+  schedule:
+    - cron: '0 9 1 * *' # 1st of the month, 09:00 UTC
+# Setup environment variables for use in all jobs.
+env:
+  # Gemfile path used for caching dependencies.
+  BUNDLE_GEMFILE: ${{ github.workspace }}/android/Gemfile
+  CLIENT_ID: ${{ secrets.CLIENT_ID }}
+  SECRET: ${{ secrets.SECRET }}
+  LC_ALL: en_US.UTF-8
+  LANG: en_US.UTF-8
+jobs:
+  android:
+    name: Dry-run Android release
+    runs-on: ubuntu-latest
+    environment: release-android
+    env:
+      UPLOAD_KEYSTORE: ${{ secrets.UPLOAD_KEYSTORE }}
+      STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+      KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+      KEY_FILE_PATH: android/key.properties
+      PLAY_STORE_CREDENTIALS: ${{ secrets.PLAY_STORE_CREDENTIALS }}
+
+    steps:
+      - name: Checkout Frosty repo
+        uses: actions/checkout@v6
+
+      # Install Ruby and install/cache dependencies with bundler in order to use fastlane.
+      - name: Set up Ruby and Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+          bundler-cache: true
+
+      # Setup Java so that we can build the appbundle.
+      - name: Set up Java
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 21
+
+      # Setup and cache Flutter to install packages and build.
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version-file: pubspec.yaml
+          cache: true
+
+      # Decode and create the upload-keystore.jks file, used for signing the app.
+      - name: Decode and create upload-keystore.jks
+        run: echo $UPLOAD_KEYSTORE | base64 --decode > $GITHUB_WORKSPACE/android/upload-keystore.jks
+
+      # Create the key.properties file, used for signing the app.
+      - name: Create key.properties
+        run: |
+          echo storePassword=$STORE_PASSWORD >> $KEY_FILE_PATH
+          echo keyPassword=$KEY_PASSWORD >> $KEY_FILE_PATH
+          echo keyAlias=upload >> $KEY_FILE_PATH
+          echo storeFile=$GITHUB_WORKSPACE/android/upload-keystore.jks >> $KEY_FILE_PATH
+
+      # Build the Android app bundle (AAB) and pass the environment variables.
+      #
+      # The version code is overridden because Play rejects one it has already
+      # seen, and pubspec's code is by definition already published between
+      # releases — so the dry-run would fail on every scheduled run and never
+      # reach the validation it exists to perform. Epoch seconds is always
+      # unused, always increasing, and well under Play's 2100000000 cap. The
+      # bundle is only ever validated, never published, so the value is thrown
+      # away. versionName still comes from pubspec.
+      - name: Build the Android AAB
+        run: flutter build appbundle --build-number=$(date +%s) --dart-define CLIENT_ID=$CLIENT_ID --dart-define SECRET=$SECRET
+
+      # Validate the AAB and credentials against Google Play without publishing.
+      - name: Validate release with fastlane (no publish)
+        run: cd android && bundle exec fastlane deploy dry_run:true
+  ios:
+    name: Dry-run iOS release
+    runs-on: macos-latest
+    environment: release-ios
+    env:
+      APP_STORE_KEY_ID: ${{ secrets.APP_STORE_KEY_ID }}
+      APP_STORE_ISSUER_ID: ${{ secrets.APP_STORE_ISSUER_ID }}
+      APP_STORE_CREDENTIALS: ${{ secrets.APP_STORE_CREDENTIALS }}
+      MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
+      MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+    steps:
+      - name: Checkout Frosty repo
+        uses: actions/checkout@v6
+
+      # Always pick the newest production Xcode on the runner.
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
+      # Install Ruby and install/cache dependencies with bundler in order to use fastlane.
+      - name: Set up Ruby and Bundler
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3
+          bundler-cache: true
+
+      # Setup and cache Flutter to install packages and build.
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version-file: pubspec.yaml
+          cache: true
+
+      # Setup the iOS project with environment variables without signing (building and signing will happen in fastlane).
+      - name: Config the iOS build
+        run: flutter build ios --no-codesign --config-only --dart-define CLIENT_ID=$CLIENT_ID --dart-define SECRET=$SECRET
+
+      # Authenticate ASC API key, resolve signing via match (readonly), and build a
+      # fully signed archive without uploading to the App Store.
+      - name: Sign and build with fastlane (no publish)
+        run: cd ios && bundle exec fastlane release dry_run:true
diff --git a/.github/workflows/store-release.yml b/.github/workflows/store-release.yml
index f6c0f61c..53365a9e 100644
--- a/.github/workflows/store-release.yml
+++ b/.github/workflows/store-release.yml
@@ -13,10 +13,13 @@ env:
   BUNDLE_GEMFILE: ${{ github.workspace }}/android/Gemfile
   CLIENT_ID: ${{ secrets.CLIENT_ID }}
   SECRET: ${{ secrets.SECRET }}
+  LC_ALL: en_US.UTF-8
+  LANG: en_US.UTF-8
 jobs:
   android:
     name: Build and release Frosty on Android
     runs-on: ubuntu-latest
+    environment: release-android
     env:
       UPLOAD_KEYSTORE: ${{ secrets.UPLOAD_KEYSTORE }}
       STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
@@ -26,32 +29,33 @@ jobs:
 
     steps:
       - name: Checkout Frosty repo
-        uses: actions/checkout@v3
-      
+        uses: actions/checkout@v6
+
       # Install Ruby and install/cache dependencies with bundler in order to use fastlane.
       - name: Set up Ruby and Bundler
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.3
           bundler-cache: true
-      
+
       # Setup Java so that we can build the appbundle.
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
-          distribution: zulu
-          java-version: 11
-      
+          distribution: temurin
+          java-version: 21
+
       # Setup and cache Flutter to install packages and build.
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
+          flutter-version-file: pubspec.yaml
           cache: true
-      
+
       # Decode and create the upload-keystore.jks file, used for signing the app.
       - name: Decode and create upload-keystore.jks
         run: echo $UPLOAD_KEYSTORE | base64 --decode > $GITHUB_WORKSPACE/android/upload-keystore.jks
-      
+
       # Create the key.properties file, used for signing the app.
       - name: Create key.properties
         run: |
@@ -59,17 +63,18 @@ jobs:
           echo keyPassword=$KEY_PASSWORD >> $KEY_FILE_PATH
           echo keyAlias=upload >> $KEY_FILE_PATH
           echo storeFile=$GITHUB_WORKSPACE/android/upload-keystore.jks >> $KEY_FILE_PATH
-      
+
       # Build the Android app bundle (AAB) and pass the environment variables.
       - name: Build the Android AAB
         run: flutter build appbundle --dart-define CLIENT_ID=$CLIENT_ID --dart-define SECRET=$SECRET
-      
+
       # Deploy to the play store with fastlane.
       - name: Deploy with fastlane
         run: cd android && bundle exec fastlane deploy
   ios:
     name: Build and release Frosty on iOS
     runs-on: macos-latest
+    environment: release-ios
     env:
       APP_STORE_KEY_ID: ${{ secrets.APP_STORE_KEY_ID }}
       APP_STORE_ISSUER_ID: ${{ secrets.APP_STORE_ISSUER_ID }}
@@ -78,19 +83,25 @@ jobs:
       MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
     steps:
       - name: Checkout Frosty repo
-        uses: actions/checkout@v3
-        
+        uses: actions/checkout@v6
+
+      # Always pick the newest production Xcode on the runner.
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
       # Install Ruby and install/cache dependencies with bundler in order to use fastlane.
       - name: Set up Ruby and Bundler
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
+          ruby-version: 3.3
           bundler-cache: true
 
       # Setup and cache Flutter to install packages and build.
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
+          flutter-version-file: pubspec.yaml
           cache: true
 
       # Setup the iOS project with environment variables without signing (building and signing will happen in fastlane).
diff --git a/.gitignore b/.gitignore
index 8c6cab51..dfee3eb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,66 +1,73 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-migrate_working_dir/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.packages
-.pub-cache/
-.pub/
-/build/
-
-# Web related
-lib/generated_plugin_registrant.dart
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-
-# Folder containing random testing files
-random/
-
-# fastlane specific
-**/fastlane/report.xml
-
-# deliver temporary files
-**/fastlane/Preview.html
-
-# snapshot generated screenshots
-**/fastlane/screenshots
-**/fastlane/metadata/android/en-US/images
-
-# scan temporary files
-**/fastlane/test_output
-
-# potentially sensitive review information
-**/fastlane/metadata/review_information
\ No newline at end of file
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.build/
+.buildlog/
+.history
+.svn/
+.swiftpm/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+# .vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+/coverage/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
+# AGP 9 writes a problems report here even when the Gradle build dir is redirected
+/android/build/
+
+# Folder containing random testing files
+random/
+
+# fastlane specific
+**/fastlane/report.xml
+
+# deliver temporary files
+**/fastlane/Preview.html
+
+# snapshot generated screenshots
+**/fastlane/screenshots
+**/fastlane/metadata/android/en-US/images
+
+# scan temporary files
+**/fastlane/test_output
+
+# potentially sensitive review information
+**/fastlane/metadata/review_information
+
+# secrets
+.env
+
+# ai
+.claude/settings.local.json
\ No newline at end of file
diff --git a/.mcp.json b/.mcp.json
new file mode 100644
index 00000000..0127976e
--- /dev/null
+++ b/.mcp.json
@@ -0,0 +1,12 @@
+{
+  "mcpServers": {
+    "dart": {
+      "command": "dart",
+      "args": ["mcp-server", "--force-roots-fallback"]
+    },
+    "next-devtools": {
+      "command": "node",
+      "args": ["web/node_modules/next-devtools-mcp/dist/index.js"]
+    }
+  }
+}
diff --git a/.metadata b/.metadata
index 56bfc2c4..f991a3ab 100644
--- a/.metadata
+++ b/.metadata
@@ -1,10 +1,33 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: f4abaa0735eba4dfd8f33f73363911d63931fe03
+  revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
   channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
+      base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
+    - platform: android
+      create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
+      base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
+    - platform: ios
+      create_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
+      base_revision: 84a1e904f44f9b0e9c4510138010edcc653163f8
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..dad4cfce
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,25 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "frosty",
+      "request": "launch",
+      "type": "dart",
+      "args": ["--dart-define-from-file=.env"]
+    },
+    {
+      "name": "frosty (profile mode)",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "profile",
+      "args": ["--dart-define-from-file=.env"]
+    },
+    {
+      "name": "frosty (release mode)",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "release",
+      "args": ["--dart-define-from-file=.env"]
+    }
+  ]
+}
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 00000000..4495eb73
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,46 @@
+# AGENTS.md
+
+Flutter Twitch client for iOS and Android. MobX with `build_runner`. The landing page is `web/` (own `AGENTS.md`). Flutter is pinned in `pubspec.yaml` `environment.flutter` — bump that one field; CI reads it via `flutter-version-file`.
+
+## Commands
+
+```bash
+flutter pub get
+flutter run --dart-define-from-file=.env   # local; .env is gitignored
+flutter run --dart-define=CLIENT_ID=ID --dart-define=SECRET=SECRET
+flutter analyze
+flutter test
+flutter test test/path/to/file.dart
+dart run build_runner build   # after MobX / @JsonSerializable changes
+```
+
+`--delete-conflicting-outputs` is ignored as of build_runner 2.15. Don't add it.
+
+## Layout
+
+- `lib/apis/` — API clients extend `BaseApiClient`
+- `lib/models/` — data models; `@JsonSerializable` ones commit `.g.dart`
+- `lib/screens/{feature}/` — screens; feature stores in co-located `stores/`
+- `lib/stores/` — global stores only (`global_assets_store.dart`)
+- `test/` mirrors `lib/`; shared fixtures in `test/fixtures/`
+
+Don't add top-level store files or standalone API classes. Canonical MobX store: `lib/screens/settings/stores/auth_store.dart`. Extract state, reactions, and actions into stores when it keeps widgets on rendering.
+
+New or changed logic (stores, API clients, parsing, utils) ships with tests; extend existing tests when touching tested code. Pure UI or config may skip. HTTP: `http_mock_adapter` (`DioAdapter`) with full URLs. Otherwise `mocktail`.
+
+## Gotchas
+
+- Commit regenerated `.g.dart` files. Never edit them. CI fails the PR if they're stale.
+- `main.dart` secure-storage `deleteAll()` looks redundant; it handles Android/iOS storage surviving uninstall. Don't remove it.
+- `flutter_secure_storage` stays on v9 (v10 shipped in 5.0.0 and was reverted in 5.0.1 over an Android 14 startup freeze). That also holds `package_info_plus` v9 and `device_info_plus` v12 (win32). Don't jump them in a drive-by upgrade.
+- Git-pinned forks in `pubspec.yaml` (`extended_text_field`, `better_native_video_player`, `simple_pip_mode`) carry patches. Don't swap them back to pub.dev.
+- `android/gradle.properties`: keep `android.builtInKotlin=false` and `android.newDsl=false` so plugins that still apply KGP build on AGP 9.
+- `ios/Runner/AppDelegate.swift` is customized (`CookieExtractorPlugin` + `FlutterImplicitEngineDelegate`). Flutter will not auto-migrate UIScene; don't replace the delegate with the template.
+- `android/.../MainActivity.kt` extends `PipCallbackHelperActivityWrapper` and registers `CookieExtractorPlugin` by hand. Don't revert it to `FlutterActivity`.
+- Helix OAuth (`Bearer`) and the Twitch web GQL cookie are different tokens. Native playback uses the cookie; don't send the Helix token to GQL/Usher.
+- `syncedChatDelay` is runtime-only (`includeFromJson/toJson: false`). Don't persist it with the other settings.
+- Don't remove the `ALLOW_DEBUG_SIGNED_RELEASE` branch in `android/app/build.gradle.kts`. Real releases must still fail if `key.properties` is missing.
+
+## Releases
+
+When cutting a store or GitHub release, read `docs/release.md` and follow it. That playbook is repo-local, not a global skill. `assets/release-notes.md` keeps about three consecutive versions; drop from the oldest end, never skip.
diff --git a/DESIGN.md b/DESIGN.md
new file mode 100644
index 00000000..07a0fe02
--- /dev/null
+++ b/DESIGN.md
@@ -0,0 +1,61 @@
+# Frosty fork — Twitch ad blocking (DESIGN)
+
+Personal Forgejo fork of [tommyxchow/frosty](https://github.com/tommyxchow/frosty) that adds **TwitchAdSolutions (vaft)**-style live ad blocking.
+
+Canonical living plan: session `active-plan.md` for conversation `37b527bf-e540-4753-be1f-39906fe2ba28`. ADR: **ADR-026**.
+
+## Problem
+
+Upstream Frosty plays Twitch HLS (native) or `player.twitch.tv` (WebView). Twitch may stitch ad pods into the media playlist (`stitched` / `EXT-X-DATERANGE`). Upstream only **detects** native ad breaks (to avoid bogus latency recovery); it does **not** block ads. Turbo/sub `hide_ads` via linked web session is separate and not a client blocker.
+
+## Approach (vaft-equivalent)
+
+Browser vaft hooks `Worker`/`fetch` and rewrites m3u8. Frosty’s native player cannot do that from Dart (`loadUrl` + headers only).
+
+| Layer | Behavior |
+| --- | --- |
+| Primary token | GQL `PlaybackAccessToken` with `playerType=popout` (vaft `ForceAccessTokenPlayerType`) when Settings `blockTwitchAds` is on |
+| Ad break | Native `adBreakStream` → probe backup types `embed` → `popout` → `autoplay`; accept first Usher multivariant whose sampled media playlist lacks `stitched`; `loadUrl` that URL |
+| Ad end | Restore primary popout Usher URL |
+| WebView | Best-effort inject of vendored `assets/js/vaft.user.js` (not true document-start on Android) |
+| UI | Settings toggle (default on; enabling forces native player); overlay “Blocking ads” |
+
+## Key code
+
+- `lib/apis/twitch_ad_solutions.dart` — constants + `TwitchAdFreePlayback`
+- `lib/apis/twitch_gql_api.dart` — `playerType` / `platform`, `fetchPlaylistText`
+- `lib/screens/channel/video/native_video_store.dart` — load + swap
+- `lib/screens/channel/video/video_store.dart` — WebView inject
+- `lib/screens/settings/stores/settings_store.dart` — `blockTwitchAds`
+- `assets/js/vaft.user.js` — upstream TwitchAdSolutions script
+
+## Non-goals (v1)
+
+- Upstream PR
+- Full Worker prototype cleaning
+- Third-party proxies
+- HLS segment stripping inside `better_native_video_player` (unless smoke tests demand it)
+
+## Tags + viewer sort (v5.2.2+)
+
+Helix cannot filter by freeform tags or sort ascending. GQL covers both:
+
+- Search: `SearchFreeformTags` → tap → `TagStreams` (`streams` + `freeformTags`)
+- Sort: Top (asc), category (`game.streams`), tag — `VIEWER_COUNT` / `VIEWER_COUNT_ASC` via `StreamSortButton`
+
+Key code: `lib/apis/twitch_gql_api.dart`, `lib/screens/home/search/`, `lib/widgets/stream_sort_button.dart`, `ListStore` / `ListType.tag`.
+
+## Stream languages (v5.2.4+)
+
+Settings → General → Stream languages (multi-select chips). Default `de`. Applied to Top, category, and tag lists.
+
+- Helix `language=` when one language; multi-language / tags via Helix over-fetch + client filter
+- Viewer sort is persisted (`streamViewerSort`)
+- **Tag lists (asc + desc):** GQL `streams` with `freeformTags` + `sort` + cursor. Page-2+ uses Client-Integrity (same mint/retry as follow via `UserStore.runWithGqlIntegrity`). Helix + client tag filter only if integrity fails / no web session.
+- **Follow / integrity:** Dio `POST /integrity` is almost always `is_bad_bot`. Follow retries via `IntegrityWebViewDialog` (capture `Client-Integrity` + `X-Device-Id` from Twitch's own WebView GQL traffic), then `UserStore.applyWebIntegrity`.
+- **Top / category most viewers (desc):** Helix directory order (paginates)
+- **Top / category fewest (asc):** GQL `VIEWER_COUNT_ASC` with the same integrity pagination; Helix fill + client re-sort as fallback
+
+## Build
+
+Flutter **3.47.0** (pinned in `pubspec.yaml`). Local SDK: `/home/yuna/.local/flutter-3.47.0`.
diff --git a/README.md b/README.md
index 09e1e8ad..834bbc44 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,6 @@
-<p align="center">
-  <a align="center" href="https://frostyapp.io">
-    <img
-      src="https://user-images.githubusercontent.com/54859075/185783257-228d5c49-015e-4ee6-bf78-41f898cf770a.svg"
-      width="180px"
-      alt="The Frosty rounded logo."
-    />
-    <h1 align="center">Frosty</h1>
-  </a>
-</p>
+![Showcase of the Frosty app with screenshots in a masonry grid](https://github.com/tommyxchow/frosty/assets/54859075/09178dcc-2fd2-4618-8076-502719159424)
 
-<p align="center">
-  A mobile
-  <a href="https://www.twitch.tv/">Twitch</a>
-  client for iOS and Android with
-  <a href="https://7tv.app/">7TV</a>, <a href="https://betterttv.com/">BTTV</a>,
-  and
-  <a href="https://www.frankerfacez.com/">FFZ</a>
-  support. Built with
-  <a href="https://flutter.dev/">Flutter</a>.
-</p>
-
-<p align="center">
+<p>
   <a href="https://github.com/tommyxchow/frosty/actions/workflows/ci.yml">
     <img
       alt="Badge showing the CI status."
@@ -53,7 +33,9 @@
   </a>
 </p>
 
-<p align="center">
+## Download
+
+<p>
   <a href="https://apps.apple.com/us/app/frosty-for-twitch/id1603987585">
     <img
       title="Get it on iOS (Apple App Store)"
@@ -72,41 +54,9 @@
   </a>
 </p>
 
-<p align="center">
-  <a href="https://www.buymeacoffee.com/tommychow">
-    <img
-      title="Donate"
-      alt="Buy Me A Coffee badge."
-      src="https://user-images.githubusercontent.com/54859075/160051848-2e581476-a6c6-4de6-9af7-773d96632de1.svg"
-      width="200px"
-    />
-  </a>
-</p>
+## Why
 
-<p align="center">
-  <img
-    title="Followed streams section"
-    alt="iOS screenshot of the Followed Streams section."
-    src="https://user-images.githubusercontent.com/54859075/185780262-a3ba5ecf-a710-4511-a583-94e0d0ce0156.png"
-    width="32%"
-  />
-  <img
-    title="Channel (video/chat) view"
-    alt="iOS screenshot of xQc's channel with the stream and chat."
-    src="https://user-images.githubusercontent.com/54859075/185780260-0f7f3247-2cb5-431d-8714-e88e9fcb72f5.png"
-    width="32%"
-  />
-  <img
-    title="Search section"
-    alt='iOS screenshot of the search section with results from the query "pokelaw".'
-    src="https://user-images.githubusercontent.com/54859075/185780261-4301f180-04dc-4328-8a4c-4f035a5ec796.png"
-    width="32%"
-  />
-</p>
-
-## Motivation
-
-The official Twitch mobile app doesn't support emotes from [7TV](https://chrome.google.com/webstore/detail/7tv/ammjkodgmmoknidbanneddgankgfejfh), [BetterTTV (BTTV)](https://chrome.google.com/webstore/detail/betterttv/ajopnjidmegmdimjlfnijceegpefgped), and [FrankerFaceZ (FFZ)](https://chrome.google.com/webstore/detail/frankerfacez/fadndhdgpmmaapbmfcknlfgcflmmmieb) — third-party services and extensions for Twitch used by millions of viewers and many top channels. This results in a poor mobile chat experience since only emote codes render rather than their image or GIF counterpart.
+The official Twitch mobile app doesn't support emotes from [7TV](https://chrome.google.com/webstore/detail/7tv/ammjkodgmmoknidbanneddgankgfejfh), [BetterTTV (BTTV)](https://chrome.google.com/webstore/detail/betterttv/ajopnjidmegmdimjlfnijceegpefgped), and [FrankerFaceZ (FFZ)](https://chrome.google.com/webstore/detail/frankerfacez/fadndhdgpmmaapbmfcknlfgcflmmmieb) — third-party extensions for Twitch used by millions. As a result, only emote text names are rendered rather than their actual image or GIF, making the chat unreadable in many channels.
 
 ## Features
 
@@ -129,45 +79,35 @@ For a more detailed overview, visit [frostyapp.io](https://www.frostyapp.io/).
 
 ## Development setup
 
-1. Go to the [Twitch dev console](https://dev.twitch.tv/login) and register a new application to retrieve a **Client ID** and **Client Secret**.
+1. [Install Flutter](https://docs.flutter.dev/get-started/install).
 
-2. Clone the repo to a directory (e.g., `git clone https://github.com/tommyxchow/frosty.git`).
+2. Clone this repo (e.g., `git clone https://github.com/tommyxchow/frosty.git`).
 
-3. Navigate to `lib/constants.dart` and replace the `clientId` and `secret` constants with your **client ID** and **client secret** from step 1 (if using VSCode, use `--dart-define` to [define them as environment variables](https://dartcode.org/docs/using-dart-define-in-flutter/)).
+3. Go to the [Twitch dev console](https://dev.twitch.tv/login) and register a new application to retrieve a **Client ID** and **Client Secret**.
 
-4. Run `flutter pub get` to fetch all the dependencies.
+4. Copy `.env.example` to `.env` and fill in your credentials:
 
-5. Choose an emulator or device and run the app!
+   ```bash
+   cp .env.example .env
+   ```
 
-> **Note**
->
+5. Run `flutter pub get` to fetch all the dependencies.
+
+6. Choose an emulator or device and run the app! The included VS Code launch configurations will automatically read your `.env` file.
+
+7. (Optional) Run `dart run scripts/get_twitch_token.dart` to quickly get a user auth token. Long-press the **Anonymous** account tile in the app to log in.
+
+> [!IMPORTANT]
 > Frosty uses [MobX](https://mobx.netlify.app/) for state management. Please refer to the documentation about code generation, otherwise your changes within MobX stores may not be applied.
 
-> **Warning**
->
-> I built Frosty while learning Flutter, so some of the code may not be optimal. I'm working on refactoring, documenting, and cleaning up various parts as much as I can.
-
-## Feature requests and issues
-
-If you have a feature request, found a bug, or have a general issue, you can submit it [here](https://github.com/tommyxchow/frosty/issues/new/choose) on the issues tab. Doing so makes it easier for me to keep track of them and makes it publicly visible for others to review.
-
-> **Note**
->
-> I work on Frosty in my free time and take occasional breaks, so I may not respond immediately.
-
 ## Donate
 
-Downloading Frosty and leaving a review or starring this repository is more than enough to show support.
+If you appreciate my work and would like to donate/tip, you can through:
 
-If you're feeling generous and would like to support me with a donation, you can do so through the following:
-
-- [Buy Me a Coffee](https://www.buymeacoffee.com/tommychow)
 - [GitHub Sponsors](https://github.com/sponsors/tommyxchow)
-- [PayPal](https://www.paypal.com/donate/?business=NF33JDG6KBU6W)
-- BTC: bc1qzpth6gc3vum764lat6a8ul7cmekwles58070a6
-- ETH: 0x317b5930fc2898884f711016dCae79d24910888E
+- [Buy Me a Coffee](https://www.buymeacoffee.com/tommychow)
 
-If you decide to support me monetarily, it is extremely appreciated and further motivates me to continue improving and maintaining Frosty ❤️.
+Otherwise, downloading Frosty, leaving a review, or starring this repository is more than enough to show support. Thank you!
 
 ## License
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index e06ccaf3..3b60af70 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,39 +1,46 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
-
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
-include: package:flutter_lints/flutter.yaml
-
-analyzer:
-  exclude: [lib/generated_plugin_registrant.dart]
-
-linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at
-  # https://dart-lang.github.io/linter/lints/index.html.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
-  rules:
-    - directives_ordering
-    - prefer_single_quotes
-    - always_use_package_imports
-    - avoid_void_async
-    - prefer_final_locals
-    - prefer_final_in_for_each
-    - avoid_redundant_argument_values
-    - unnecessary_parenthesis
-    - always_declare_return_types
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+analyzer:
+  exclude:
+    - lib/**.g.dart
+    - .dart_tool/**
+    - build/**
+    - ios/**
+    - android/**
+    - web/**
+    - windows/**
+    - macos/**
+    - linux/**
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/lints.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    - directives_ordering
+    - prefer_single_quotes
+    - always_use_package_imports
+    - avoid_void_async
+    - prefer_final_locals
+    - prefer_final_in_for_each
+    - avoid_redundant_argument_values
+    - unnecessary_parenthesis
+    - always_declare_return_types
+    - require_trailing_commas
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/android/.gitignore b/android/.gitignore
index 6f568019..be3943c9 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -5,9 +5,10 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+.cxx/
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks
diff --git a/android/Gemfile.lock b/android/Gemfile.lock
index 7cbb618c..41b69f5c 100644
--- a/android/Gemfile.lock
+++ b/android/Gemfile.lock
@@ -1,43 +1,49 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
-      rexml
-    addressable (2.8.4)
-      public_suffix (>= 2.0.2, < 6.0)
-    artifactory (3.0.15)
+    CFPropertyList (3.0.8)
+    abbrev (0.1.2)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.757.0)
-    aws-sdk-core (3.171.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1260.0)
+    aws-sdk-core (3.252.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.63.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.121.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+      logger
+    aws-sdk-kms (1.129.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.225.1)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.5)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.99.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.5)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -49,32 +55,36 @@ GEM
       faraday-rack (~> 1.0)
       faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
+      http-cookie (>= 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday-retry (1.0.4)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.212.2)
-      CFPropertyList (>= 2.3, < 4.0.0)
+    fastimage (2.4.1)
+    fastlane (2.234.0)
+      CFPropertyList (>= 2.3, < 5.0.0)
+      abbrev (~> 0.1)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
+      aws-sdk-s3 (~> 1.197)
       babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
+      base64 (~> 0.2)
+      benchmark (>= 0.1.0)
+      bundler (>= 1.17.3, < 5.0.0)
+      colored (~> 1.2)
       commander (~> 4.6)
+      csv (~> 3.3)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -82,136 +92,147 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.1.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, <= 2.1.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
+      logger (>= 1.6, < 2.0)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      nkf (~> 0.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.1.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.41.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-androidpublisher_v3 (0.102.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-iamcredentials_v1 (0.27.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.17.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.63.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.9.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-env (2.1.1)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.6.0)
+    google-cloud-storage (1.61.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
       google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.11.2)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.0)
-    memoist (0.16.2)
-    mini_magick (4.12.0)
-    mini_mime (1.1.2)
-    multi_json (1.15.0)
-    multipart-post (2.0.0)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
-    optparse (0.1.1)
+    json (2.19.9)
+    jwt (2.10.3)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.21.1)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
+    nkf (0.3.0)
+    optparse (0.8.1)
     os (1.1.4)
-    plist (3.7.0)
-    public_suffix (5.0.1)
-    rake (13.0.6)
+    ostruct (0.6.3)
+    plist (3.7.2)
+    public_suffix (7.0.5)
+    rake (13.4.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.2.5)
-    rouge (2.0.7)
+    retriable (3.8.0)
+    rexml (3.4.4)
+    rouge (3.28.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.17.0)
+    rubyzip (2.4.1)
+    security (0.1.5)
+    signet (0.22.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
+      jwt (>= 1.5, < 4.0)
     simctl (1.6.10)
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   arm64-darwin-21
   universal-darwin-22
+  universal-darwin-23
+  universal-darwin-24
   x64-unknown
+  x86_64-darwin-20
   x86_64-darwin-21
   x86_64-linux
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
deleted file mode 100644
index 384f0f94..00000000
--- a/android/app/build.gradle
+++ /dev/null
@@ -1,84 +0,0 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-// START: FlutterFire Configuration
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.google.firebase.firebase-perf'
-apply plugin: 'com.google.firebase.crashlytics'
-// END: FlutterFire Configuration
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
-android {
-    compileSdkVersion 33
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-
-    defaultConfig {
-        applicationId "com.tommychow.frosty"
-        minSdkVersion 26
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-    }
-
-    signingConfigs {
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword keystoreProperties['storePassword']
-        }
-    }
-    buildTypes {
-        release {
-            signingConfig signingConfigs.release
-        }
-    }
-}
-
-flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
new file mode 100644
index 00000000..998334f3
--- /dev/null
+++ b/android/app/build.gradle.kts
@@ -0,0 +1,70 @@
+import java.io.FileInputStream
+import java.util.Properties
+
+plugins {
+    id("com.android.application")
+    id("com.google.gms.google-services")
+    id("com.google.firebase.firebase-perf")
+    id("com.google.firebase.crashlytics")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
+android {
+    namespace = "com.tommychow.frosty"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    defaultConfig {
+        applicationId = "com.tommychow.frosty"
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"] as String?
+            keyPassword = keystoreProperties["keyPassword"] as String?
+            storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+            storePassword = keystoreProperties["storePassword"] as String?
+        }
+    }
+
+    buildTypes {
+        release {
+            // Use the real upload key when key.properties is present (release
+            // workflows create it from secrets). Allow debug signing only when a CI
+            // compile-only check explicitly opts in via ALLOW_DEBUG_SIGNED_RELEASE;
+            // otherwise fail loudly so a real release can never be silently
+            // debug-signed if the keystore step is ever missing.
+            signingConfig = when {
+                keystorePropertiesFile.exists() -> signingConfigs.getByName("release")
+                System.getenv("ALLOW_DEBUG_SIGNED_RELEASE") != null -> signingConfigs.getByName("debug")
+                else -> error("key.properties missing — set ALLOW_DEBUG_SIGNED_RELEASE=1 for compile-only builds")
+            }
+        }
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
+flutter {
+    source = "../.."
+}
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index a0519702..399f6981 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tommychow.frosty">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b63d5c93..4beaec33 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,46 +1,67 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tommychow.frosty">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:scheme="https" />
-        </intent>
-    </queries>
-
-    <application
-        android:label="Frosty"
-        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
-        android:allowBackup="false">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
-            android:supportsPictureInPicture="true"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
-    </application>
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
+    </queries>
+
+    <application
+        android:label="Frosty"
+        android:name="${applicationName}"
+        android:icon="@mipmap/ic_launcher"
+        android:allowBackup="false"
+        android:dataExtractionRules="@xml/data_extraction_rules">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:taskAffinity=""
+            android:theme="@style/LaunchTheme"
+            android:supportsPictureInPicture="true"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
+                 the Android process has started. This theme is visible to the user
+                 while the Flutter UI initializes. After that, this theme continues
+                 to determine the Window background behind the Flutter UI. -->
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https"/>
+                <data android:host="twitch.tv" />
+                <data android:host="www.twitch.tv" />
+                <data android:host="m.twitch.tv" />
+            </intent-filter>
+        </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+    </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+</manifest>
diff --git a/android/app/src/main/kotlin/com/tommychow/frosty/CookieExtractorPlugin.kt b/android/app/src/main/kotlin/com/tommychow/frosty/CookieExtractorPlugin.kt
new file mode 100644
index 00000000..055101d0
--- /dev/null
+++ b/android/app/src/main/kotlin/com/tommychow/frosty/CookieExtractorPlugin.kt
@@ -0,0 +1,32 @@
+package com.tommychow.frosty
+
+import android.webkit.CookieManager
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+
+class CookieExtractorPlugin : FlutterPlugin, MethodChannel.MethodCallHandler {
+    private lateinit var channel: MethodChannel
+
+    override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        channel = MethodChannel(binding.binaryMessenger, "frosty/cookie_extractor")
+        channel.setMethodCallHandler(this)
+    }
+
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        if (call.method == "extractTwitchAuthToken") {
+            val cookies = CookieManager.getInstance().getCookie("https://twitch.tv")
+            val authToken = cookies?.split(";")
+                ?.map { it.trim() }
+                ?.firstOrNull { it.startsWith("auth-token=") }
+                ?.substringAfter("auth-token=")
+            result.success(authToken)
+        } else {
+            result.notImplemented()
+        }
+    }
+
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        channel.setMethodCallHandler(null)
+    }
+}
diff --git a/android/app/src/main/kotlin/com/tommychow/frosty/MainActivity.kt b/android/app/src/main/kotlin/com/tommychow/frosty/MainActivity.kt
index a7791025..30e59dc7 100644
--- a/android/app/src/main/kotlin/com/tommychow/frosty/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/tommychow/frosty/MainActivity.kt
@@ -1,6 +1,11 @@
 package com.tommychow.frosty
 
 import cl.puntito.simple_pip_mode.PipCallbackHelperActivityWrapper
+import io.flutter.embedding.engine.FlutterEngine
 
 class MainActivity: PipCallbackHelperActivityWrapper() {
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        flutterEngine.plugins.add(CookieExtractorPlugin())
+    }
 }
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
index 78edba3b..7dd78fca 100644
Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
index 65e45c48..0c07f1fd 100644
Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
index b45507c1..83084f78 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
index d56cc8fd..604f87bf 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
index a9464b29..75578815 100644
--- a/android/app/src/main/res/values-night-v31/styles.xml
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -2,9 +2,10 @@
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowSplashScreenBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -15,4 +16,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 174b2c51..a26965ce 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -3,10 +3,12 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -17,4 +19,4 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
index f5fdb6b7..cd4a9d67 100644
--- a/android/app/src/main/res/values-v31/styles.xml
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -4,6 +4,7 @@
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 0d151866..ac038c9e 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -3,10 +3,11 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/android/app/src/main/res/xml/data_extraction_rules.xml b/android/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 00000000..de17d56c
--- /dev/null
+++ b/android/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+        <exclude domain="root" path="."/>
+    </cloud-backup>
+    <device-transfer>
+        <exclude domain="root" path="."/>
+    </device-transfer>
+</data-extraction-rules>
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index a0519702..399f6981 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tommychow.frosty">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/android/build.gradle b/android/build.gradle
deleted file mode 100644
index 96f0e2ca..00000000
--- a/android/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-buildscript {
-    ext.kotlin_version = '1.6.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
-        // START: FlutterFire Configuration
-        classpath 'com.google.gms:google-services:4.3.10'
-        classpath 'com.google.firebase:perf-plugin:1.4.1'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
-        // END: FlutterFire Configuration
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.buildDir = '../build'
-subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
-    project.evaluationDependsOn(':app')
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
new file mode 100644
index 00000000..b477a6e8
--- /dev/null
+++ b/android/build.gradle.kts
@@ -0,0 +1,37 @@
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory =
+    rootProject.layout.buildDirectory
+        .dir("../../build")
+        .get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+// AGP 9 requires each library to compile against at least the compileSdk of
+// its dependencies. Several Flutter plugins still pin compileSdk 33/34.
+// finalizeDsl runs after the plugin's android {} block. Does not change minSdk.
+subprojects {
+    pluginManager.withPlugin("com.android.library") {
+        extensions.configure<LibraryAndroidComponentsExtension>("androidComponents") {
+            finalizeDsl { it.compileSdk = 36 }
+        }
+    }
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}
diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile
index 0390c22d..19e69c65 100644
--- a/android/fastlane/Fastfile
+++ b/android/fastlane/Fastfile
@@ -17,11 +17,14 @@ default_platform(:android)
 
 platform :android do
   desc "Deploy a new version to the Google Play"
-  lane :deploy do
-    # Upload to the play store ussing the provided credentials and AAB from flutter build.
+  lane :deploy do |options|
+    # Upload to the Play Store using the provided credentials and AAB from flutter build.
+    # With dry_run:true (release dry-run workflow), validate_only authenticates and
+    # validates the AAB against Google Play without committing the release.
     upload_to_play_store(
       json_key_data: Base64.decode64(ENV["PLAY_STORE_CREDENTIALS"]),
-      aab: "../build/app/outputs/bundle/release/app-release.aab"
+      aab: "../build/app/outputs/bundle/release/app-release.aab",
+      validate_only: options[:dry_run] || false
     )
   end
 end
diff --git a/android/fastlane/metadata/android/en-US/changelogs/38.txt b/android/fastlane/metadata/android/en-US/changelogs/38.txt
new file mode 100644
index 00000000..0d4079f9
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/38.txt
@@ -0,0 +1 @@
+General improvements and bug fixes.
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/39.txt b/android/fastlane/metadata/android/en-US/changelogs/39.txt
new file mode 100644
index 00000000..d8fe624c
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/39.txt
@@ -0,0 +1,2 @@
+Bug Fixes
+• Fixed emote/mention autocomplete not updating
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/40.txt b/android/fastlane/metadata/android/en-US/changelogs/40.txt
new file mode 100644
index 00000000..8723ecf9
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/40.txt
@@ -0,0 +1,2 @@
+Bug Fixes
+• Fixed audio playing in chat-only mode
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/41.txt b/android/fastlane/metadata/android/en-US/changelogs/41.txt
new file mode 100644
index 00000000..d744e43f
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/41.txt
@@ -0,0 +1,3 @@
+This major update contains Material 3/You redesigns, UI/UX improvements, reply threads, bug fixes, and more!
+
+See the full release notes on GitHub: https://github.com/tommyxchow/frosty/releases
diff --git a/android/fastlane/metadata/android/en-US/changelogs/42.txt b/android/fastlane/metadata/android/en-US/changelogs/42.txt
new file mode 100644
index 00000000..b3f420ba
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/42.txt
@@ -0,0 +1,2 @@
+Bug Fixes
+• Fixed missing 7TV emotes
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/43.txt b/android/fastlane/metadata/android/en-US/changelogs/43.txt
new file mode 100644
index 00000000..5147e758
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/43.txt
@@ -0,0 +1,3 @@
+Bug Fixes
+• Fixed 7TV emotes not using custom names
+• Fixed 7TV zero-width emotes not working
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/44.txt b/android/fastlane/metadata/android/en-US/changelogs/44.txt
new file mode 100644
index 00000000..1aab3634
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/44.txt
@@ -0,0 +1,3 @@
+Bug Fixes
+• Fixed emote "Copy name" button copying the full name with parentheses
+• Fixed multiline message clipping in chat text field
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/45.txt b/android/fastlane/metadata/android/en-US/changelogs/45.txt
new file mode 100644
index 00000000..9737501d
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/45.txt
@@ -0,0 +1,5 @@
+New Features
+• Added support for replying to specific messages in chat (by @Artiu on GitHub)
+
+Bug Fixes
+• Fixed recent emotes not clearing
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/46.txt b/android/fastlane/metadata/android/en-US/changelogs/46.txt
new file mode 100644
index 00000000..5b288f4d
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/46.txt
@@ -0,0 +1,3 @@
+This update contains support for stream quality options (by @Artiu on GitHub), support for live 7TV emote set updates in chat, updated designs for chat message alerts and highlights, and more improvements and bug fixes.
+
+See the full release notes on GitHub: https://github.com/tommyxchow/frosty/releases
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/47.txt b/android/fastlane/metadata/android/en-US/changelogs/47.txt
new file mode 100644
index 00000000..7d2b2ef7
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/47.txt
@@ -0,0 +1,3 @@
+Bug Fixes
+• Fixed own display name not showing in sent chat messages
+• Fixed rare case where 7TV emotes don't show in chat
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/48.txt b/android/fastlane/metadata/android/en-US/changelogs/48.txt
new file mode 100644
index 00000000..0c61db05
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/48.txt
@@ -0,0 +1,10 @@
+New Features
+• Added the ability to tap on user mentions in chat (by @Artiu on GitHub)
+• Added stream latency details to the custom overlay in landscape mode (by @Artiu on GitHub)
+
+Improvements
+• Improved how the default Twitch overlay is hidden when the custom overlay is enabled (by @Artiu on GitHub)
+• Links in chat are now also underlined
+
+Bug Fixes
+• Fixed 7TV emote set updates not respecting the chat delay setting
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/49.txt b/android/fastlane/metadata/android/en-US/changelogs/49.txt
new file mode 100644
index 00000000..2b188d59
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/49.txt
@@ -0,0 +1,4 @@
+Bug Fixes
+• Fixed stream quality options not showing (by @Shingyx on GitHub)
+• Fixed stream latency not showing (by @Shingyx on GitHub)
+• Fixed stream latency icon color on light mode
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/50.txt b/android/fastlane/metadata/android/en-US/changelogs/50.txt
new file mode 100644
index 00000000..5f520a01
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/50.txt
@@ -0,0 +1 @@
+This update contains a variety of new features including a quick toggle to enter or exit chat-only mode, the ability to zoom stream thumbnails and emotes or badges, an option to show historical recent messages in chat, and other improvements and bug fixes.
diff --git a/android/fastlane/metadata/android/en-US/changelogs/51.txt b/android/fastlane/metadata/android/en-US/changelogs/51.txt
new file mode 100644
index 00000000..13b41b31
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/51.txt
@@ -0,0 +1,9 @@
+New Features
+• Added an option to un-darken historical recent messages in chat
+
+Improvements
+• Moved exact matches of searched categories to the top (by @Shingyx on GitHub)
+
+Bug Fixes
+• Fixed extraneous notices when toggling chat-only mode
+• Fixed cookie banner blocking login and added backup workaround instructions in the login screen toolbar (instructions by @UmmonTeal on GitHub)
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/52.txt b/android/fastlane/metadata/android/en-US/changelogs/52.txt
new file mode 100644
index 00000000..cddfc2c5
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/52.txt
@@ -0,0 +1,10 @@
+New Features
+• Added a theme accent color picker in general settings
+• Added the ability to pin streams in the "Following" tab by long-pressing
+• Added a "My channel" shortcut in profile settings
+
+Improvements
+• Refreshed and updated the overall design to utilize the accent color
+
+Bug Fixes
+• Fixed certain historical recent messages not rendering properly
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/53.txt b/android/fastlane/metadata/android/en-US/changelogs/53.txt
new file mode 100644
index 00000000..bab727c4
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/53.txt
@@ -0,0 +1,10 @@
+New Features
+- Added the ability to mute keywords from chat in chat settings (by @zeykafx on GitHub)
+
+Improvements
+- Improved initial playback stability (by @Shingyx on GitHub)
+- Content warning is now accepted automatically (by @joaopjrn on GitHub)
+- Updated Inter font to v4.1
+
+Bug Fixes
+- Fixed "Pinned" header typo
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/54.txt b/android/fastlane/metadata/android/en-US/changelogs/54.txt
new file mode 100644
index 00000000..41b4cd10
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/54.txt
@@ -0,0 +1,2 @@
+Bug Fixes
+- Further improve initial playback stability (by @Shingyx on GitHub)
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/55.txt b/android/fastlane/metadata/android/en-US/changelogs/55.txt
new file mode 100644
index 00000000..b7cc90ed
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/55.txt
@@ -0,0 +1,8 @@
+New Features
+- Added initial support for shared chat sessions
+
+Improvements
+- Changed historical recent message indicator to chat message badge icon
+
+Bug Fixes
+- Fixed video causing random crashes on some devices
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/56.txt b/android/fastlane/metadata/android/en-US/changelogs/56.txt
new file mode 100644
index 00000000..b03b2faa
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/56.txt
@@ -0,0 +1,6 @@
+New Features
+- Added new "Use enhanced rendering" option in video settings
+
+Bug Fixes
+- Fixed incorrect badge order and spacing for FFZ bots
+- Fixed missing emotes on channels that don't have 7TV enabled
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/changelogs/default.txt b/android/fastlane/metadata/android/en-US/changelogs/default.txt
new file mode 100644
index 00000000..37b5ab1f
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -0,0 +1 @@
+See full release notes at https://github.com/tommyxchow/frosty/releases
\ No newline at end of file
diff --git a/android/fastlane/metadata/android/en-US/short_description.txt b/android/fastlane/metadata/android/en-US/short_description.txt
index e633a6b1..cf35ecf1 100644
--- a/android/fastlane/metadata/android/en-US/short_description.txt
+++ b/android/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Watch and chat on Twitch with your favorite emotes from 7TV, BTTV, and FFZ!
\ No newline at end of file
+Watch live streams and see community emotes in chat.
diff --git a/android/fastlane/metadata/android/en-US/title.txt b/android/fastlane/metadata/android/en-US/title.txt
index 902e9c36..445c1415 100644
--- a/android/fastlane/metadata/android/en-US/title.txt
+++ b/android/fastlane/metadata/android/en-US/title.txt
@@ -1 +1 @@
-Frosty for Twitch
\ No newline at end of file
+Frosty
diff --git a/android/gradle.properties b/android/gradle.properties
index 94adc3a3..6fdfce35 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,8 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
-android.enableJetifier=true
+org.gradle.caching=true
+org.gradle.parallel=true
+# This builtInKotlin flag was added automatically by Flutter migrator
+android.builtInKotlin=false
+# This newDsl flag was added automatically by Flutter migrator
+android.newDsl=false
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index cc5527d7..bcef617e 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
deleted file mode 100644
index 44e62bcf..00000000
--- a/android/settings.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-include ':app'
-
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
-
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
new file mode 100644
index 00000000..f68c56f0
--- /dev/null
+++ b/android/settings.gradle.kts
@@ -0,0 +1,28 @@
+pluginManagement {
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "9.1.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.4.0" apply false
+    id("com.google.gms.google-services") version "4.4.4" apply false
+    id("com.google.firebase.firebase-perf") version "2.0.2" apply false
+    id("com.google.firebase.crashlytics") version "3.0.6" apply false
+}
+
+include(":app")
diff --git a/assets/fonts/Inter-Black.ttf b/assets/fonts/Inter-Black.ttf
index 37742709..69762d79 100644
Binary files a/assets/fonts/Inter-Black.ttf and b/assets/fonts/Inter-Black.ttf differ
diff --git a/assets/fonts/Inter-BlackItalic.ttf b/assets/fonts/Inter-BlackItalic.ttf
new file mode 100644
index 00000000..c15c3ba1
Binary files /dev/null and b/assets/fonts/Inter-BlackItalic.ttf differ
diff --git a/assets/fonts/Inter-Bold.ttf b/assets/fonts/Inter-Bold.ttf
index 76a215cc..9fb9b751 100644
Binary files a/assets/fonts/Inter-Bold.ttf and b/assets/fonts/Inter-Bold.ttf differ
diff --git a/assets/fonts/Inter-BoldItalic.ttf b/assets/fonts/Inter-BoldItalic.ttf
new file mode 100644
index 00000000..8d050001
Binary files /dev/null and b/assets/fonts/Inter-BoldItalic.ttf differ
diff --git a/assets/fonts/Inter-ExtraBold.ttf b/assets/fonts/Inter-ExtraBold.ttf
index 7ae3a4e8..0fdf1e05 100644
Binary files a/assets/fonts/Inter-ExtraBold.ttf and b/assets/fonts/Inter-ExtraBold.ttf differ
diff --git a/assets/fonts/Inter-ExtraBoldItalic.ttf b/assets/fonts/Inter-ExtraBoldItalic.ttf
new file mode 100644
index 00000000..b1e2eae3
Binary files /dev/null and b/assets/fonts/Inter-ExtraBoldItalic.ttf differ
diff --git a/assets/fonts/Inter-ExtraLight.ttf b/assets/fonts/Inter-ExtraLight.ttf
index 131929e5..a758a018 100644
Binary files a/assets/fonts/Inter-ExtraLight.ttf and b/assets/fonts/Inter-ExtraLight.ttf differ
diff --git a/assets/fonts/Inter-ExtraLightItalic.ttf b/assets/fonts/Inter-ExtraLightItalic.ttf
new file mode 100644
index 00000000..647ea6ae
Binary files /dev/null and b/assets/fonts/Inter-ExtraLightItalic.ttf differ
diff --git a/assets/fonts/Inter-Italic.ttf b/assets/fonts/Inter-Italic.ttf
new file mode 100644
index 00000000..e7ed211d
Binary files /dev/null and b/assets/fonts/Inter-Italic.ttf differ
diff --git a/assets/fonts/Inter-Light.ttf b/assets/fonts/Inter-Light.ttf
index b9c460dc..2e073931 100644
Binary files a/assets/fonts/Inter-Light.ttf and b/assets/fonts/Inter-Light.ttf differ
diff --git a/assets/fonts/Inter-LightItalic.ttf b/assets/fonts/Inter-LightItalic.ttf
new file mode 100644
index 00000000..e711ef8c
Binary files /dev/null and b/assets/fonts/Inter-LightItalic.ttf differ
diff --git a/assets/fonts/Inter-Medium.ttf b/assets/fonts/Inter-Medium.ttf
index 06ae9e9c..458cd060 100644
Binary files a/assets/fonts/Inter-Medium.ttf and b/assets/fonts/Inter-Medium.ttf differ
diff --git a/assets/fonts/Inter-MediumItalic.ttf b/assets/fonts/Inter-MediumItalic.ttf
new file mode 100644
index 00000000..22b898df
Binary files /dev/null and b/assets/fonts/Inter-MediumItalic.ttf differ
diff --git a/assets/fonts/Inter-Regular.ttf b/assets/fonts/Inter-Regular.ttf
index cc73944a..b7aaca8d 100644
Binary files a/assets/fonts/Inter-Regular.ttf and b/assets/fonts/Inter-Regular.ttf differ
diff --git a/assets/fonts/Inter-SemiBold.ttf b/assets/fonts/Inter-SemiBold.ttf
index 278ceaa3..47f8ab1d 100644
Binary files a/assets/fonts/Inter-SemiBold.ttf and b/assets/fonts/Inter-SemiBold.ttf differ
diff --git a/assets/fonts/Inter-SemiBoldItalic.ttf b/assets/fonts/Inter-SemiBoldItalic.ttf
new file mode 100644
index 00000000..3f704a20
Binary files /dev/null and b/assets/fonts/Inter-SemiBoldItalic.ttf differ
diff --git a/assets/fonts/Inter-Thin.ttf b/assets/fonts/Inter-Thin.ttf
index e12ed497..4cc53b31 100644
Binary files a/assets/fonts/Inter-Thin.ttf and b/assets/fonts/Inter-Thin.ttf differ
diff --git a/assets/fonts/Inter-ThinItalic.ttf b/assets/fonts/Inter-ThinItalic.ttf
new file mode 100644
index 00000000..f6527437
Binary files /dev/null and b/assets/fonts/Inter-ThinItalic.ttf differ
diff --git a/assets/js/vaft.user.js b/assets/js/vaft.user.js
new file mode 100644
index 00000000..47c3e971
--- /dev/null
+++ b/assets/js/vaft.user.js
@@ -0,0 +1,1119 @@
+// ==UserScript==
+// @name         TwitchAdSolutions (vaft)
+// @namespace    https://github.com/pixeltris/TwitchAdSolutions
+// @version      37.0.0
+// @description  Multiple solutions for blocking Twitch ads (vaft)
+// @updateURL    https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
+// @downloadURL  https://github.com/pixeltris/TwitchAdSolutions/raw/master/vaft/vaft.user.js
+// @author       https://github.com/cleanlock/VideoAdBlockForTwitch#credits
+// @match        *://*.twitch.tv/*
+// @run-at       document-start
+// @inject-into  page
+// @grant        none
+// ==/UserScript==
+(function() {
+    'use strict';
+    const ourTwitchAdSolutionsVersion = 24;// Used to prevent conflicts with outdated versions of the scripts
+    if (typeof window.twitchAdSolutionsVersion !== 'undefined' && window.twitchAdSolutionsVersion >= ourTwitchAdSolutionsVersion) {
+        console.log("skipping vaft as there's another script active. ourVersion:" + ourTwitchAdSolutionsVersion + " activeVersion:" + window.twitchAdSolutionsVersion);
+        window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
+        return;
+    }
+    window.twitchAdSolutionsVersion = ourTwitchAdSolutionsVersion;
+    function declareOptions(scope) {
+        scope.AdSignifier = 'stitched';
+        scope.ClientID = 'kimne78kx3ncx6brgo4mv6wki5h1ko';
+        scope.BackupPlayerTypes = [
+            'embed',//Source
+            'popout',//Source
+            'autoplay',//360p
+            //'picture-by-picture-CACHED'//360p (-CACHED is an internal suffix and is removed)
+        ];
+        scope.FallbackPlayerType = 'embed';
+        scope.ForceAccessTokenPlayerType = 'popout';
+        scope.SkipPlayerReloadOnHevc = false;// If true this will skip player reload on streams which have 2k/4k quality (if you enable this and you use the 2k/4k quality setting you'll get error #4000 / #3000 / spinning wheel on chrome based browsers)
+        scope.AlwaysReloadPlayerOnAd = false;// Always pause/play when entering/leaving ads
+        scope.ReloadPlayerAfterAd = true;// After the ad finishes do a player reload instead of pause/play
+        scope.PlayerReloadMinimalRequestsTime = 1500;
+        scope.PlayerReloadMinimalRequestsPlayerIndex = 2;//autoplay
+        scope.HasTriggeredPlayerReload = false;
+        scope.StreamInfos = [];
+        scope.StreamInfosByUrl = [];
+        scope.GQLDeviceID = null;
+        scope.ClientVersion = null;
+        scope.ClientSession = null;
+        scope.ClientIntegrityHeader = null;
+        scope.AuthorizationHeader = undefined;
+        scope.SimulatedAdsDepth = 0;
+        scope.PlayerBufferingFix = true;// If true this will pause/play the player when it gets stuck buffering
+        scope.PlayerBufferingDelay = 600;// How often should we check the player state (in milliseconds)
+        scope.PlayerBufferingSameStateCount = 3;// How many times of seeing the same player state until we trigger pause/play (it will only trigger it one time until the player state changes again)
+        scope.PlayerBufferingDangerZone = 1;// The buffering time left (in seconds) when we should ignore the players playback position in the player state check
+        scope.PlayerBufferingDoPlayerReload = false;// If true this will do a player reload instead of pause/play (player reloading is better at fixing the playback issues but it takes slightly longer)
+        scope.PlayerBufferingMinRepeatDelay = 8000;// Minimum delay (in milliseconds) between each pause/play (this is to avoid over pressing pause/play when there are genuine buffering problems)
+        scope.PlayerBufferingPrerollCheckEnabled = false;// Enable this if you're getting an immediate pause/play/reload as you open a stream (which is causing the stream to take longer to load). One problem with this being true is that it can cause the player to get stuck in some instances requiring the user to press pause/play
+        scope.PlayerBufferingPrerollCheckOffset = 5;// How far the stream need to move before doing the buffering mitigation (depends on PlayerBufferingPrerollCheckEnabled being true)
+        scope.V2API = false;
+        scope.IsAdStrippingEnabled = true;
+        scope.AdSegmentCache = new Map();
+        scope.AllSegmentsAreAdSegments = false;
+    }
+    let isActivelyStrippingAds = false;
+    let localStorageHookFailed = false;
+    const twitchWorkers = [];
+    const workerStringConflicts = [
+        'twitch',
+        'isVariantA'// TwitchNoSub
+    ];
+    const workerStringAllow = [];
+    const workerStringReinsert = [
+        'isVariantA',// TwitchNoSub (prior to (0.9))
+        'besuper/',// TwitchNoSub (0.9)
+        '${patch_url}'// TwitchNoSub (0.9.1)
+    ];
+    function getCleanWorker(worker) {
+        let root = null;
+        let parent = null;
+        let proto = worker;
+        while (proto) {
+            const workerString = proto.toString();
+            if (workerStringConflicts.some((x) => workerString.includes(x)) && !workerStringAllow.some((x) => workerString.includes(x))) {
+                if (parent !== null) {
+                    Object.setPrototypeOf(parent, Object.getPrototypeOf(proto));
+                }
+            } else {
+                if (root === null) {
+                    root = proto;
+                }
+                parent = proto;
+            }
+            proto = Object.getPrototypeOf(proto);
+        }
+        return root;
+    }
+    function getWorkersForReinsert(worker) {
+        const result = [];
+        let proto = worker;
+        while (proto) {
+            const workerString = proto.toString();
+            if (workerStringReinsert.some((x) => workerString.includes(x))) {
+                result.push(proto);
+            } else {
+            }
+            proto = Object.getPrototypeOf(proto);
+        }
+        return result;
+    }
+    function reinsertWorkers(worker, reinsert) {
+        let parent = worker;
+        for (let i = 0; i < reinsert.length; i++) {
+            Object.setPrototypeOf(reinsert[i], parent);
+            parent = reinsert[i];
+        }
+        return parent;
+    }
+    function isValidWorker(worker) {
+        const workerString = worker.toString();
+        return !workerStringConflicts.some((x) => workerString.includes(x))
+            || workerStringAllow.some((x) => workerString.includes(x))
+            || workerStringReinsert.some((x) => workerString.includes(x));
+    }
+    function hookWindowWorker() {
+        const reinsert = getWorkersForReinsert(window.Worker);
+        const newWorker = class Worker extends getCleanWorker(window.Worker) {
+            constructor(twitchBlobUrl, options) {
+                let isTwitchWorker = false;
+                try {
+                    isTwitchWorker = new URL(twitchBlobUrl).origin.endsWith('.twitch.tv');
+                } catch {}
+                if (!isTwitchWorker) {
+                    super(twitchBlobUrl, options);
+                    return;
+                }
+                const newBlobStr = `
+                    const pendingFetchRequests = new Map();
+                    ${stripAdSegments.toString()}
+                    ${getStreamUrlForResolution.toString()}
+                    ${processM3U8.toString()}
+                    ${hookWorkerFetch.toString()}
+                    ${declareOptions.toString()}
+                    ${getAccessToken.toString()}
+                    ${gqlRequest.toString()}
+                    ${parseAttributes.toString()}
+                    ${getWasmWorkerJs.toString()}
+                    ${getServerTimeFromM3u8.toString()}
+                    ${replaceServerTimeInM3u8.toString()}
+                    const workerString = getWasmWorkerJs('${twitchBlobUrl.replaceAll("'", "%27")}');
+                    declareOptions(self);
+                    GQLDeviceID = ${GQLDeviceID ? "'" + GQLDeviceID + "'" : null};
+                    AuthorizationHeader = ${AuthorizationHeader ? "'" + AuthorizationHeader + "'" : undefined};
+                    ClientIntegrityHeader = ${ClientIntegrityHeader ? "'" + ClientIntegrityHeader + "'" : null};
+                    ClientVersion = ${ClientVersion ? "'" + ClientVersion + "'" : null};
+                    ClientSession = ${ClientSession ? "'" + ClientSession + "'" : null};
+                    self.addEventListener('message', function(e) {
+                        if (e.data.key == 'UpdateClientVersion') {
+                            ClientVersion = e.data.value;
+                        } else if (e.data.key == 'UpdateClientSession') {
+                            ClientSession = e.data.value;
+                        } else if (e.data.key == 'UpdateClientId') {
+                            ClientID = e.data.value;
+                        } else if (e.data.key == 'UpdateDeviceId') {
+                            GQLDeviceID = e.data.value;
+                        } else if (e.data.key == 'UpdateClientIntegrityHeader') {
+                            ClientIntegrityHeader = e.data.value;
+                        } else if (e.data.key == 'UpdateAuthorizationHeader') {
+                            AuthorizationHeader = e.data.value;
+                        } else if (e.data.key == 'FetchResponse') {
+                            const responseData = e.data.value;
+                            if (pendingFetchRequests.has(responseData.id)) {
+                                const { resolve, reject } = pendingFetchRequests.get(responseData.id);
+                                pendingFetchRequests.delete(responseData.id);
+                                if (responseData.error) {
+                                    reject(new Error(responseData.error));
+                                } else {
+                                    // Create a Response object from the response data
+                                    const response = new Response(responseData.body, {
+                                        status: responseData.status,
+                                        statusText: responseData.statusText,
+                                        headers: responseData.headers
+                                    });
+                                    resolve(response);
+                                }
+                            }
+                        } else if (e.data.key == 'TriggeredPlayerReload') {
+                            HasTriggeredPlayerReload = true;
+                        } else if (e.data.key == 'SimulateAds') {
+                            SimulatedAdsDepth = e.data.value;
+                            console.log('SimulatedAdsDepth: ' + SimulatedAdsDepth);
+                        } else if (e.data.key == 'AllSegmentsAreAdSegments') {
+                            AllSegmentsAreAdSegments = !AllSegmentsAreAdSegments;
+                            console.log('AllSegmentsAreAdSegments: ' + AllSegmentsAreAdSegments);
+                        }
+                    });
+                    hookWorkerFetch();
+                    eval(workerString);
+                `;
+                super(URL.createObjectURL(new Blob([newBlobStr])), options);
+                twitchWorkers.push(this);
+                this.addEventListener('message', (e) => {
+                    if (e.data.key == 'UpdateAdBlockBanner') {
+                        updateAdblockBanner(e.data);
+                    } else if (e.data.key == 'PauseResumePlayer') {
+                        doTwitchPlayerTask(true, false);
+                    } else if (e.data.key == 'ReloadPlayer') {
+                        doTwitchPlayerTask(false, true);
+                    }
+                });
+                this.addEventListener('message', async event => {
+                    if (event.data.key == 'FetchRequest') {
+                        const fetchRequest = event.data.value;
+                        const responseData = await handleWorkerFetchRequest(fetchRequest);
+                        this.postMessage({
+                            key: 'FetchResponse',
+                            value: responseData
+                        });
+                    }
+                });
+            }
+        };
+        let workerInstance = reinsertWorkers(newWorker, reinsert);
+        Object.defineProperty(window, 'Worker', {
+            get: function() {
+                return workerInstance;
+            },
+            set: function(value) {
+                if (isValidWorker(value)) {
+                    workerInstance = value;
+                } else {
+                    console.log('Attempt to set twitch worker denied');
+                }
+            }
+        });
+    }
+    function getWasmWorkerJs(twitchBlobUrl) {
+        const req = new XMLHttpRequest();
+        req.open('GET', twitchBlobUrl, false);
+        req.overrideMimeType("text/javascript");
+        req.send();
+        return req.responseText;
+    }
+    function hookWorkerFetch() {
+        console.log('hookWorkerFetch (vaft)');
+        const realFetch = fetch;
+        fetch = async function(url, options) {
+            if (typeof url === 'string') {
+                if (AdSegmentCache.has(url)) {
+                    return new Promise(function(resolve, reject) {
+                        const send = function() {
+                            return realFetch('data:video/mp4;base64,AAAAKGZ0eXBtcDQyAAAAAWlzb21tcDQyZGFzaGF2YzFpc282aGxzZgAABEltb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAYagAAAAAAABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAABqHRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAURtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAALuAAAAAAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAADvbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAACzc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAALuAAAAAAAAzZXNkcwAAAAADgICAIgABAASAgIAUQBUAAAAAAAAAAAAAAAWAgIACEZAGgICAAQIAAAAQc3R0cwAAAAAAAAAAAAAAEHN0c2MAAAAAAAAAAAAAABRzdHN6AAAAAAAAAAAAAAAAAAAAEHN0Y28AAAAAAAAAAAAAAeV0cmFrAAAAXHRraGQAAAADAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAoAAAAFoAAAAAAGBbWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAA9CQAAAAABVxAAAAAAALWhkbHIAAAAAAAAAAHZpZGUAAAAAAAAAAAAAAABWaWRlb0hhbmRsZXIAAAABLG1pbmYAAAAUdm1oZAAAAAEAAAAAAAAAAAAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAOxzdGJsAAAAoHN0c2QAAAAAAAAAAQAAAJBhdmMxAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAoABaABIAAAASAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGP//AAAAOmF2Y0MBTUAe/+EAI2dNQB6WUoFAX/LgLUBAQFAAAD6AAA6mDgAAHoQAA9CW7y4KAQAEaOuPIAAAABBzdHRzAAAAAAAAAAAAAAAQc3RzYwAAAAAAAAAAAAAAFHN0c3oAAAAAAAAAAAAAAAAAAAAQc3RjbwAAAAAAAAAAAAAASG12ZXgAAAAgdHJleAAAAAAAAAABAAAAAQAAAC4AAAAAAoAAAAAAACB0cmV4AAAAAAAAAAIAAAABAACCNQAAAAACQAAA', options).then(function(response) {
+                                resolve(response);
+                            })['catch'](function(err) {
+                                reject(err);
+                            });
+                        };
+                        send();
+                    });
+                }
+                url = url.trimEnd();
+                if (url.endsWith('m3u8')) {
+                    return new Promise(function(resolve, reject) {
+                        const processAfter = async function(response) {
+                            if (response.status === 200) {
+                                resolve(new Response(await processM3U8(url, await response.text(), realFetch)));
+                            } else {
+                                resolve(response);
+                            }
+                        };
+                        const send = function() {
+                            return realFetch(url, options).then(function(response) {
+                                processAfter(response);
+                            })['catch'](function(err) {
+                                reject(err);
+                            });
+                        };
+                        send();
+                    });
+                } else if (url.includes('/channel/hls/') && !url.includes('picture-by-picture')) {
+                    V2API = url.includes('/api/v2/');
+                    const channelName = (new URL(url)).pathname.match(/([^\/]+)(?=\.\w+$)/)[0];
+                    if (ForceAccessTokenPlayerType) {
+                        // parent_domains is used to determine if the player is embeded and stripping it gets rid of fake ads
+                        const tempUrl = new URL(url);
+                        tempUrl.searchParams.delete('parent_domains');
+                        url = tempUrl.toString();
+                    }
+                    return new Promise(function(resolve, reject) {
+                        const processAfter = async function(response) {
+                            if (response.status == 200) {
+                                const encodingsM3u8 = await response.text();
+                                const serverTime = getServerTimeFromM3u8(encodingsM3u8);
+                                let streamInfo = StreamInfos[channelName];
+                                if (streamInfo != null && streamInfo.EncodingsM3U8 != null && (await realFetch(streamInfo.EncodingsM3U8.match(/^https:.*\.m3u8$/m)[0])).status !== 200) {
+                                    // The cached encodings are dead (the stream probably restarted)
+                                    streamInfo = null;
+                                }
+                                if (streamInfo == null || streamInfo.EncodingsM3U8 == null) {
+                                    StreamInfos[channelName] = streamInfo = {
+                                        ChannelName: channelName,
+                                        IsShowingAd: false,
+                                        LastPlayerReload: 0,
+                                        EncodingsM3U8: encodingsM3u8,
+                                        ModifiedM3U8: null,
+                                        IsUsingModifiedM3U8: false,
+                                        UsherParams: (new URL(url)).search,
+                                        RequestedAds: new Set(),
+                                        Urls: [],// xxx.m3u8 -> { Resolution: "284x160", FrameRate: 30.0 }
+                                        ResolutionList: [],
+                                        BackupEncodingsM3U8Cache: [],
+                                        ActiveBackupPlayerType: null,
+                                        IsMidroll: false,
+                                        IsStrippingAdSegments: false,
+                                        NumStrippedAdSegments: 0
+                                    };
+                                    const lines = encodingsM3u8.replaceAll('\r', '').split('\n');
+                                    for (let i = 0; i < lines.length - 1; i++) {
+                                        if (lines[i].startsWith('#EXT-X-STREAM-INF') && lines[i + 1].includes('.m3u8')) {
+                                            const attributes = parseAttributes(lines[i]);
+                                            const resolution = attributes['RESOLUTION'];
+                                            if (resolution) {
+                                                const resolutionInfo = {
+                                                    Resolution: resolution,
+                                                    FrameRate: attributes['FRAME-RATE'],
+                                                    Codecs: attributes['CODECS'],
+                                                    Url: lines[i + 1]
+                                                };
+                                                streamInfo.Urls[lines[i + 1]] = resolutionInfo;
+                                                streamInfo.ResolutionList.push(resolutionInfo);
+                                            }
+                                            StreamInfosByUrl[lines[i + 1]] = streamInfo;
+                                        }
+                                    }
+                                    const nonHevcResolutionList = streamInfo.ResolutionList.filter((element) => element.Codecs.startsWith('avc') || element.Codecs.startsWith('av0'));
+                                    if (AlwaysReloadPlayerOnAd || (nonHevcResolutionList.length > 0 && streamInfo.ResolutionList.some((element) => element.Codecs.startsWith('hev') || element.Codecs.startsWith('hvc')) && !SkipPlayerReloadOnHevc)) {
+                                        if (nonHevcResolutionList.length > 0) {
+                                            for (let i = 0; i < lines.length - 1; i++) {
+                                                if (lines[i].startsWith('#EXT-X-STREAM-INF')) {
+                                                    const resSettings = parseAttributes(lines[i].substring(lines[i].indexOf(':') + 1));
+                                                    const codecsKey = 'CODECS';
+                                                    if (resSettings[codecsKey].startsWith('hev') || resSettings[codecsKey].startsWith('hvc')) {
+                                                        const oldResolution = resSettings['RESOLUTION'];
+                                                        const [targetWidth, targetHeight] = oldResolution.split('x').map(Number);
+                                                        const newResolutionInfo = nonHevcResolutionList.sort((a, b) => {
+                                                            // TODO: Take into account 'Frame-Rate' when sorting (i.e. 1080p60 vs 1080p30)
+                                                            const [streamWidthA, streamHeightA] = a.Resolution.split('x').map(Number);
+                                                            const [streamWidthB, streamHeightB] = b.Resolution.split('x').map(Number);
+                                                            return Math.abs((streamWidthA * streamHeightA) - (targetWidth * targetHeight)) - Math.abs((streamWidthB * streamHeightB) - (targetWidth * targetHeight));
+                                                        })[0];
+                                                        console.log('ModifiedM3U8 swap ' + resSettings[codecsKey] + ' to ' + newResolutionInfo.Codecs + ' oldRes:' + oldResolution + ' newRes:' + newResolutionInfo.Resolution);
+                                                        lines[i] = lines[i].replace(/CODECS="[^"]+"/, `CODECS="${newResolutionInfo.Codecs}"`);
+                                                        lines[i + 1] = newResolutionInfo.Url + ' '.repeat(i + 1);// The stream doesn't load unless each url line is unique
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        if (nonHevcResolutionList.length > 0 || AlwaysReloadPlayerOnAd) {
+                                            streamInfo.ModifiedM3U8 = lines.join('\n');
+                                        }
+                                    }
+                                }
+                                streamInfo.LastPlayerReload = Date.now();
+                                resolve(new Response(replaceServerTimeInM3u8(streamInfo.IsUsingModifiedM3U8 ? streamInfo.ModifiedM3U8 : streamInfo.EncodingsM3U8, serverTime)));
+                            } else {
+                                resolve(response);
+                            }
+                        };
+                        const send = function() {
+                            return realFetch(url, options).then(function(response) {
+                                processAfter(response);
+                            })['catch'](function(err) {
+                                reject(err);
+                            });
+                        };
+                        send();
+                    });
+                }
+            }
+            return realFetch.apply(this, arguments);
+        };
+    }
+    function getServerTimeFromM3u8(encodingsM3u8) {
+        if (V2API) {
+            const matches = encodingsM3u8.match(/#EXT-X-SESSION-DATA:DATA-ID="SERVER-TIME",VALUE="([^"]+)"/);
+            return matches.length > 1 ? matches[1] : null;
+        }
+        const matches = encodingsM3u8.match('SERVER-TIME="([0-9.]+)"');
+        return matches.length > 1 ? matches[1] : null;
+    }
+    function replaceServerTimeInM3u8(encodingsM3u8, newServerTime) {
+        if (V2API) {
+            return newServerTime ? encodingsM3u8.replace(/(#EXT-X-SESSION-DATA:DATA-ID="SERVER-TIME",VALUE=")[^"]+(")/, `$1${newServerTime}$2`) : encodingsM3u8;
+        }
+        return newServerTime ? encodingsM3u8.replace(new RegExp('(SERVER-TIME=")[0-9.]+"'), `SERVER-TIME="${newServerTime}"`) : encodingsM3u8;
+    }
+    function stripAdSegments(textStr, stripAllSegments, streamInfo) {
+        let hasStrippedAdSegments = false;
+        const lines = textStr.replaceAll('\r', '').split('\n');
+        const newAdUrl = 'https://twitch.tv';
+        for (let i = 0; i < lines.length; i++) {
+            let line = lines[i];
+            // Remove tracking urls which appear in the overlay UI
+            line = line
+                .replaceAll(/(X-TV-TWITCH-AD-URL=")(?:[^"]*)(")/g, `$1${newAdUrl}$2`)
+                .replaceAll(/(X-TV-TWITCH-AD-CLICK-TRACKING-URL=")(?:[^"]*)(")/g, `$1${newAdUrl}$2`);
+            if (i < lines.length - 1 && line.startsWith('#EXTINF') && (!line.includes(',live') || stripAllSegments || AllSegmentsAreAdSegments)) {
+                const segmentUrl = lines[i + 1];
+                if (!AdSegmentCache.has(segmentUrl)) {
+                    streamInfo.NumStrippedAdSegments++;
+                }
+                AdSegmentCache.set(segmentUrl, Date.now());
+                hasStrippedAdSegments = true;
+            }
+            if (line.includes(AdSignifier)) {
+                hasStrippedAdSegments = true;
+            }
+        }
+        if (hasStrippedAdSegments) {
+            for (let i = 0; i < lines.length; i++) {
+                // No low latency during ads (otherwise it's possible for the player to prefetch and display ad segments)
+                if (lines[i].startsWith('#EXT-X-TWITCH-PREFETCH:')) {
+                    lines[i] = '';
+                }
+            }
+        } else {
+            streamInfo.NumStrippedAdSegments = 0;
+        }
+        streamInfo.IsStrippingAdSegments = hasStrippedAdSegments;
+        AdSegmentCache.forEach((value, key, map) => {
+            if (value < Date.now() - 120000) {
+                map.delete(key);
+            }
+        });
+        return lines.join('\n');
+    }
+    function getStreamUrlForResolution(encodingsM3u8, resolutionInfo) {
+        const encodingsLines = encodingsM3u8.replaceAll('\r', '').split('\n');
+        const [targetWidth, targetHeight] = resolutionInfo.Resolution.split('x').map(Number);
+        let matchedResolutionUrl = null;
+        let matchedFrameRate = false;
+        let closestResolutionUrl = null;
+        let closestResolutionDifference = Infinity;
+        for (let i = 0; i < encodingsLines.length - 1; i++) {
+            if (encodingsLines[i].startsWith('#EXT-X-STREAM-INF') && encodingsLines[i + 1].includes('.m3u8')) {
+                const attributes = parseAttributes(encodingsLines[i]);
+                const resolution = attributes['RESOLUTION'];
+                const frameRate = attributes['FRAME-RATE'];
+                if (resolution) {
+                    if (resolution == resolutionInfo.Resolution && (!matchedResolutionUrl || (!matchedFrameRate && frameRate == resolutionInfo.FrameRate))) {
+                        matchedResolutionUrl = encodingsLines[i + 1];
+                        matchedFrameRate = frameRate == resolutionInfo.FrameRate;
+                        if (matchedFrameRate) {
+                            return matchedResolutionUrl;
+                        }
+                    }
+                    const [width, height] = resolution.split('x').map(Number);
+                    const difference = Math.abs((width * height) - (targetWidth * targetHeight));
+                    if (difference < closestResolutionDifference) {
+                        closestResolutionUrl = encodingsLines[i + 1];
+                        closestResolutionDifference = difference;
+                    }
+                }
+            }
+        }
+        return closestResolutionUrl;
+    }
+    async function processM3U8(url, textStr, realFetch) {
+        const streamInfo = StreamInfosByUrl[url];
+        if (!streamInfo) {
+            return textStr;
+        }
+        if (HasTriggeredPlayerReload) {
+            HasTriggeredPlayerReload = false;
+            streamInfo.LastPlayerReload = Date.now();
+        }
+        const haveAdTags = textStr.includes(AdSignifier) || SimulatedAdsDepth > 0;
+        if (haveAdTags) {
+            streamInfo.IsMidroll = textStr.includes('"MIDROLL"') || textStr.includes('"midroll"');
+            if (!streamInfo.IsShowingAd) {
+                streamInfo.IsShowingAd = true;
+                postMessage({
+                    key: 'UpdateAdBlockBanner',
+                    isMidroll: streamInfo.IsMidroll,
+                    hasAds: streamInfo.IsShowingAd,
+                    isStrippingAdSegments: false
+                });
+            }
+            if (!streamInfo.IsMidroll) {
+                const lines = textStr.replaceAll('\r', '').split('\n');
+                for (let i = 0; i < lines.length; i++) {
+                    const line = lines[i];
+                    if (line.startsWith('#EXTINF') && lines.length > i + 1) {
+                        if (!line.includes(',live') && !streamInfo.RequestedAds.has(lines[i + 1])) {
+                            // Only request one .ts file per .m3u8 request to avoid making too many requests
+                            //console.log('Fetch ad .ts file');
+                            streamInfo.RequestedAds.add(lines[i + 1]);
+                            fetch(lines[i + 1]).then((response)=>{response.blob()});
+                            break;
+                        }
+                    }
+                }
+            }
+            const currentResolution = streamInfo.Urls[url];
+            if (!currentResolution) {
+                console.log('Ads will leak due to missing resolution info for ' + url);
+                return textStr;
+            }
+            const isHevc = currentResolution.Codecs.startsWith('hev') || currentResolution.Codecs.startsWith('hvc');
+            if (((isHevc && !SkipPlayerReloadOnHevc) || AlwaysReloadPlayerOnAd) && streamInfo.ModifiedM3U8 && !streamInfo.IsUsingModifiedM3U8) {
+                streamInfo.IsUsingModifiedM3U8 = true;
+                streamInfo.LastPlayerReload = Date.now();
+                postMessage({
+                    key: 'ReloadPlayer'
+                });
+            }
+            let backupPlayerType = null;
+            let backupM3u8 = null;
+            let fallbackM3u8 = null;
+            let startIndex = 0;
+            let isDoingMinimalRequests = false;
+            if (streamInfo.LastPlayerReload > Date.now() - PlayerReloadMinimalRequestsTime) {
+                // When doing player reload there are a lot of requests which causes the backup stream to load in slow. Briefly prefer using a single version to prevent long delays
+                startIndex = PlayerReloadMinimalRequestsPlayerIndex;
+                isDoingMinimalRequests = true;
+            }
+            for (let playerTypeIndex = startIndex; !backupM3u8 && playerTypeIndex < BackupPlayerTypes.length; playerTypeIndex++) {
+                const playerType = BackupPlayerTypes[playerTypeIndex];
+                const realPlayerType = playerType.replace('-CACHED', '');
+                const isFullyCachedPlayerType = playerType != realPlayerType;
+                for (let i = 0; i < 2; i++) {
+                    // This caches the m3u8 if it doesn't have ads. If the already existing cache has ads it fetches a new version (second loop)
+                    let isFreshM3u8 = false;
+                    let encodingsM3u8 = streamInfo.BackupEncodingsM3U8Cache[playerType];
+                    if (!encodingsM3u8) {
+                        isFreshM3u8 = true;
+                        try {
+                            const accessTokenResponse = await getAccessToken(streamInfo.ChannelName, realPlayerType);
+                            if (accessTokenResponse.status === 200) {
+                                const accessToken = await accessTokenResponse.json();
+                                const urlInfo = new URL('https://usher.ttvnw.net/api/' + (V2API ? 'v2/' : '') + 'channel/hls/' + streamInfo.ChannelName + '.m3u8' + streamInfo.UsherParams);
+                                urlInfo.searchParams.set('sig', accessToken.data.streamPlaybackAccessToken.signature);
+                                urlInfo.searchParams.set('token', accessToken.data.streamPlaybackAccessToken.value);
+                                const encodingsM3u8Response = await realFetch(urlInfo.href);
+                                if (encodingsM3u8Response.status === 200) {
+                                    encodingsM3u8 = streamInfo.BackupEncodingsM3U8Cache[playerType] = await encodingsM3u8Response.text();
+                                }
+                            }
+                        } catch (err) {}
+                    }
+                    if (encodingsM3u8) {
+                        try {
+                            const streamM3u8Url = getStreamUrlForResolution(encodingsM3u8, currentResolution);
+                            const streamM3u8Response = await realFetch(streamM3u8Url);
+                            if (streamM3u8Response.status == 200) {
+                                const m3u8Text = await streamM3u8Response.text();
+                                if (m3u8Text) {
+                                    if (playerType == FallbackPlayerType) {
+                                        fallbackM3u8 = m3u8Text;
+                                    }
+                                    if ((!m3u8Text.includes(AdSignifier) && (SimulatedAdsDepth == 0 || playerTypeIndex >= SimulatedAdsDepth - 1)) || (!fallbackM3u8 && playerTypeIndex >= BackupPlayerTypes.length - 1)) {
+                                        backupPlayerType = playerType;
+                                        backupM3u8 = m3u8Text;
+                                        break;
+                                    }
+                                    if (isFullyCachedPlayerType) {
+                                        break;
+                                    }
+                                    if (isDoingMinimalRequests) {
+                                        backupPlayerType = playerType;
+                                        backupM3u8 = m3u8Text;
+                                        break;
+                                    }
+                                }
+                            }
+                        } catch (err) {}
+                    }
+                    streamInfo.BackupEncodingsM3U8Cache[playerType] = null;
+                    if (isFreshM3u8) {
+                        break;
+                    }
+                }
+            }
+            if (!backupM3u8 && fallbackM3u8) {
+                backupPlayerType = FallbackPlayerType;
+                backupM3u8 = fallbackM3u8;
+            }
+            if (backupM3u8) {
+                textStr = backupM3u8;
+                if (streamInfo.ActiveBackupPlayerType != backupPlayerType) {
+                    streamInfo.ActiveBackupPlayerType = backupPlayerType;
+                    console.log(`Blocking${(streamInfo.IsMidroll ? ' midroll ' : ' ')}ads (${backupPlayerType})`);
+                }
+            }
+            // TODO: Improve hevc stripping. It should always strip when there is a codec mismatch (both ways)
+            const stripHevc = isHevc && streamInfo.ModifiedM3U8;
+            if (IsAdStrippingEnabled || stripHevc) {
+                textStr = stripAdSegments(textStr, stripHevc, streamInfo);
+            }
+        } else if (streamInfo.IsShowingAd) {
+            console.log('Finished blocking ads');
+            streamInfo.IsShowingAd = false;
+            streamInfo.IsStrippingAdSegments = false;
+            streamInfo.NumStrippedAdSegments = 0;
+            streamInfo.ActiveBackupPlayerType = null;
+            if (streamInfo.IsUsingModifiedM3U8 || ReloadPlayerAfterAd) {
+                streamInfo.IsUsingModifiedM3U8 = false;
+                streamInfo.LastPlayerReload = Date.now();
+                postMessage({
+                    key: 'ReloadPlayer'
+                });
+            } else {
+                postMessage({
+                    key: 'PauseResumePlayer'
+                });
+            }
+        }
+        postMessage({
+            key: 'UpdateAdBlockBanner',
+            isMidroll: streamInfo.IsMidroll,
+            hasAds: streamInfo.IsShowingAd,
+            isStrippingAdSegments: streamInfo.IsStrippingAdSegments,
+            numStrippedAdSegments: streamInfo.NumStrippedAdSegments
+        });
+        return textStr;
+    }
+    function parseAttributes(str) {
+        return Object.fromEntries(
+            str.split(/(?:^|,)((?:[^=]*)=(?:"[^"]*"|[^,]*))/)
+            .filter(Boolean)
+            .map(x => {
+                const idx = x.indexOf('=');
+                const key = x.substring(0, idx);
+                const value = x.substring(idx + 1);
+                const num = Number(value);
+                return [key, Number.isNaN(num) ? value.startsWith('"') ? JSON.parse(value) : value : num];
+            }));
+    }
+    function getAccessToken(channelName, playerType) {
+        const body = {
+            operationName: 'PlaybackAccessToken',
+            variables: {
+                isLive: true,
+                login: channelName,
+                isVod: false,
+                vodID: "",
+                playerType: playerType,
+                platform: playerType == 'autoplay' ? 'android' : 'web'
+            },
+            extensions: {
+                persistedQuery: {
+                    version:1,
+                    sha256Hash:"ed230aa1e33e07eebb8928504583da78a5173989fadfb1ac94be06a04f3cdbe9"
+                }
+            }
+        };
+        return gqlRequest(body, playerType);
+    }
+    function gqlRequest(body, playerType) {
+        if (!GQLDeviceID) {
+            GQLDeviceID = '';
+            const dcharacters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+            const dcharactersLength = dcharacters.length;
+            for (let i = 0; i < 32; i++) {
+                GQLDeviceID += dcharacters.charAt(Math.floor(Math.random() * dcharactersLength));
+            }
+        }
+        let headers = {
+            'Client-ID': ClientID,
+            'X-Device-Id': GQLDeviceID,
+            'Authorization': AuthorizationHeader,
+            ...(ClientIntegrityHeader && {'Client-Integrity': ClientIntegrityHeader}),
+            ...(ClientVersion && {'Client-Version': ClientVersion}),
+            ...(ClientSession && {'Client-Session-Id': ClientSession})
+        };
+        return new Promise((resolve, reject) => {
+            const requestId = Math.random().toString(36).substring(2, 15);
+            const fetchRequest = {
+                id: requestId,
+                url: 'https://gql.twitch.tv/gql',
+                options: {
+                    method: 'POST',
+                    body: JSON.stringify(body),
+                    headers
+                }
+            };
+            pendingFetchRequests.set(requestId, {
+                resolve,
+                reject
+            });
+            postMessage({
+                key: 'FetchRequest',
+                value: fetchRequest
+            });
+        });
+    }
+    let playerForMonitoringBuffering = null;
+    const playerBufferState = {
+        channelName: null,
+        hasStreamStarted: false,
+        position: 0,
+        bufferedPosition: 0,
+        bufferDuration: 0,
+        numSame: 0,
+        lastFixTime: 0,
+        isLive: true
+    };
+    function monitorPlayerBuffering() {
+        if (playerForMonitoringBuffering) {
+            try {
+                const player = playerForMonitoringBuffering.player;
+                const state = playerForMonitoringBuffering.state;
+                if (!player.core) {
+                    playerForMonitoringBuffering = null;
+                } else if (state.props?.content?.type === 'live' && !player.isPaused() && !player.getHTMLVideoElement()?.ended && playerBufferState.lastFixTime <= Date.now() - PlayerBufferingMinRepeatDelay && !isActivelyStrippingAds) {
+                    const m3u8Url = player.core?.state?.path;
+                    if (m3u8Url) {
+                      const fileName = new URL(m3u8Url).pathname.split('/').pop();
+                      if (fileName?.endsWith('.m3u8')) {
+                          const channelName = fileName.slice(0, -5);
+                          if (playerBufferState.channelName != channelName) {
+                              playerBufferState.channelName = channelName;
+                              playerBufferState.hasStreamStarted = false;
+                              playerBufferState.numSame = 0;
+                              //console.log('Channel changed to ' + channelName);
+                          }
+                      }
+                    }
+                    if (player.getState() === 'Playing') {
+                        playerBufferState.hasStreamStarted = true;
+                    }
+                    const position = player.core?.state?.position;
+                    const bufferedPosition = player.core?.state?.bufferedPosition;
+                    const bufferDuration = player.getBufferDuration();
+                    if (position !== undefined && bufferedPosition !== undefined) {
+                        //console.log('position:' + position + ' bufferDuration:' + bufferDuration + ' bufferPosition:' + bufferedPosition + ' state: ' + player.core?.state?.state + ' started: ' + playerBufferState.hasStreamStarted);
+                        // NOTE: This could be improved. It currently lets the player fully eat the full buffer before it triggers pause/play
+                        if (playerBufferState.hasStreamStarted &&
+                            (!PlayerBufferingPrerollCheckEnabled || position > PlayerBufferingPrerollCheckOffset) &&
+                            (playerBufferState.position == position || bufferDuration < PlayerBufferingDangerZone)  &&
+                            playerBufferState.bufferedPosition == bufferedPosition &&
+                            playerBufferState.bufferDuration >= bufferDuration &&
+                            (position != 0 || bufferedPosition != 0 || bufferDuration != 0)
+                        ) {
+                            playerBufferState.numSame++;
+                            if (playerBufferState.numSame == PlayerBufferingSameStateCount) {
+                                console.log('Attempt to fix buffering position:' + playerBufferState.position + ' bufferedPosition:' + playerBufferState.bufferedPosition + ' bufferDuration:' + playerBufferState.bufferDuration);
+                                const isPausePlay = !PlayerBufferingDoPlayerReload;
+                                const isReload = PlayerBufferingDoPlayerReload;
+                                doTwitchPlayerTask(isPausePlay, isReload);
+                                playerBufferState.lastFixTime = Date.now();
+                                playerBufferState.numSame = 0;
+                            }
+                        } else {
+                            playerBufferState.numSame = 0;
+                        }
+                        playerBufferState.position = position;
+                        playerBufferState.bufferedPosition = bufferedPosition;
+                        playerBufferState.bufferDuration = bufferDuration;
+                    } else {
+                        playerBufferState.numSame = 0;
+                    }
+                }
+            } catch (err) {
+                console.error('error when monitoring player for buffering: ' + err);
+                playerForMonitoringBuffering = null;
+            }
+        }
+        if (!playerForMonitoringBuffering) {
+            const playerAndState = getPlayerAndState();
+            if (playerAndState && playerAndState.player && playerAndState.state) {
+                playerForMonitoringBuffering = {
+                    player: playerAndState.player,
+                    state: playerAndState.state
+                };
+            }
+        }
+        const isLive = playerForMonitoringBuffering?.state?.props?.content?.type === 'live';
+        if (playerBufferState.isLive && !isLive) {
+            updateAdblockBanner({
+                hasAds: false
+            });
+        }
+        playerBufferState.isLive = isLive;
+        setTimeout(monitorPlayerBuffering, PlayerBufferingDelay);
+    }
+    function updateAdblockBanner(data) {
+        const playerRootDiv = document.querySelector('.video-player');
+        if (playerRootDiv != null) {
+            let adBlockDiv = null;
+            adBlockDiv = playerRootDiv.querySelector('.adblock-overlay');
+            if (adBlockDiv == null) {
+                adBlockDiv = document.createElement('div');
+                adBlockDiv.className = 'adblock-overlay';
+                adBlockDiv.innerHTML = '<div class="player-adblock-notice" style="color: white; background-color: rgba(0, 0, 0, 0.8); position: absolute; top: 0px; left: 0px; padding: 5px;"><p></p></div>';
+                adBlockDiv.style.display = 'none';
+                adBlockDiv.P = adBlockDiv.querySelector('p');
+                playerRootDiv.appendChild(adBlockDiv);
+            }
+            if (adBlockDiv != null) {
+                isActivelyStrippingAds = data.isStrippingAdSegments;
+                adBlockDiv.P.textContent = 'Blocking' + (data.isMidroll ? ' midroll' : '') + ' ads' + (data.isStrippingAdSegments ? ' (stripping)' : '');// + (data.numStrippedAdSegments > 0 ? ` (${data.numStrippedAdSegments})` : '');
+                adBlockDiv.style.display = data.hasAds && playerBufferState.isLive ? 'block' : 'none';
+            }
+        }
+    }
+    function getPlayerAndState() {
+        function findReactNode(root, constraint) {
+            if (root.stateNode && constraint(root.stateNode)) {
+                return root.stateNode;
+            }
+            let node = root.child;
+            while (node) {
+                const result = findReactNode(node, constraint);
+                if (result) {
+                    return result;
+                }
+                node = node.sibling;
+            }
+            return null;
+        }
+        function findReactRootNode() {
+            let reactRootNode = null;
+            const rootNode = document.querySelector('#root');
+            if (rootNode && rootNode._reactRootContainer && rootNode._reactRootContainer._internalRoot && rootNode._reactRootContainer._internalRoot.current) {
+                reactRootNode = rootNode._reactRootContainer._internalRoot.current;
+            }
+            if (reactRootNode == null && rootNode != null) {
+                const containerName = Object.keys(rootNode).find(x => x.startsWith('__reactContainer'));
+                if (containerName != null) {
+                    reactRootNode = rootNode[containerName];
+                }
+            }
+            return reactRootNode;
+        }
+        const reactRootNode = findReactRootNode();
+        if (!reactRootNode) {
+            return null;
+        }
+        let player = findReactNode(reactRootNode, node => node.setPlayerActive && node.props && node.props.mediaPlayerInstance);
+        player = player && player.props && player.props.mediaPlayerInstance ? player.props.mediaPlayerInstance : null;
+        if (player?.playerInstance) {
+            player = player.playerInstance;
+        }
+        const playerState = findReactNode(reactRootNode, node => node.setSrc && node.setInitialPlaybackSettings);
+        return  {
+            player: player,
+            state: playerState
+        };
+    }
+    function doTwitchPlayerTask(isPausePlay, isReload) {
+        const playerAndState = getPlayerAndState();
+        if (!playerAndState) {
+            console.log('Could not find react root');
+            return;
+        }
+        const player = playerAndState.player;
+        const playerState = playerAndState.state;
+        if (!player) {
+            console.log('Could not find player');
+            return;
+        }
+        if (!playerState) {
+            console.log('Could not find player state');
+            return;
+        }
+        if (player.isPaused() || player.core?.paused) {
+            return;
+        }
+        playerBufferState.lastFixTime = Date.now();
+        playerBufferState.numSame = 0;
+        if (isPausePlay) {
+            player.pause();
+            player.play();
+            return;
+        }
+        if (isReload) {
+            const lsKeyQuality = 'video-quality';
+            const lsKeyMuted = 'video-muted';
+            const lsKeyVolume = 'volume';
+            let currentQualityLS = null;
+            let currentMutedLS = null;
+            let currentVolumeLS = null;
+            try {
+                currentQualityLS = localStorage.getItem(lsKeyQuality);
+                currentMutedLS = localStorage.getItem(lsKeyMuted);
+                currentVolumeLS = localStorage.getItem(lsKeyVolume);
+                if (localStorageHookFailed && player?.core?.state) {
+                    localStorage.setItem(lsKeyMuted, JSON.stringify({default:player.core.state.muted}));
+                    localStorage.setItem(lsKeyVolume, player.core.state.volume);
+                }
+                if (localStorageHookFailed && player?.core?.state?.quality?.group) {
+                    localStorage.setItem(lsKeyQuality, JSON.stringify({default:player.core.state.quality.group}));
+                }
+            } catch {}
+            console.log('Reloading Twitch player');
+            playerState.setSrc({ isNewMediaPlayerInstance: true, refreshAccessToken: true });
+            postTwitchWorkerMessage('TriggeredPlayerReload');
+            player.play();
+            if (localStorageHookFailed && (currentQualityLS || currentMutedLS || currentVolumeLS)) {
+                setTimeout(() => {
+                    try {
+                        if (currentQualityLS) {
+                            localStorage.setItem(lsKeyQuality, currentQualityLS);
+                        }
+                        if (currentMutedLS) {
+                            localStorage.setItem(lsKeyMuted, currentMutedLS);
+                        }
+                        if (currentVolumeLS) {
+                            localStorage.setItem(lsKeyVolume, currentVolumeLS);
+                        }
+                    } catch {}
+                }, 3000);
+            }
+            return;
+        }
+    }
+    window.reloadTwitchPlayer = () => {
+        doTwitchPlayerTask(false, true);
+    };
+    function postTwitchWorkerMessage(key, value) {
+        twitchWorkers.forEach((worker) => {
+            worker.postMessage({key: key, value: value});
+        });
+    }
+    async function handleWorkerFetchRequest(fetchRequest) {
+        try {
+            const response = await window.realFetch(fetchRequest.url, fetchRequest.options);
+            const responseBody = await response.text();
+            const responseObject = {
+                id: fetchRequest.id,
+                status: response.status,
+                statusText: response.statusText,
+                headers: Object.fromEntries(response.headers.entries()),
+                body: responseBody
+            };
+            return responseObject;
+        } catch (error) {
+            return {
+                id: fetchRequest.id,
+                error: error.message
+            };
+        }
+    }
+    function hookFetch() {
+        const realFetch = window.fetch;
+        window.realFetch = realFetch;
+        window.fetch = function(url, init, ...args) {
+            if (typeof url === 'string') {
+                if (url.includes('gql')) {
+                    let deviceId = init.headers['X-Device-Id'];
+                    if (typeof deviceId !== 'string') {
+                        deviceId = init.headers['Device-ID'];
+                    }
+                    if (typeof deviceId === 'string' && GQLDeviceID != deviceId) {
+                        GQLDeviceID = deviceId;
+                        postTwitchWorkerMessage('UpdateDeviceId', GQLDeviceID);
+                    }
+                    if (typeof init.headers['Client-Version'] === 'string' && init.headers['Client-Version'] !== ClientVersion) {
+                        postTwitchWorkerMessage('UpdateClientVersion', ClientVersion = init.headers['Client-Version']);
+                    }
+                    if (typeof init.headers['Client-Session-Id'] === 'string' && init.headers['Client-Session-Id'] !== ClientSession) {
+                        postTwitchWorkerMessage('UpdateClientSession', ClientSession = init.headers['Client-Session-Id']);
+                    }
+                    if (typeof init.headers['Client-Integrity'] === 'string' && init.headers['Client-Integrity'] !== ClientIntegrityHeader) {
+                        postTwitchWorkerMessage('UpdateClientIntegrityHeader', ClientIntegrityHeader = init.headers['Client-Integrity']);
+                    }
+                    if (typeof init.headers['Authorization'] === 'string' && init.headers['Authorization'] !== AuthorizationHeader) {
+                        postTwitchWorkerMessage('UpdateAuthorizationHeader', AuthorizationHeader = init.headers['Authorization']);
+                    }
+                    // Get rid of mini player above chat - TODO: Reject this locally instead of having server reject it
+                    if (init && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken') && init.body.includes('picture-by-picture')) {
+                        init.body = '';
+                    }
+                    if (ForceAccessTokenPlayerType && typeof init.body === 'string' && init.body.includes('PlaybackAccessToken')) {
+                        let replacedPlayerType = '';
+                        const newBody = JSON.parse(init.body);
+                        if (Array.isArray(newBody)) {
+                            for (let i = 0; i < newBody.length; i++) {
+                                if (newBody[i]?.variables?.playerType && newBody[i]?.variables?.playerType !== ForceAccessTokenPlayerType) {
+                                    replacedPlayerType = newBody[i].variables.playerType;
+                                    newBody[i].variables.playerType = ForceAccessTokenPlayerType;
+                                }
+                            }
+                        } else {
+                            if (newBody?.variables?.playerType && newBody?.variables?.playerType !== ForceAccessTokenPlayerType) {
+                                replacedPlayerType = newBody.variables.playerType;
+                                newBody.variables.playerType = ForceAccessTokenPlayerType;
+                            }
+                        }
+                        if (replacedPlayerType) {
+                            console.log(`Replaced '${replacedPlayerType}' player type with '${ForceAccessTokenPlayerType}' player type`);
+                            init.body = JSON.stringify(newBody);
+                        }
+                    }
+                }
+            }
+            return realFetch.apply(this, arguments);
+        };
+    }
+    function onContentLoaded() {
+        // This stops Twitch from pausing the player when in another tab and an ad shows.
+        // Taken from https://github.com/saucettv/VideoAdBlockForTwitch/blob/cefce9d2b565769c77e3666ac8234c3acfe20d83/chrome/content.js#L30
+        try {
+            Object.defineProperty(document, 'visibilityState', {
+                get() {
+                    return 'visible';
+                }
+            });
+        }catch{}
+        let hidden = document.__lookupGetter__('hidden');
+        let webkitHidden = document.__lookupGetter__('webkitHidden');
+        try {
+            Object.defineProperty(document, 'hidden', {
+                get() {
+                    return false;
+                }
+            });
+        }catch{}
+        const block = e => {
+            e.preventDefault();
+            e.stopPropagation();
+            e.stopImmediatePropagation();
+        };
+        let wasVideoPlaying = true;
+        const visibilityChange = e => {
+            const isChrome = typeof chrome !== 'undefined';
+            const videos = document.getElementsByTagName('video');
+            if (videos.length > 0) {
+                if (hidden.apply(document) === true || (webkitHidden && webkitHidden.apply(document) === true)) {
+                    wasVideoPlaying = !videos[0].paused && !videos[0].ended;
+                } else {
+                    if (!playerBufferState.hasStreamStarted) {
+                        //console.log('Tab focused. Stream should be active');
+                        playerBufferState.hasStreamStarted = true;
+                    }
+                    if (isChrome && wasVideoPlaying && !videos[0].ended && videos[0].paused && videos[0].muted) {
+                        videos[0].play();
+                    }
+                }
+            }
+            block(e);
+        };
+        document.addEventListener('visibilitychange', visibilityChange, true);
+        document.addEventListener('webkitvisibilitychange', visibilityChange, true);
+        document.addEventListener('mozvisibilitychange', visibilityChange, true);
+        document.addEventListener('hasFocus', block, true);
+        try {
+            if (/Firefox/.test(navigator.userAgent)) {
+                Object.defineProperty(document, 'mozHidden', {
+                    get() {
+                        return false;
+                    }
+                });
+            } else {
+                Object.defineProperty(document, 'webkitHidden', {
+                    get() {
+                        return false;
+                    }
+                });
+            }
+        }catch{}
+        // Hooks for preserving volume / resolution
+        try {
+            const keysToCache = [
+                'video-quality',
+                'video-muted',
+                'volume',
+                'lowLatencyModeEnabled',// Low Latency
+                'persistenceEnabled',// Mini Player
+            ];
+            const cachedValues = new Map();
+            for (let i = 0; i < keysToCache.length; i++) {
+                cachedValues.set(keysToCache[i], localStorage.getItem(keysToCache[i]));
+            }
+            const realSetItem = localStorage.setItem;
+            localStorage.setItem = function(key, value) {
+                if (cachedValues.has(key)) {
+                    cachedValues.set(key, value);
+                }
+                realSetItem.apply(this, arguments);
+            };
+            const realGetItem = localStorage.getItem;
+            localStorage.getItem = function(key) {
+                if (cachedValues.has(key)) {
+                    return cachedValues.get(key);
+                }
+                return realGetItem.apply(this, arguments);
+            };
+            if (!localStorage.getItem.toString().includes(Object.keys({cachedValues})[0])) {
+                // These hooks are useful to preserve player state on player reload
+                // Firefox doesn't allow hooking of localStorage functions but chrome does
+                localStorageHookFailed = true;
+            }
+        } catch (err) {
+            console.log('localStorageHooks failed ' + err)
+            localStorageHookFailed = true;
+        }
+    }
+    declareOptions(window);
+    hookWindowWorker();
+    hookFetch();
+    if (PlayerBufferingFix) {
+        monitorPlayerBuffering();
+    }
+    if (document.readyState === "complete" || document.readyState === "loaded" || document.readyState === "interactive") {
+        onContentLoaded();
+    } else {
+        window.addEventListener("DOMContentLoaded", function() {
+            onContentLoaded();
+        });
+    }
+    window.simulateAds = (depth) => {
+        if (depth === undefined || depth < 0) {
+            console.log('Ad depth paramter required (0 = no simulated ad, 1+ = use backup player for given depth)');
+            return;
+        }
+        postTwitchWorkerMessage('SimulateAds', depth);
+    };
+    window.allSegmentsAreAdSegments = () => {
+        postTwitchWorkerMessage('AllSegmentsAreAdSegments');
+    };
+})();
diff --git a/assets/release-notes.md b/assets/release-notes.md
new file mode 100644
index 00000000..6d112234
--- /dev/null
+++ b/assets/release-notes.md
@@ -0,0 +1,28 @@
+## v5.3.1
+
+October 12, 2026
+
+### Bug Fixes
+
+- Fixed the player getting stuck on a Source error after the screen turns off or the network switches — it now reloads automatically instead of waiting for a manual refresh.
+
+---
+
+## v5.3.0
+
+October 12, 2026
+
+### New Features
+
+- Added a Follow / Unfollow button under the player (between video and chat) for live and offline channels.
+
+---
+
+## v5.2.9
+
+October 7, 2026
+
+### Bug Fixes
+
+- Fixed tag stream lists reshuffling when loading more pages by paginating with Twitch’s sorted tag directory (GQL) instead of scanning Helix.
+- Fixed follow/unfollow failing with an integrity check error while logged in by confirming via a short Twitch WebView when needed.
diff --git a/docs/DESIGN-adblock.md b/docs/DESIGN-adblock.md
new file mode 100644
index 00000000..b226d01f
--- /dev/null
+++ b/docs/DESIGN-adblock.md
@@ -0,0 +1,35 @@
+# Design: Twitch ad blocking (vaft) in Frosty fork
+
+## Intent
+
+Personal Forgejo fork of Frosty blocks Twitch live ads using [TwitchAdSolutions vaft](https://github.com/pixeltris/TwitchAdSolutions) ideas, adapted to Flutter.
+
+## Upstream baseline
+
+Frosty **did not** ship an adblocker. The native player only **detects** stitched ad breaks (`adBreakStream`) to avoid bad latency/stall recovery. Turbo/sub may get `hide_ads` via linked web GQL session — server-side, not client blocking.
+
+## Strategy
+
+### Native player (primary — this is the reliable path)
+
+1. When `SettingsStore.blockTwitchAds` is true, request `PlaybackAccessToken` with `playerType=popout` (vaft `ForceAccessTokenPlayerType`) instead of `site`.
+2. When the native plugin reports an ad break, resolve a backup Usher URL trying `embed` → `popout` → `autoplay`, preferring playlists whose media m3u8 does not contain `stitched`, then `loadUrl` that stream.
+3. When the ad break ends, restore the primary popout URL.
+4. Overlay shows “Blocking ads” while `_blockingAds` is true.
+
+Implementation: `lib/apis/twitch_ad_solutions.dart`, `lib/apis/twitch_gql_api.dart`, `lib/screens/channel/video/native_video_store.dart`.
+
+### WebView player (legacy, best-effort)
+
+Inject vendored `assets/js/vaft.user.js` on page start/finish. Not true `@run-at document-start` on Android via `webview_flutter`, so native remains preferred. Enabling adblock in Settings forces native on.
+
+## Settings
+
+- `blockTwitchAds` (default `true`)
+- Turning adblock on sets `useNativePlayer = true`
+
+## Non-goals
+
+- Upstream PR
+- Full browser Worker prototype rewriting on native
+- Third-party CDN proxies unless player-type swap proves insufficient
diff --git a/docs/OBTAINIUM.md b/docs/OBTAINIUM.md
new file mode 100644
index 00000000..1a342ef0
--- /dev/null
+++ b/docs/OBTAINIUM.md
@@ -0,0 +1,45 @@
+# Obtainium (Android)
+
+Forgejo fork: [copilot/frosty](https://forgejo.fsociety00.cc/copilot/frosty) (**private**).
+
+Releases: `.forgejo/workflows/release.yml` on runner `desktop-release` (tag `v*` or workflow_dispatch).
+
+## Obtainium settings
+
+| Setting | Value |
+|---|---|
+| Source | Forgejo |
+| URL | `https://forgejo.fsociety00.cc/api/v1/repos/copilot/frosty/releases` |
+| APK filter | `frosty-arm64-v8a-v.*\.apk` |
+| Trim version | `v?([0-9]+\.[0-9]+\.[0-9]+)` |
+| Match group | `1` |
+
+Repo is private → add a Forgejo API token in Obtainium (same PAT as other Newas apps).
+
+Quick add:
+
+```text
+obtainium://add/https://forgejo.fsociety00.cc/api/v1/repos/copilot/frosty/releases
+```
+
+## Signing / Play Store conflict
+
+Package id stays `com.tommychow.frosty`. Play Store Frosty and this fork use **different signing keys**, so Obtainium cannot update stock → fork in place. Uninstall the Play build first, then install from Obtainium.
+
+## CI secrets (Forgejo repo)
+
+| Secret | Purpose |
+|---|---|
+| `RELEASE_KEYSTORE_BASE64` | Same pattern as Flow / Finamp / Jellyfin forks |
+| `STORE_PASSWORD` | Keystore password |
+| `KEY_ALIAS` | Key alias |
+| `KEY_PASSWORD` | Key password |
+| `CLIENT_ID` | Twitch Helix app client id (`--dart-define`) |
+| `SECRET` | Twitch Helix app secret (`--dart-define`) |
+
+## Cut a release
+
+1. Bump `version:` in `pubspec.yaml` (`x.y.z+build`) if needed.
+2. Tag and push: `git tag vX.Y.Z && git push origin vX.Y.Z`  
+   or run **Actions → Release APK → Run workflow**.
+3. Install / update via Obtainium once the release asset appears.
diff --git a/docs/release.md b/docs/release.md
new file mode 100644
index 00000000..f9927590
--- /dev/null
+++ b/docs/release.md
@@ -0,0 +1,57 @@
+# Release — version, notes, tag, then stores
+
+Cut a GitHub + Play + App Store release from `main`. Not a changelog dump. Not a docs rewrite.
+
+This playbook lives in the repo and loads only when you open this workspace and ask to release. It is not a global skill.
+
+Flow: **preflight → bump + notes → commit on `main` → tag → wait for workflows → publish the GitHub draft.**
+
+The tag is the mechanical trigger. This file is the judgment pass around it.
+
+## Preflight
+
+Main CI green on current `HEAD`. Then `gh workflow run "Release dry-run"` on that `main` — the monthly heartbeat is not enough after a toolchain bump.
+
+Click any pending Apple agreement first (`developer.apple.com/account`, then App Store Connect Business) or the iOS job 403s. There is no API for that. On Play, glance Console Home and **Policy and programs > App content** (`Needs attention`); a DDA banner or new declaration can block the AAB the same way.
+
+## Version
+
+Release commit on `main` is only `pubspec.yaml` (`x.y.z+build`, bump both) and `assets/release-notes.md`. Message: `release vX.Y.Z`.
+
+Features since last tag → minor. Fixes only → patch. Build number +1.
+
+Do not put `AGENTS.md` or other docs in that commit.
+
+## Notes
+
+Write for someone opening the app, not the commit log. Match the latest shipped version's voice (`Added` / `Improved` / `Fixed`). Skip CI, Flutter upgrades, codegen, and anything a user wouldn't notice; the GitHub compare link is the rest.
+
+Keep about three most recent versions, consecutive. Drop from the oldest end. Never skip a version in the middle. GitHub releases keep the full history.
+
+- Features that didn't exist last release. Improvements only for behavior that already shipped — gating a new feature (opt-in permissions, an Enable flow) is not an improvement.
+- If you can't remember the user-facing symptom, it doesn't belong.
+- `[Android]` / `[iOS]` on platform-only lines. Cluster them: one tagged line at the end of its section, two or more adjacent.
+- Credit GitHub PR authors as `(by @user on GitHub)` on each bullet they landed. Not AI, not issue reporters. The GitHub release body strips ` on GitHub` as redundant.
+
+Example shape (from v5.1.0): `Added a new experimental native video player option with quality selection…` not `Bumped better_native_video_player`.
+
+## Tag
+
+```bash
+git commit -m "release vX.Y.Z"
+git push origin main
+git tag vX.Y.Z                 # lightweight, on that commit
+git push origin vX.Y.Z         # v*.*.* triggers both workflows
+```
+
+Do not `gh release create`. **Draft GitHub release** attaches `frosty-vX.Y.Z.apk` and fills the body from this version's section in `assets/release-notes.md`. **Build and release Frosty** uploads the Play AAB and submits iOS for review (`automatic_release: true`).
+
+When the draft has the APK:
+
+```bash
+gh release edit vX.Y.Z --draft=false
+```
+
+The README latest-release badge stays stale until that publish. Store listing copy already points at GitHub — don't add per-version Play changelog files.
+
+Do not push the tag until the release commit is on `origin/main`.
diff --git a/firebase.json b/firebase.json
new file mode 100644
index 00000000..cc241c7f
--- /dev/null
+++ b/firebase.json
@@ -0,0 +1,22 @@
+{
+  "flutter": {
+    "platforms": {
+      "android": {
+        "default": {
+          "projectId": "frosty-128de",
+          "appId": "1:403282332389:android:a7ff237168bad4c30be20c",
+          "fileOutput": "android/app/google-services.json"
+        }
+      },
+      "dart": {
+        "lib/firebase_options.dart": {
+          "projectId": "frosty-128de",
+          "configurations": {
+            "android": "1:403282332389:android:a7ff237168bad4c30be20c",
+            "ios": "1:403282332389:ios:0fc3f8c3d4e80c8b0be20c"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 9625e105..391a902b 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>11.0</string>
 </dict>
 </plist>
diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock
index cc851412..7d14f995 100644
--- a/ios/Gemfile.lock
+++ b/ios/Gemfile.lock
@@ -1,43 +1,49 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
-      rexml
-    addressable (2.8.4)
-      public_suffix (>= 2.0.2, < 6.0)
-    artifactory (3.0.15)
+    CFPropertyList (3.0.8)
+    abbrev (0.1.2)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.757.0)
-    aws-sdk-core (3.171.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1260.0)
+    aws-sdk-core (3.252.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.63.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.121.0)
-      aws-sdk-core (~> 3, >= 3.165.0)
+      logger
+    aws-sdk-kms (1.129.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.225.1)
+      aws-sdk-core (~> 3, >= 3.248.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.2)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.2)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.5)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.99.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.5)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -49,32 +55,36 @@ GEM
       faraday-rack (~> 1.0)
       faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
+      http-cookie (>= 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday-retry (1.0.4)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.212.2)
-      CFPropertyList (>= 2.3, < 4.0.0)
+    fastimage (2.4.1)
+    fastlane (2.234.0)
+      CFPropertyList (>= 2.3, < 5.0.0)
+      abbrev (~> 0.1)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
+      aws-sdk-s3 (~> 1.197)
       babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
+      base64 (~> 0.2)
+      benchmark (>= 0.1.0)
+      bundler (>= 1.17.3, < 5.0.0)
+      colored (~> 1.2)
       commander (~> 4.6)
+      csv (~> 3.3)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -82,136 +92,148 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.1.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, <= 2.1.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
+      logger (>= 1.6, < 2.0)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      nkf (~> 0.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.1.0)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.41.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.0)
+    google-apis-androidpublisher_v3 (0.102.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-playcustomapp_v1 (0.13.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-iamcredentials_v1 (0.27.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.17.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.63.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.9.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-env (2.1.1)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.6.0)
+    google-cloud-storage (1.61.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
       google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.5.2)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.11.2)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
+    httpclient (2.9.0)
+      mutex_m
     jmespath (1.6.2)
-    json (2.6.3)
-    jwt (2.7.0)
-    memoist (0.16.2)
-    mini_magick (4.12.0)
-    mini_mime (1.1.2)
-    multi_json (1.15.0)
-    multipart-post (2.0.0)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
-    optparse (0.1.1)
+    json (2.19.9)
+    jwt (2.10.3)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.21.1)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
+    nkf (0.3.0)
+    optparse (0.8.1)
     os (1.1.4)
-    plist (3.7.0)
-    public_suffix (5.0.1)
-    rake (13.0.6)
+    ostruct (0.6.3)
+    plist (3.7.2)
+    public_suffix (7.0.5)
+    rake (13.4.2)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.2.5)
-    rouge (2.0.7)
+    retriable (3.8.0)
+    rexml (3.4.4)
+    rouge (3.28.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.17.0)
+    rubyzip (2.4.1)
+    security (0.1.5)
+    signet (0.22.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
+      jwt (>= 1.5, < 4.0)
     simctl (1.6.10)
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.8.1)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   arm64-darwin-21
   universal-darwin-22
+  universal-darwin-23
+  universal-darwin-24
+  x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
   fastlane
diff --git a/ios/Podfile b/ios/Podfile
index 88359b22..f17bddc9 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index d5608b35..560b1f09 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,282 +1,28 @@
 PODS:
-  - device_info_plus (0.0.1):
+  - advanced_in_app_review (0.0.1):
     - Flutter
-  - Firebase/Analytics (10.7.0):
-    - Firebase/Core
-  - Firebase/Core (10.7.0):
-    - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 10.7.0)
-  - Firebase/CoreOnly (10.7.0):
-    - FirebaseCore (= 10.7.0)
-  - Firebase/Crashlytics (10.7.0):
-    - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 10.7.0)
-  - Firebase/Performance (10.7.0):
-    - Firebase/CoreOnly
-    - FirebasePerformance (~> 10.7.0)
-  - firebase_analytics (10.2.1):
-    - Firebase/Analytics (= 10.7.0)
-    - firebase_core
-    - Flutter
-  - firebase_core (2.10.0):
-    - Firebase/CoreOnly (= 10.7.0)
-    - Flutter
-  - firebase_crashlytics (3.1.2):
-    - Firebase/Crashlytics (= 10.7.0)
-    - firebase_core
-    - Flutter
-  - firebase_performance (0.9.1-1):
-    - Firebase/Performance (= 10.7.0)
-    - firebase_core
-    - Flutter
-  - FirebaseABTesting (10.9.0):
-    - FirebaseCore (~> 10.0)
-  - FirebaseAnalytics (10.7.0):
-    - FirebaseAnalytics/AdIdSupport (= 10.7.0)
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseAnalytics/AdIdSupport (10.7.0):
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleAppMeasurement (= 10.7.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseCore (10.7.0):
-    - FirebaseCoreInternal (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreExtension (10.9.0):
-    - FirebaseCore (~> 10.0)
-  - FirebaseCoreInternal (10.9.0):
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseCrashlytics (10.7.0):
-    - FirebaseCore (~> 10.5)
-    - FirebaseInstallations (~> 10.0)
-    - FirebaseSessions (~> 10.5)
-    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/Environment (~> 7.8)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-    - PromisesObjC (~> 2.1)
-  - FirebaseInstallations (10.9.0):
-    - FirebaseCore (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/UserDefaults (~> 7.8)
-    - PromisesObjC (~> 2.1)
-  - FirebasePerformance (10.7.0):
-    - FirebaseCore (~> 10.5)
-    - FirebaseInstallations (~> 10.0)
-    - FirebaseRemoteConfig (~> 10.0)
-    - FirebaseSessions (~> 10.5)
-    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/Environment (~> 7.8)
-    - GoogleUtilities/ISASwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - FirebaseRemoteConfig (10.9.0):
-    - FirebaseABTesting (~> 10.0)
-    - FirebaseCore (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleUtilities/Environment (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseSessions (10.9.0):
-    - FirebaseCore (~> 10.5)
-    - FirebaseCoreExtension (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/Environment (~> 7.10)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-    - PromisesSwift (~> 2.1)
   - Flutter (1.0.0)
-  - flutter_native_splash (0.0.1):
-    - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
-  - GoogleAppMeasurement (10.7.0):
-    - GoogleAppMeasurement/AdIdSupport (= 10.7.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleAppMeasurement/AdIdSupport (10.7.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 10.7.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (10.7.0):
-    - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
-    - GoogleUtilities/MethodSwizzler (~> 7.8)
-    - GoogleUtilities/Network (~> 7.8)
-    - "GoogleUtilities/NSData+zlib (~> 7.8)"
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-  - GoogleDataTransport (9.2.2):
-    - GoogleUtilities/Environment (~> 7.7)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.11.1):
-    - GoogleUtilities/Environment
-    - GoogleUtilities/Logger
-    - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.11.1):
-    - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/ISASwizzler (7.11.1)
-  - GoogleUtilities/Logger (7.11.1):
-    - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (7.11.1):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/Network (7.11.1):
-    - GoogleUtilities/Logger
-    - "GoogleUtilities/NSData+zlib"
-    - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.11.1)"
-  - GoogleUtilities/Reachability (7.11.1):
-    - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.11.1):
-    - GoogleUtilities/Logger
-  - nanopb (2.30909.0):
-    - nanopb/decode (= 2.30909.0)
-    - nanopb/encode (= 2.30909.0)
-  - nanopb/decode (2.30909.0)
-  - nanopb/encode (2.30909.0)
-  - package_info_plus (0.4.5):
-    - Flutter
-  - path_provider_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - PromisesObjC (2.2.0)
-  - PromisesSwift (2.2.0):
-    - PromisesObjC (= 2.2.0)
-  - shared_preferences_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - sqflite (0.0.2):
-    - Flutter
-    - FMDB (>= 2.7.5)
-  - url_launcher_ios (0.0.1):
-    - Flutter
-  - wakelock (0.0.1):
-    - Flutter
-  - webview_flutter_wkwebview (0.0.1):
-    - Flutter
 
 DEPENDENCIES:
-  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
-  - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`)
-  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
-  - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
-  - firebase_performance (from `.symlinks/plugins/firebase_performance/ios`)
+  - advanced_in_app_review (from `.symlinks/plugins/advanced_in_app_review/ios`)
   - Flutter (from `Flutter`)
-  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
-  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
-  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - wakelock (from `.symlinks/plugins/wakelock/ios`)
-  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
-
-SPEC REPOS:
-  trunk:
-    - Firebase
-    - FirebaseABTesting
-    - FirebaseAnalytics
-    - FirebaseCore
-    - FirebaseCoreExtension
-    - FirebaseCoreInternal
-    - FirebaseCrashlytics
-    - FirebaseInstallations
-    - FirebasePerformance
-    - FirebaseRemoteConfig
-    - FirebaseSessions
-    - FMDB
-    - GoogleAppMeasurement
-    - GoogleDataTransport
-    - GoogleUtilities
-    - nanopb
-    - PromisesObjC
-    - PromisesSwift
 
 EXTERNAL SOURCES:
-  device_info_plus:
-    :path: ".symlinks/plugins/device_info_plus/ios"
-  firebase_analytics:
-    :path: ".symlinks/plugins/firebase_analytics/ios"
-  firebase_core:
-    :path: ".symlinks/plugins/firebase_core/ios"
-  firebase_crashlytics:
-    :path: ".symlinks/plugins/firebase_crashlytics/ios"
-  firebase_performance:
-    :path: ".symlinks/plugins/firebase_performance/ios"
+  advanced_in_app_review:
+    :path: ".symlinks/plugins/advanced_in_app_review/ios"
   Flutter:
     :path: Flutter
-  flutter_native_splash:
-    :path: ".symlinks/plugins/flutter_native_splash/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
-  package_info_plus:
-    :path: ".symlinks/plugins/package_info_plus/ios"
-  path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/ios"
-  shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/ios"
-  url_launcher_ios:
-    :path: ".symlinks/plugins/url_launcher_ios/ios"
-  wakelock:
-    :path: ".symlinks/plugins/wakelock/ios"
-  webview_flutter_wkwebview:
-    :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
 
 SPEC CHECKSUMS:
-  device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
-  Firebase: 0219acf760880eeec8ce479895bd7767466d9f81
-  firebase_analytics: e8e294333de66e5429d4aac365966281b4dbfb7d
-  firebase_core: 18d44f087248303a4a8f05d0099a000c46e3c77a
-  firebase_crashlytics: 621d91c0c5752e8219f8fe05a4d1e76394f4896a
-  firebase_performance: 7dd98298ea2f19f480efd59ccbfcad3972ced984
-  FirebaseABTesting: 005b70969e2817e2a1e631e8dba29134a04c0622
-  FirebaseAnalytics: f8133442ee6f8512e28ff19e62ce15398bfaeace
-  FirebaseCore: e317665b9d744727a97e623edbbed009320afdd7
-  FirebaseCoreExtension: d3e9bba2930a8033042112397cd9f006a1bb203d
-  FirebaseCoreInternal: d2b4acb827908e72eca47a9fd896767c3053921e
-  FirebaseCrashlytics: 35fdd1a433b31e28adcf5c8933f4c526691a1e0b
-  FirebaseInstallations: c58489c9caacdbf27d1da60891a87318e20218e0
-  FirebasePerformance: 8281bbaf08aad194001018b932115b7d58a6f00b
-  FirebaseRemoteConfig: 5ea5834e8c518f377bf1af2d97ebd611914ebf2d
-  FirebaseSessions: 44a6782502eb279a214d4adca20891353278760c
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
-  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  GoogleAppMeasurement: fe17c92a32207dd5cdd4e8d742767f2da74857f6
-  GoogleDataTransport: 8378d1fa8ac49753ea6ce70d65a7cb70ce5f66e6
-  GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
-  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
-  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
-  PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
-  PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959
-  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
-  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
-  wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
-  webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
+  advanced_in_app_review: daebe4c801525b756fe589de60fd327cb12f965c
+  Flutter: 71a624a5bc0c04062bf19101d501e466baf2fb47
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
 
-PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
+PODFILE CHECKSUM: 57c8aed26fba39d3ec9424816221f294a07c58eb
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.16.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 519ca847..c83d966a 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -11,10 +11,13 @@
 		3985845DB766D700CF6E4C8E /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E751BC99755AAC391DC0B29F /* Pods_Runner.framework */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
+		F1C00CE01A2B3C4D00E5F6A8 /* CookieExtractorPlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1C00CE01A2B3C4D00E5F6A7 /* CookieExtractorPlugin.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
 		BE8095795EAFF58C08A43B48 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A68609F67C30CFEF267CD4D3 /* GoogleService-Info.plist */; };
+		D4F5A60712340001ABCD1234 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = D4F5A60712340002ABCD5678 /* PrivacyInfo.xcprivacy */; };
+		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -37,6 +40,7 @@
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		F1C00CE01A2B3C4D00E5F6A7 /* CookieExtractorPlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CookieExtractorPlugin.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
 		95D7E205EE04D01F6996ECFC /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
@@ -48,7 +52,9 @@
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		A68609F67C30CFEF267CD4D3 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		CFF3F6A0DA5A835B219C2D3C /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		D4F5A60712340002ABCD5678 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		E751BC99755AAC391DC0B29F /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -56,6 +62,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */,
 				3985845DB766D700CF6E4C8E /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -66,6 +73,7 @@
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -104,7 +112,9 @@
 				1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */,
 				1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */,
 				74858FAE1ED2DC5600515810 /* AppDelegate.swift */,
+				F1C00CE01A2B3C4D00E5F6A7 /* CookieExtractorPlugin.swift */,
 				74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */,
+			D4F5A60712340002ABCD5678 /* PrivacyInfo.xcprivacy */,
 			);
 			path = Runner;
 			sourceTree = "<group>";
@@ -131,6 +141,9 @@
 
 /* Begin PBXNativeTarget section */
 		97C146ED1CF9000F007C117D /* Runner */ = {
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
@@ -157,9 +170,12 @@
 
 /* Begin PBXProject section */
 		97C146E61CF9000F007C117D /* Project object */ = {
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+			);
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -196,6 +212,7 @@
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
 				BE8095795EAFF58C08A43B48 /* GoogleService-Info.plist in Resources */,
+			D4F5A60712340001ABCD1234 /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -242,7 +259,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"$PODS_ROOT/FirebaseCrashlytics/upload-symbols\" --flutter-project \"$PROJECT_DIR/firebase_app_id_file.json\" ";
+			shellScript = "# Symbol upload only matters for builds that ship; Debug dSYMs are absent or empty and fail the tool.\nif [ \"$CONFIGURATION\" = \"Debug\" ]; then\n  echo \"Skipping Crashlytics symbol upload for Debug build\"\n  exit 0\nfi\n# Locate upload-symbols whether Firebase is integrated via CocoaPods or Swift Package Manager.\nBIN=\"$PODS_ROOT/FirebaseCrashlytics/upload-symbols\"\n[ -f \"$BIN\" ] || BIN=\"${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/upload-symbols\"\n\"$BIN\" --flutter-project \"$PROJECT_DIR/firebase_app_id_file.json\"\n";
 		};
 		34CC65D58A1948B306772884 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -268,6 +285,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -299,6 +317,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */,
+				F1C00CE01A2B3C4D00E5F6A8 /* CookieExtractorPlugin.swift in Sources */,
 				1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -366,7 +385,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -380,6 +399,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -447,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -496,7 +516,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -512,6 +532,7 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -538,6 +559,7 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
@@ -582,6 +604,18 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+/* Begin XCLocalSwiftPackageReference section */
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCLocalSwiftPackageReference section */
+/* Begin XCSwiftPackageProductDependency section */
+		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = FlutterGeneratedPluginSwiftPackage;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }
diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..6839f6d5
--- /dev/null
+++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,122 @@
+{
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
+        "version" : "1.2024072200.0"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "bb4002485ff867768dec13bf904a2ddb050bd1b1",
+        "version" : "11.3.0"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "33a468adfdb75b53f05a37e7c886ca7c962b5c17",
+        "version" : "12.17.0"
+      }
+    },
+    {
+      "identity" : "google-ads-on-device-conversion-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
+      "state" : {
+        "revision" : "9bfcc6cf435b2e7c5562c1900b8680c594fa9a64",
+        "version" : "3.6.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "fceaffa07d22dcd5624d3639fd970351a4a5ad8c",
+        "version" : "12.17.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
+        "version" : "10.1.0"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "c46e5f8b7c23265f17c24ca7f9fa1b13ded7a822",
+        "version" : "8.1.1"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+        "version" : "1.69.1"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "c0ac7575d70050c2973ba2318bd5af47f8e8153a",
+        "version" : "5.3.0"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
+        "version" : "101.0.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "3851d94a41890dea16dc3db34caf60e585cb4163",
+        "version" : "2.30910.1"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "f4a19a3c313dc2616c70bb49d29a799fb16be837",
+        "version" : "2.4.1"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index c87d15a3..5db441f5 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,10 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Prepare Flutter Framework Script"
+               scriptText = "/bin/sh &quot;$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh&quot; prepare&#10;">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+                     BuildableName = "Runner.app"
+                     BlueprintName = "Runner"
+                     ReferencedContainer = "container:Runner.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -26,6 +44,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -43,11 +62,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 00000000..6839f6d5
--- /dev/null
+++ b/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,122 @@
+{
+  "pins" : [
+    {
+      "identity" : "abseil-cpp-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/abseil-cpp-binary.git",
+      "state" : {
+        "revision" : "bbe8b69694d7873315fd3a4ad41efe043e1c07c5",
+        "version" : "1.2024072200.0"
+      }
+    },
+    {
+      "identity" : "app-check",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/app-check.git",
+      "state" : {
+        "revision" : "bb4002485ff867768dec13bf904a2ddb050bd1b1",
+        "version" : "11.3.0"
+      }
+    },
+    {
+      "identity" : "firebase-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/firebase-ios-sdk",
+      "state" : {
+        "revision" : "33a468adfdb75b53f05a37e7c886ca7c962b5c17",
+        "version" : "12.17.0"
+      }
+    },
+    {
+      "identity" : "google-ads-on-device-conversion-ios-sdk",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk",
+      "state" : {
+        "revision" : "9bfcc6cf435b2e7c5562c1900b8680c594fa9a64",
+        "version" : "3.6.0"
+      }
+    },
+    {
+      "identity" : "googleappmeasurement",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleAppMeasurement.git",
+      "state" : {
+        "revision" : "fceaffa07d22dcd5624d3639fd970351a4a5ad8c",
+        "version" : "12.17.0"
+      }
+    },
+    {
+      "identity" : "googledatatransport",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleDataTransport.git",
+      "state" : {
+        "revision" : "617af071af9aa1d6a091d59a202910ac482128f9",
+        "version" : "10.1.0"
+      }
+    },
+    {
+      "identity" : "googleutilities",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleUtilities.git",
+      "state" : {
+        "revision" : "c46e5f8b7c23265f17c24ca7f9fa1b13ded7a822",
+        "version" : "8.1.1"
+      }
+    },
+    {
+      "identity" : "grpc-binary",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/grpc-binary.git",
+      "state" : {
+        "revision" : "75b31c842f664a0f46a2e590a570e370249fd8f6",
+        "version" : "1.69.1"
+      }
+    },
+    {
+      "identity" : "gtm-session-fetcher",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/gtm-session-fetcher.git",
+      "state" : {
+        "revision" : "c0ac7575d70050c2973ba2318bd5af47f8e8153a",
+        "version" : "5.3.0"
+      }
+    },
+    {
+      "identity" : "interop-ios-for-google-sdks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/interop-ios-for-google-sdks.git",
+      "state" : {
+        "revision" : "040d087ac2267d2ddd4cca36c757d1c6a05fdbfe",
+        "version" : "101.0.0"
+      }
+    },
+    {
+      "identity" : "leveldb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/leveldb.git",
+      "state" : {
+        "revision" : "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+        "version" : "1.22.5"
+      }
+    },
+    {
+      "identity" : "nanopb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/firebase/nanopb.git",
+      "state" : {
+        "revision" : "3851d94a41890dea16dc3db34caf60e585cb4163",
+        "version" : "2.30910.1"
+      }
+    },
+    {
+      "identity" : "promises",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/promises.git",
+      "state" : {
+        "revision" : "f4a19a3c313dc2616c70bb49d29a799fb16be837",
+        "version" : "2.4.1"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
index 70693e4a..a51f2738 100644
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,13 +1,24 @@
-import UIKit
-import Flutter
-
-@UIApplicationMain
-@objc class AppDelegate: FlutterAppDelegate {
-  override func application(
-    _ application: UIApplication,
-    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
-  ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-  }
-}
+import Flutter
+import UIKit
+
+@main
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
+  override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+  ) -> Bool {
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+
+  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
+    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+    guard let cookieExtractorRegistrar = engineBridge.pluginRegistry.registrar(
+      forPlugin: "CookieExtractorPlugin"
+    ) else {
+      assertionFailure("Failed to create CookieExtractorPlugin registrar")
+      return
+    }
+    CookieExtractorPlugin.register(with: cookieExtractorRegistrar)
+  }
+}
+
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 65e45c48..0c07f1fd 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index b45507c1..83084f78 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index d56cc8fd..604f87bf 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/CookieExtractorPlugin.swift b/ios/Runner/CookieExtractorPlugin.swift
new file mode 100644
index 00000000..24495865
--- /dev/null
+++ b/ios/Runner/CookieExtractorPlugin.swift
@@ -0,0 +1,27 @@
+import Flutter
+import WebKit
+
+class CookieExtractorPlugin: NSObject, FlutterPlugin {
+    static func register(with registrar: FlutterPluginRegistrar) {
+        let channel = FlutterMethodChannel(
+            name: "frosty/cookie_extractor",
+            binaryMessenger: registrar.messenger()
+        )
+        let instance = CookieExtractorPlugin()
+        registrar.addMethodCallDelegate(instance, channel: channel)
+    }
+
+    func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        if call.method == "extractTwitchAuthToken" {
+            WKWebsiteDataStore.default().httpCookieStore.getAllCookies { cookies in
+                let authCookie = cookies.first {
+                    $0.name == "auth-token" &&
+                        ($0.domain == "twitch.tv" || $0.domain.hasSuffix(".twitch.tv"))
+                }
+                result(authCookie?.value)
+            }
+        } else {
+            result(FlutterMethodNotImplemented)
+        }
+    }
+}
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 2f78432e..1f85dcd5 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -48,13 +48,36 @@
 			<string>UIInterfaceOrientationLandscapeLeft</string>
 			<string>UIInterfaceOrientationLandscapeRight</string>
 		</array>
-		<key>UIViewControllerBasedStatusBarAppearance</key>
-		<true/>
-		<key>UIStatusBarHidden</key>
-		<false/>
 		<key>CADisableMinimumFrameDurationOnPhone</key>
 		<true/>
 		<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
+		<true/>
+		<key>UIApplicationSceneManifest</key>
+		<dict>
+			<key>UIApplicationSupportsMultipleScenes</key>
+			<false/>
+			<key>UISceneConfigurations</key>
+			<dict>
+				<key>UIWindowSceneSessionRoleApplication</key>
+				<array>
+					<dict>
+						<key>UISceneClassName</key>
+						<string>UIWindowScene</string>
+						<key>UISceneDelegateClassName</key>
+						<string>FlutterSceneDelegate</string>
+						<key>UISceneConfigurationName</key>
+						<string>flutter</string>
+						<key>UISceneStoryboardFile</key>
+						<string>Main</string>
+					</dict>
+				</array>
+			</dict>
+		</dict>
+		<key>UIStatusBarHidden</key>
+		<false/>
+		<key>UIBackgroundModes</key>
+		<array>
+			<string>audio</string>
+		</array>
+	</dict>
 </plist>
diff --git a/ios/Runner/PrivacyInfo.xcprivacy b/ios/Runner/PrivacyInfo.xcprivacy
new file mode 100644
index 00000000..a34b7e2e
--- /dev/null
+++ b/ios/Runner/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array/>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 78bcb074..df241cb0 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -17,7 +17,9 @@ default_platform(:ios)
 
 platform :ios do
   desc 'Push a new release build to the App Store'
-  lane :release do
+  lane :release do |options|
+    dry_run = options[:dry_run] || false
+
     # Setup for CI. Uses a keychain to prevent the CI from hanging due to password prompts.
     setup_ci
 
@@ -29,8 +31,9 @@ platform :ios do
       is_key_content_base64: true
     )
 
-    # Manage code signing (with match).
-    sync_code_signing
+    # Manage code signing (with match). readonly on a dry run so we only verify the
+    # existing cert/profile resolve and never regenerate or mutate the certificates repo.
+    sync_code_signing(readonly: dry_run)
 
     # Automatic signing is used during development, but fastlane needs to use manual signing.
     update_code_signing_settings(
@@ -45,6 +48,11 @@ platform :ios do
       output_directory: '../build/ios/archive'
     )
 
+    # On a dry run, stop here: the signed archive above exercises every step that
+    # actually fails (ASC key, match certs/profiles, signing, release build). The
+    # App Store upload itself is the only remaining unverified step.
+    next if dry_run
+
     # Upload the app to the App Store.
     upload_to_app_store(
       submit_for_review: true,
diff --git a/ios/fastlane/metadata/copyright.txt b/ios/fastlane/metadata/copyright.txt
index 37d72ff1..1967ce48 100644
--- a/ios/fastlane/metadata/copyright.txt
+++ b/ios/fastlane/metadata/copyright.txt
@@ -1 +1 @@
-2023 Tommy Chow
+2026 Tommy Chow
diff --git a/ios/fastlane/metadata/en-US/name.txt b/ios/fastlane/metadata/en-US/name.txt
index 533e8f10..445c1415 100644
--- a/ios/fastlane/metadata/en-US/name.txt
+++ b/ios/fastlane/metadata/en-US/name.txt
@@ -1 +1 @@
-Frosty for Twitch
+Frosty
diff --git a/ios/fastlane/metadata/en-US/privacy_url.txt b/ios/fastlane/metadata/en-US/privacy_url.txt
index 1bd5f1a2..4350465a 100644
--- a/ios/fastlane/metadata/en-US/privacy_url.txt
+++ b/ios/fastlane/metadata/en-US/privacy_url.txt
@@ -1 +1 @@
-https://www.privacypolicies.com/live/095b4264-31b1-4280-837e-5843abde8b16
+https://frostyapp.io/privacy
diff --git a/ios/fastlane/metadata/en-US/promotional_text.txt b/ios/fastlane/metadata/en-US/promotional_text.txt
index e633a6b1..cf35ecf1 100644
--- a/ios/fastlane/metadata/en-US/promotional_text.txt
+++ b/ios/fastlane/metadata/en-US/promotional_text.txt
@@ -1 +1 @@
-Watch and chat on Twitch with your favorite emotes from 7TV, BTTV, and FFZ!
\ No newline at end of file
+Watch live streams and see community emotes in chat.
diff --git a/ios/fastlane/metadata/en-US/release_notes.txt b/ios/fastlane/metadata/en-US/release_notes.txt
index 87946d58..37b5ab1f 100644
--- a/ios/fastlane/metadata/en-US/release_notes.txt
+++ b/ios/fastlane/metadata/en-US/release_notes.txt
@@ -1,2 +1 @@
-Bug Fixes
-• Fixed chatters not sorted alphabetically
\ No newline at end of file
+See full release notes at https://github.com/tommyxchow/frosty/releases
\ No newline at end of file
diff --git a/ios/fastlane/metadata/en-US/subtitle.txt b/ios/fastlane/metadata/en-US/subtitle.txt
index 0712b6dc..8c1195c5 100644
--- a/ios/fastlane/metadata/en-US/subtitle.txt
+++ b/ios/fastlane/metadata/en-US/subtitle.txt
@@ -1 +1 @@
-See 7TV, BTTV, and FFZ emotes!
+Community emotes in chat
diff --git a/lib/apis/base_api_client.dart b/lib/apis/base_api_client.dart
new file mode 100644
index 00000000..87163d84
--- /dev/null
+++ b/lib/apis/base_api_client.dart
@@ -0,0 +1,269 @@
+import 'package:dio/dio.dart';
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+
+/// Common type aliases to reduce repetition
+typedef JsonMap = Map<String, dynamic>;
+typedef JsonList = List<dynamic>;
+typedef QueryParams = Map<String, dynamic>;
+typedef ApiHeaders = Map<String, String>;
+
+/// Custom API exceptions for better error handling
+class ApiException implements Exception {
+  final String message;
+  final int? statusCode;
+  final DioExceptionType? type;
+
+  const ApiException(this.message, [this.statusCode, this.type]);
+
+  @override
+  String toString() => 'ApiException: $message';
+}
+
+class NetworkException extends ApiException {
+  const NetworkException(String message)
+    : super(message, null, DioExceptionType.connectionError);
+}
+
+class TimeoutException extends ApiException {
+  const TimeoutException(String message)
+    : super(message, null, DioExceptionType.connectionTimeout);
+}
+
+class ServerException extends ApiException {
+  const ServerException(String message, int statusCode)
+    : super(message, statusCode, DioExceptionType.badResponse);
+}
+
+class NotFoundException extends ApiException {
+  const NotFoundException(String message)
+    : super(message, 404, DioExceptionType.badResponse);
+}
+
+class UnauthorizedException extends ApiException {
+  const UnauthorizedException(String message)
+    : super(message, 401, DioExceptionType.badResponse);
+}
+
+/// Twitch GQL rejected the request for a missing/invalid Client-Integrity token.
+class IntegrityCheckException extends ApiException {
+  const IntegrityCheckException([
+    String message = 'Twitch integrity check failed',
+  ]) : super(message);
+}
+
+/// Base API client to eliminate code duplication across API services
+abstract class BaseApiClient {
+  final Dio _dio;
+  final String baseUrl;
+
+  const BaseApiClient(this._dio, this.baseUrl);
+
+  /// Builds the full URL, handling both relative endpoints and full URLs
+  String _buildUrl(String endpoint) {
+    // If endpoint is already a full URL (starts with http:// or https://), use it as-is
+    if (endpoint.startsWith('http://') || endpoint.startsWith('https://')) {
+      return endpoint;
+    }
+    // Otherwise, concatenate with base URL
+    return '$baseUrl$endpoint';
+  }
+
+  /// Generic GET request with common error handling
+  Future<T> get<T>(
+    String endpoint, {
+    QueryParams? queryParameters,
+    ApiHeaders? headers,
+    CancelToken? cancelToken,
+  }) async {
+    try {
+      final url = _buildUrl(endpoint);
+      final response = await _dio.get(
+        url,
+        queryParameters: queryParameters,
+        options: Options(headers: headers),
+        cancelToken: cancelToken,
+      );
+      return response.data as T;
+    } on DioException catch (e) {
+      throw _handleError(e);
+    }
+  }
+
+  /// Generic POST request with common error handling
+  Future<T> post<T>(
+    String endpoint, {
+    dynamic data,
+    QueryParams? queryParameters,
+    ApiHeaders? headers,
+    CancelToken? cancelToken,
+  }) async {
+    try {
+      final url = _buildUrl(endpoint);
+      final response = await _dio.post(
+        url,
+        data: data,
+        queryParameters: queryParameters,
+        options: Options(headers: headers),
+        cancelToken: cancelToken,
+      );
+      return response.data as T;
+    } on DioException catch (e) {
+      throw _handleError(e);
+    }
+  }
+
+  /// Generic PUT request with common error handling
+  Future<T> put<T>(
+    String endpoint, {
+    dynamic data,
+    QueryParams? queryParameters,
+    ApiHeaders? headers,
+    CancelToken? cancelToken,
+  }) async {
+    try {
+      final url = _buildUrl(endpoint);
+      final response = await _dio.put(
+        url,
+        data: data,
+        queryParameters: queryParameters,
+        options: Options(headers: headers),
+        cancelToken: cancelToken,
+      );
+      return response.data as T;
+    } on DioException catch (e) {
+      throw _handleError(e);
+    }
+  }
+
+  /// Generic DELETE request with common error handling
+  Future<T> delete<T>(
+    String endpoint, {
+    QueryParams? queryParameters,
+    ApiHeaders? headers,
+    CancelToken? cancelToken,
+  }) async {
+    try {
+      final url = _buildUrl(endpoint);
+      final response = await _dio.delete(
+        url,
+        queryParameters: queryParameters,
+        options: Options(headers: headers),
+        cancelToken: cancelToken,
+      );
+      return response.data as T;
+    } on DioException catch (e) {
+      throw _handleError(e);
+    }
+  }
+
+  /// Check if response indicates success (useful for status-only operations)
+  bool isSuccessResponse(Response response) {
+    return response.statusCode != null &&
+        response.statusCode! >= 200 &&
+        response.statusCode! < 300;
+  }
+
+  /// Converts DioException to appropriate ApiException subtype
+  ApiException _handleError(DioException error) {
+    final exception = switch (error.type) {
+      DioExceptionType.connectionTimeout ||
+      DioExceptionType.sendTimeout ||
+      DioExceptionType.receiveTimeout ||
+      DioExceptionType.transformTimeout =>
+        TimeoutException(_getTimeoutMessage(error.type)),
+      DioExceptionType.connectionError => NetworkException(
+        'No internet connection. Please check your network.',
+      ),
+      DioExceptionType.badResponse => _handleHttpError(error),
+      DioExceptionType.cancel => ApiException('Request was cancelled'),
+      DioExceptionType.badCertificate =>
+        ApiException('Security certificate error'),
+      DioExceptionType.unknown =>
+        ApiException(error.message ?? 'An unexpected error occurred'),
+    };
+
+    // Record server errors and unexpected failures to Crashlytics.
+    // Skip timeouts, network errors (normal offline conditions), 401s, and cancellations.
+    if (exception is ServerException ||
+        error.type == DioExceptionType.unknown ||
+        error.type == DioExceptionType.badCertificate) {
+      try {
+        FirebaseCrashlytics.instance.recordError(
+          exception,
+          error.stackTrace,
+          reason: '${error.requestOptions.method} ${error.requestOptions.uri}',
+        );
+      } catch (_) {
+        // Firebase may not be initialized (e.g., in tests).
+      }
+    }
+
+    return exception;
+  }
+
+  /// Gets specific timeout message based on timeout type
+  String _getTimeoutMessage(DioExceptionType type) {
+    switch (type) {
+      case DioExceptionType.connectionTimeout:
+        return 'Connection timeout. Please try again.';
+      case DioExceptionType.sendTimeout:
+        return 'Upload timeout. Please try again.';
+      case DioExceptionType.receiveTimeout:
+        return 'Server response timeout. Please try again.';
+      case DioExceptionType.transformTimeout:
+        return 'Response processing timeout. Please try again.';
+      default:
+        return 'Request timeout. Please try again.';
+    }
+  }
+
+  /// Handles HTTP status code errors with specific exception types
+  ApiException _handleHttpError(DioException error) {
+    final statusCode = error.response?.statusCode;
+    final responseData = error.response?.data;
+
+    // Extract error message from server response
+    String? serverMessage;
+    if (responseData is JsonMap) {
+      serverMessage =
+          responseData['message'] as String? ??
+          responseData['error'] as String? ??
+          responseData['error_description'] as String?;
+    }
+
+    switch (statusCode) {
+      case 400:
+        return ApiException(serverMessage ?? 'Invalid request data');
+      case 401:
+        return UnauthorizedException('Please log in to continue');
+      case 403:
+        return ApiException('Access denied. Insufficient permissions');
+      case 404:
+        return NotFoundException(serverMessage ?? 'Resource not found');
+      case 409:
+        return ApiException('Conflict with current state. Please refresh');
+      case 422:
+        return ApiException(serverMessage ?? 'Invalid data provided');
+      case 429:
+        return ApiException(
+          'Rate limit exceeded. Please wait before trying again',
+        );
+      case 500:
+        return ServerException('Server error. Please try again later', 500);
+      case 502:
+        return ServerException('Service temporarily unavailable', 502);
+      case 503:
+        return ServerException(
+          'Service maintenance. Please try again later',
+          503,
+        );
+      case 504:
+        return ServerException('Server timeout. Please try again', 504);
+      default:
+        return ServerException(
+          serverMessage ?? 'HTTP Error $statusCode occurred',
+          statusCode ?? 500,
+        );
+    }
+  }
+}
diff --git a/lib/apis/bttv_api.dart b/lib/apis/bttv_api.dart
index e4507a1d..e65da2a2 100644
--- a/lib/apis/bttv_api.dart
+++ b/lib/apis/bttv_api.dart
@@ -1,71 +1,55 @@
-import 'dart:convert';
-
+import 'package:dio/dio.dart';
+import 'package:frosty/apis/base_api_client.dart';
 import 'package:frosty/models/badges.dart';
 import 'package:frosty/models/emotes.dart';
-import 'package:http/http.dart';
 
 /// The BTTV service for making API calls.
-class BTTVApi {
-  final Client _client;
-
-  const BTTVApi(this._client);
+class BTTVApi extends BaseApiClient {
+  BTTVApi(Dio dio) : super(dio, 'https://api.betterttv.net/3/cached');
 
   /// Returns a map of global BTTV emotes to their URL.
   Future<List<Emote>> getEmotesGlobal() async {
-    final url = Uri.parse('https://api.betterttv.net/3/cached/emotes/global');
+    final data = await get<JsonList>('/emotes/global');
 
-    final response = await _client.get(url);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body) as List;
-      final emotes = decoded.map((emote) => EmoteBTTV.fromJson(emote)).toList();
+    final emotes = data.map((emote) => EmoteBTTV.fromJson(emote)).toList();
 
-      return emotes
-          .map((emote) => Emote.fromBTTV(emote, EmoteType.bttvGlobal))
-          .toList();
-    } else {
-      return Future.error('Failed to get BTTV global emotes');
-    }
+    return emotes
+        .map((emote) => Emote.fromBTTV(emote, EmoteType.bttvGlobal))
+        .toList();
   }
 
   /// Returns a map of a channel's BTTV emotes to their URL.
   Future<List<Emote>> getEmotesChannel({required String id}) async {
-    final url =
-        Uri.parse('https://api.betterttv.net/3/cached/users/twitch/$id');
+    final data = await get<JsonMap>('/users/twitch/$id');
 
-    final response = await _client.get(url);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body);
-      final result = EmoteBTTVChannel.fromJson(decoded);
+    final result = EmoteBTTVChannel.fromJson(data);
 
-      final emoteToUrl = <Emote>[];
-      emoteToUrl.addAll(result.channelEmotes
-          .map((emote) => Emote.fromBTTV(emote, EmoteType.bttvChannel)));
-      emoteToUrl.addAll(result.sharedEmotes
-          .map((emote) => Emote.fromBTTV(emote, EmoteType.bttvShared)));
+    final emoteToUrl = <Emote>[];
+    emoteToUrl.addAll(
+      result.channelEmotes.map(
+        (emote) => Emote.fromBTTV(emote, EmoteType.bttvChannel),
+      ),
+    );
+    emoteToUrl.addAll(
+      result.sharedEmotes.map(
+        (emote) => Emote.fromBTTV(emote, EmoteType.bttvShared),
+      ),
+    );
 
-      return emoteToUrl;
-    } else {
-      return Future.error('Failed to get BTTV channel emotes');
-    }
+    return emoteToUrl;
   }
 
   /// Returns a map of username to their BTTV badge.
   Future<Map<String, ChatBadge>> getBadges() async {
-    final url = Uri.parse('https://api.betterttv.net/3/cached/badges');
+    final data = await get<JsonList>('/badges');
 
-    final response = await _client.get(url);
-    if (response.statusCode == 200) {
-      final badges = jsonDecode(response.body) as List;
+    final badgeObjects = data
+        .map((badge) => BadgeInfoBTTV.fromJson(badge))
+        .toList();
 
-      final badgeObjects =
-          badges.map((badge) => BadgeInfoBTTV.fromJson(badge)).toList();
-
-      return {
-        for (final badge in badgeObjects)
-          badge.providerId: ChatBadge.fromBTTV(badge)
-      };
-    } else {
-      return Future.error('Failed to get BTTV badges');
-    }
+    return {
+      for (final badge in badgeObjects)
+        badge.providerId: ChatBadge.fromBTTV(badge),
+    };
   }
 }
diff --git a/lib/apis/dio_client.dart b/lib/apis/dio_client.dart
new file mode 100644
index 00000000..1ba5e538
--- /dev/null
+++ b/lib/apis/dio_client.dart
@@ -0,0 +1,71 @@
+import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
+import 'package:frosty/apis/firebase_performance_interceptor.dart';
+
+/// Centralized Dio client configuration with interceptors and error handling
+class DioClient {
+  static Dio createClient({List<Interceptor>? additionalInterceptors}) {
+    final dio = Dio();
+
+    // Optimized configuration based on 2024-2025 best practices
+    dio.options = BaseOptions(
+      connectTimeout: const Duration(
+        seconds: 8,
+      ), // Balanced for various networks
+      receiveTimeout: const Duration(
+        seconds: 15,
+      ), // Allow for larger API responses
+      sendTimeout: const Duration(seconds: 10), // Reasonable for uploads
+      headers: {
+        'User-Agent': 'Frosty (Flutter Twitch Client)',
+        'Accept': 'application/json',
+        'Content-Type': 'application/json',
+        'Connection': 'keep-alive', // Enable connection reuse
+      },
+      followRedirects: true,
+      maxRedirects: 3, // Reduced for better performance
+      persistentConnection: true, // Enable connection pooling
+    );
+
+    // Simple logging for debug builds
+    if (kDebugMode) {
+      dio.interceptors.add(
+        InterceptorsWrapper(
+          onRequest: (options, handler) {
+            debugPrint('→ ${options.method} ${options.uri}');
+            handler.next(options);
+          },
+          onResponse: (response, handler) {
+            final statusCode = response.statusCode ?? 0;
+            final emoji = statusCode >= 200 && statusCode < 300 ? '✅' : '❌';
+            debugPrint(
+              '$emoji ${response.statusCode} ${response.requestOptions.method} ${response.requestOptions.uri}',
+            );
+            handler.next(response);
+          },
+          onError: (error, handler) {
+            debugPrint(
+              '❌ ${error.type.name} ${error.requestOptions.method} ${error.requestOptions.uri}',
+            );
+            if (error.response != null) {
+              debugPrint('   Status: ${error.response!.statusCode}');
+            }
+            handler.next(error);
+          },
+        ),
+      );
+    }
+
+    // Trace HTTP requests as Firebase Performance metrics
+    dio.interceptors.add(FirebasePerformanceInterceptor());
+
+    // Add any additional interceptors provided
+    if (additionalInterceptors != null) {
+      for (final interceptor in additionalInterceptors) {
+        dio.interceptors.add(interceptor);
+      }
+    }
+
+    return dio;
+  }
+}
diff --git a/lib/apis/ffz_api.dart b/lib/apis/ffz_api.dart
index e59a21e1..32e70d19 100644
--- a/lib/apis/ffz_api.dart
+++ b/lib/apis/ffz_api.dart
@@ -1,90 +1,69 @@
-import 'dart:convert';
-
+import 'package:dio/dio.dart';
+import 'package:frosty/apis/base_api_client.dart';
 import 'package:frosty/models/badges.dart';
 import 'package:frosty/models/emotes.dart';
-import 'package:http/http.dart';
-import 'package:tuple/tuple.dart';
 
 /// The FFZ service for making API calls.
-class FFZApi {
-  final Client _client;
-
-  const FFZApi(this._client);
+class FFZApi extends BaseApiClient {
+  FFZApi(Dio dio) : super(dio, 'https://api.frankerfacez.com/v1');
 
   /// Returns a map of global FFZ emotes to their URL.
   Future<List<Emote>> getEmotesGlobal() async {
-    final url = Uri.parse('https://api.frankerfacez.com/v1/set/global');
+    final data = await get<JsonMap>('/set/global');
 
-    final response = await _client.get(url);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body);
-      final defaultSets = decoded['default_sets'] as List;
+    final defaultSets = data['default_sets'] as JsonList;
 
-      final emotes = <EmoteFFZ>[];
-      for (final setId in defaultSets) {
-        final emoticons =
-            decoded['sets'][setId.toString()]['emoticons'] as List;
-        emotes.addAll(emoticons.map((emote) => EmoteFFZ.fromJson(emote)));
-      }
-
-      return emotes
-          .map((emote) => Emote.fromFFZ(emote, EmoteType.ffzGlobal))
-          .toList();
-    } else {
-      return Future.error('Failed to get FFZ global emotes');
+    final emotes = <EmoteFFZ>[];
+    for (final setId in defaultSets) {
+      final emoticons = data['sets'][setId.toString()]['emoticons'] as JsonList;
+      emotes.addAll(emoticons.map((emote) => EmoteFFZ.fromJson(emote)));
     }
+
+    return emotes
+        .map((emote) => Emote.fromFFZ(emote, EmoteType.ffzGlobal))
+        .toList();
   }
 
   /// Returns a channel's FFZ room info including custom badges and emote used.
-  Future<Tuple2<RoomFFZ, List<Emote>>> getRoomInfo({required String id}) async {
-    final url = Uri.parse('https://api.frankerfacez.com/v1/room/id/$id');
+  Future<(RoomFFZ, List<Emote>)> getRoomInfo({required String id}) async {
+    final data = await get<JsonMap>('/room/id/$id');
 
-    final response = await _client.get(url);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body);
-      final roomInfo = RoomFFZ.fromJson(decoded['room']);
-      final emoticons =
-          decoded['sets'][roomInfo.set.toString()]['emoticons'] as List;
+    final roomInfo = RoomFFZ.fromJson(data['room']);
+    final emoticons =
+        data['sets'][roomInfo.set.toString()]['emoticons'] as JsonList;
 
-      final emotes = emoticons.map((emote) => EmoteFFZ.fromJson(emote));
+    final emotes = emoticons.map((emote) => EmoteFFZ.fromJson(emote));
 
-      return Tuple2(
-          roomInfo,
-          emotes
-              .map((emote) => Emote.fromFFZ(emote, EmoteType.ffzChannel))
-              .toList());
-    } else {
-      return Future.error('Failed to get FFZ room info');
-    }
+    return (
+      roomInfo,
+      emotes
+          .map((emote) => Emote.fromFFZ(emote, EmoteType.ffzChannel))
+          .toList(),
+    );
   }
 
-  /// Returns a map of badges user IDs to a list of their FFZ badges.
+  /// Returns a map of user IDs to a list of their FFZ badges.
   Future<Map<String, List<ChatBadge>>> getBadges() async {
-    final url = Uri.parse('https://api.frankerfacez.com/v1/badges/ids');
+    final data = await get<JsonMap>('/badges/ids');
 
-    final response = await _client.get(url);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body);
-      final badges = decoded['badges'] as List;
-      final badgeObjects =
-          badges.map((badge) => BadgeInfoFFZ.fromJson(badge)).toList();
+    final badges = data['badges'] as JsonList;
+    final badgeObjects = badges
+        .map((badge) => BadgeInfoFFZ.fromJson(badge))
+        .toList();
 
-      final result = <String, List<ChatBadge>>{};
-      for (final badge in badgeObjects.reversed) {
-        for (final userId in decoded['users'][badge.id.toString()]) {
-          final entry = result[userId.toString()];
-          final normalBadge = ChatBadge.fromFFZ(badge);
-          if (entry == null) {
-            result[userId.toString()] = [normalBadge];
-          } else {
-            entry.add(normalBadge);
-          }
+    final result = <String, List<ChatBadge>>{};
+    for (final badge in badgeObjects.reversed) {
+      for (final userId in data['users'][badge.id.toString()]) {
+        final entry = result[userId.toString()];
+        final normalBadge = ChatBadge.fromFFZ(badge);
+        if (entry == null) {
+          result[userId.toString()] = [normalBadge];
+        } else {
+          entry.add(normalBadge);
         }
       }
-
-      return result;
-    } else {
-      return Future.error('Failed to get FFZ badges');
     }
+
+    return result;
   }
 }
diff --git a/lib/apis/firebase_performance_interceptor.dart b/lib/apis/firebase_performance_interceptor.dart
new file mode 100644
index 00000000..f1c6712b
--- /dev/null
+++ b/lib/apis/firebase_performance_interceptor.dart
@@ -0,0 +1,46 @@
+import 'package:dio/dio.dart';
+import 'package:firebase_performance/firebase_performance.dart';
+
+/// Dio interceptor that traces HTTP requests as Firebase Performance metrics.
+class FirebasePerformanceInterceptor extends Interceptor {
+  static const _metricKey = 'firebase_performance_metric';
+
+  @override
+  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
+    final metric = FirebasePerformance.instance.newHttpMetric(
+      options.uri.toString(),
+      _getHttpMethod(options.method),
+    );
+    metric.start();
+    options.extra[_metricKey] = metric;
+    handler.next(options);
+  }
+
+  @override
+  void onResponse(Response response, ResponseInterceptorHandler handler) {
+    _stopMetric(response.requestOptions, response.statusCode);
+    handler.next(response);
+  }
+
+  @override
+  void onError(DioException err, ErrorInterceptorHandler handler) {
+    _stopMetric(err.requestOptions, err.response?.statusCode);
+    handler.next(err);
+  }
+
+  void _stopMetric(RequestOptions options, int? statusCode) {
+    final metric = options.extra.remove(_metricKey) as HttpMetric?;
+    if (metric == null) return;
+    if (statusCode != null) metric.httpResponseCode = statusCode;
+    metric.stop();
+  }
+
+  static HttpMethod _getHttpMethod(String method) => switch (method.toUpperCase()) {
+    'GET' => HttpMethod.Get,
+    'POST' => HttpMethod.Post,
+    'PUT' => HttpMethod.Put,
+    'DELETE' => HttpMethod.Delete,
+    'PATCH' => HttpMethod.Patch,
+    _ => HttpMethod.Get,
+  };
+}
diff --git a/lib/apis/seventv_api.dart b/lib/apis/seventv_api.dart
index e772cee5..27d02a0f 100644
--- a/lib/apis/seventv_api.dart
+++ b/lib/apis/seventv_api.dart
@@ -1,75 +1,39 @@
-import 'dart:convert';
-
-import 'package:frosty/models/badges.dart';
+import 'package:dio/dio.dart';
+import 'package:frosty/apis/base_api_client.dart';
 import 'package:frosty/models/emotes.dart';
-import 'package:http/http.dart';
 
 /// The 7TV service for making API calls.
-class SevenTVApi {
-  final Client _client;
-
-  const SevenTVApi(this._client);
+class SevenTVApi extends BaseApiClient {
+  SevenTVApi(Dio dio) : super(dio, 'https://7tv.io/v3');
 
   /// Returns a map of global 7TV emotes to their URL.
   Future<List<Emote>> getEmotesGlobal() async {
-    final url = Uri.parse('https://api.7tv.app/v2/emotes/global');
+    final data = await get<JsonMap>('/emote-sets/global');
 
-    final response = await _client.get(url);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body) as List;
-      final emotes = decoded.map((emote) => Emote7TV.fromJson(emote));
+    final decoded = data['emotes'] as JsonList;
+    final emotes = decoded.map((emote) => Emote7TV.fromJson(emote));
 
-      return emotes
-          .map((emote) => Emote.from7TV(emote, EmoteType.sevenTVGlobal))
-          .toList();
-    } else {
-      return Future.error('Failed to get 7TV global emotes');
-    }
+    return emotes
+        .map((emote) => Emote.from7TV(emote, EmoteType.sevenTVGlobal))
+        .toList();
   }
 
-  /// Returns a map of a channel's 7TV emotes to their URL.
-  Future<List<Emote>> getEmotesChannel({required String id}) async {
-    final url = Uri.parse('https://api.7tv.app/v2/users/$id/emotes');
+  /// Returns a tuple containing the emote set ID and a map of a channel's 7TV
+  /// emotes to their URL.
+  Future<(String, List<Emote>)> getEmotesChannel({required String id}) async {
+    final data = await get<JsonMap>('/users/twitch/$id');
 
-    final response = await _client.get(url);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body) as List;
-      final emotes = decoded.map((emote) => Emote7TV.fromJson(emote));
+    final emoteSetId = data['emote_set']['id'] as String;
+    final emotes = (data['emote_set']['emotes'] as JsonList).map(
+      (emote) => Emote7TV.fromJson(emote),
+    );
 
-      return emotes
+    return (
+      emoteSetId,
+      emotes
           .map((emote) => Emote.from7TV(emote, EmoteType.sevenTVChannel))
-          .toList();
-    } else {
-      return Future.error('Failed to get 7TV channel emotes');
-    }
-  }
-
-  /// Returns a map of user IDS to a list of their 7TV badges.
-  Future<Map<String, List<ChatBadge>>> getBadges() async {
-    final url =
-        Uri.parse('https://api.7tv.app/v2/badges?user_identifier=twitch_id');
-
-    final response = await _client.get(url);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body)['badges'] as List;
-      final badges = decoded.map((emote) => BadgeInfo7TV.fromJson(emote));
-
-      final result = <String, List<ChatBadge>>{};
-      for (final badge in badges) {
-        for (final userId in badge.users) {
-          final entry = result[userId];
-          final normalBadge = ChatBadge.from7TV(badge);
-          if (entry == null) {
-            result[userId] = [normalBadge];
-          } else {
-            entry.add(normalBadge);
-          }
-        }
-      }
-
-      return result;
-    } else {
-      return Future.error('Failed to get 7TV badges');
-    }
+          .where((emote) => emote.url.isNotEmpty)
+          .toList(),
+    );
   }
 }
diff --git a/lib/apis/twitch_ad_solutions.dart b/lib/apis/twitch_ad_solutions.dart
new file mode 100644
index 00000000..1647f4f0
--- /dev/null
+++ b/lib/apis/twitch_ad_solutions.dart
@@ -0,0 +1,163 @@
+import 'package:flutter/foundation.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/models/playback_access_token.dart';
+
+/// Dart-side port of the [TwitchAdSolutions vaft](https://github.com/pixeltris/TwitchAdSolutions)
+/// strategy for Frosty's native HLS player.
+///
+/// Browser vaft hooks `Worker`/`fetch` to rewrite playlists. Here we instead:
+/// 1. Request playback tokens with a non-`site` [forceAccessTokenPlayerType]
+///    (vaft's `ForceAccessTokenPlayerType`).
+/// 2. When stitched ads still appear, try [backupPlayerTypes] until a playlist
+///    without the ad signifier is found, then hand that Usher URL to the player.
+class TwitchAdSolutions {
+  TwitchAdSolutions._();
+
+  /// Matches vaft `AdSignifier` — Twitch marks ad pods with this in `#EXT-X-DATERANGE`.
+  static const adSignifier = 'stitched';
+
+  /// vaft `ForceAccessTokenPlayerType` — used for the primary stream when
+  /// ad blocking is enabled.
+  static const forceAccessTokenPlayerType = 'popout';
+
+  /// vaft `BackupPlayerTypes` order when the primary playlist still has ads.
+  static const backupPlayerTypes = <String>[
+    'embed',
+    'popout',
+    'autoplay',
+  ];
+
+  /// vaft `FallbackPlayerType` when every backup still carries ads.
+  static const fallbackPlayerType = 'embed';
+
+  /// GQL `platform` for a given player type (vaft uses `android` for autoplay).
+  static String platformForPlayerType(String playerType) =>
+      playerType == 'autoplay' ? 'android' : 'web';
+
+  static bool playlistContainsAds(String playlistText) =>
+      playlistText.contains(adSignifier);
+
+  /// True when [text] looks like a midroll (vaft midroll banner path).
+  static bool playlistIsMidroll(String playlistText) =>
+      playlistText.contains('"MIDROLL"') ||
+      playlistText.contains('"midroll"') ||
+      playlistText.contains("MIDROLL");
+}
+
+/// Resolves Usher HLS URLs using TwitchAdSolutions player-type strategy.
+class TwitchAdFreePlayback {
+  TwitchAdFreePlayback(this._gql);
+
+  final TwitchGqlApi _gql;
+
+  /// Primary URL when adblock is on: force [TwitchAdSolutions.forceAccessTokenPlayerType].
+  Future<({String url, PlaybackAccessToken token, String playerType})>
+  resolvePrimary({
+    required String login,
+    String? authToken,
+  }) {
+    return _resolveForPlayerType(
+      login: login,
+      authToken: authToken,
+      playerType: TwitchAdSolutions.forceAccessTokenPlayerType,
+      requireAdFree: false,
+    );
+  }
+
+  /// Walks [TwitchAdSolutions.backupPlayerTypes] for a playlist without ads.
+  /// Falls back to [TwitchAdSolutions.fallbackPlayerType] even if ads remain.
+  Future<({String url, PlaybackAccessToken token, String playerType})>
+  resolveBackup({
+    required String login,
+    String? authToken,
+  }) async {
+    for (final playerType in TwitchAdSolutions.backupPlayerTypes) {
+      try {
+        final resolved = await _resolveForPlayerType(
+          login: login,
+          authToken: authToken,
+          playerType: playerType,
+          requireAdFree: true,
+        );
+        debugPrint(
+          'TwitchAdFreePlayback: backup OK playerType=$playerType',
+        );
+        return resolved;
+      } catch (e) {
+        debugPrint(
+          'TwitchAdFreePlayback: backup playerType=$playerType failed: $e',
+        );
+      }
+    }
+
+    debugPrint(
+      'TwitchAdFreePlayback: all backups had ads; using fallback '
+      '${TwitchAdSolutions.fallbackPlayerType}',
+    );
+    return _resolveForPlayerType(
+      login: login,
+      authToken: authToken,
+      playerType: TwitchAdSolutions.fallbackPlayerType,
+      requireAdFree: false,
+    );
+  }
+
+  Future<({String url, PlaybackAccessToken token, String playerType})>
+  _resolveForPlayerType({
+    required String login,
+    String? authToken,
+    required String playerType,
+    required bool requireAdFree,
+  }) async {
+    final token = await _gql.getPlaybackAccessToken(
+      login: login,
+      authToken: authToken,
+      playerType: playerType,
+      platform: TwitchAdSolutions.platformForPlayerType(playerType),
+    );
+    final url = _gql.buildHlsUrl(login: login, token: token);
+
+    if (requireAdFree) {
+      final hasAds = await _multivariantHasAds(url);
+      if (hasAds) {
+        throw StateError('Playlist for playerType=$playerType still has ads');
+      }
+    }
+
+    return (url: url, token: token, playerType: playerType);
+  }
+
+  /// Fetches the multivariant playlist and samples the first media variant for
+  /// the ad signifier (same idea as vaft probing backup encodings).
+  Future<bool> _multivariantHasAds(String hlsUrl) async {
+    final master = await _gql.fetchPlaylistText(hlsUrl);
+    final mediaUrl = firstMediaPlaylistUrl(master, baseUrl: hlsUrl);
+    if (mediaUrl == null) {
+      // Can't verify — treat as ad-free so we don't reject a usable stream.
+      return false;
+    }
+    final media = await _gql.fetchPlaylistText(mediaUrl);
+    return TwitchAdSolutions.playlistContainsAds(media);
+  }
+
+  /// First `.m3u8` URI in a multivariant playlist, resolved against [baseUrl].
+  @visibleForTesting
+  static String? firstMediaPlaylistUrl(
+    String masterPlaylist, {
+    required String baseUrl,
+  }) {
+    final lines = masterPlaylist.replaceAll('\r', '').split('\n');
+    for (final raw in lines) {
+      final line = raw.trim();
+      if (line.isEmpty || line.startsWith('#')) continue;
+      if (!line.contains('.m3u8')) continue;
+      return Uri.parse(baseUrl).resolve(line).toString();
+    }
+    return null;
+  }
+}
+
+/// Tiny blank MP4 (same payload vaft serves for stripped ad segments). Exposed
+/// for tests / future local playlist rewriting; not required for URL-swap mode.
+const twitchAdSolutionsBlankSegmentDataUri =
+    'data:video/mp4;base64,AAAAKGZ0eXBtcDQyAAAAAWlzb21tcDQyZGFzaGF2YzFpc282aGxzZgAABEltb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAYagAAAAAAABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAABqHRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAURtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAALuAAAAAAFXEAAAAAAAtaGRscgAAAAAAAAAAc291bgAAAAAAAAAAAAAAAFNvdW5kSGFuZGxlcgAAAADvbWluZgAAABBzbWhkAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAACzc3RibAAAAGdzdHNkAAAAAAAAAAEAAABXbXA0YQAAAAAAAAABAAAAAAAAAAAAAgAQAAAAALuAAAAAAAAzZXNkcwAAAAADgICAIgABAASAgIAUQBUAAAAAAAAAAAAAAAWAgIACEZAGgICAAQIAAAAQc3R0cwAAAAAAAAAAAAAAEHN0c2MAAAAAAAAAAAAAABRzdHN6AAAAAAAAAAAAAAAAAAAAEHN0Y28AAAAAAAAAAAAAAeV0cmFrAAAAXHRraGQAAAADAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAoAAAAFoAAAAAAGBbWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAA9CQAAAAABVxAAAAAAALWhkbHIAAAAAAAAAAHZpZGUAAAAAAAAAAAAAAABWaWRlb0hhbmRsZXIAAAABLG1pbmYAAAAUdm1oZAAAAAEAAAAAAAAAAAAAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAOxzdGJsAAAAoHN0c2QAAAAAAAAAAQAAAJBhdmMxAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAoABaABIAAAASAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGP//AAAAOmF2Y0MBTUAe/+EAI2dNQB6WUoFAX/LgLUBAQFAAAD6AAA6mDgAAHoQAA9CW7y4KAQAEaOuPIAAAABBzdHRzAAAAAAAAAAAAAAAQc3RzYwAAAAAAAAAAAAAAFHN0c3oAAAAAAAAAAAAAAAAAAAAQc3RjbwAAAAAAAAAAAAAASG12ZXgAAAAgdHJleAAAAAAAAAABAAAAAQAAAC4AAAAAAoAAAAAAACB0cmV4AAAAAAAAAAIAAAABAACCNQAAAAACQAAA';
diff --git a/lib/apis/twitch_api.dart b/lib/apis/twitch_api.dart
index 9c653970..f3cc787d 100644
--- a/lib/apis/twitch_api.dart
+++ b/lib/apis/twitch_api.dart
@@ -1,176 +1,140 @@
-import 'dart:convert';
-
+import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
+import 'package:frosty/apis/base_api_client.dart';
 import 'package:frosty/constants.dart';
 import 'package:frosty/models/badges.dart';
 import 'package:frosty/models/category.dart';
 import 'package:frosty/models/channel.dart';
 import 'package:frosty/models/emotes.dart';
+import 'package:frosty/models/followed_channel.dart';
+import 'package:frosty/models/shared_chat_session.dart';
 import 'package:frosty/models/stream.dart';
 import 'package:frosty/models/user.dart';
-import 'package:http/http.dart';
 
 /// The Twitch service for making API calls.
-class TwitchApi {
-  final Client _client;
+class TwitchApi extends BaseApiClient {
+  static const String _helixBaseUrl = 'https://api.twitch.tv/helix';
+  static const String _oauthBaseUrl = 'https://id.twitch.tv/oauth2';
+  static const String _recentMessagesUrl =
+      'https://recent-messages.robotty.de/api/v2';
 
-  const TwitchApi(this._client);
+  TwitchApi(Dio dio) : super(dio, _helixBaseUrl);
 
   /// Returns a list of all Twitch global emotes.
-  Future<List<Emote>> getEmotesGlobal(
-      {required Map<String, String> headers}) async {
-    final url = Uri.parse('https://api.twitch.tv/helix/chat/emotes/global');
-    final response = await _client.get(url, headers: headers);
+  Future<List<Emote>> getEmotesGlobal() async {
+    final data = await get<JsonMap>('/chat/emotes/global');
 
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body)['data'] as List;
-      final emotes =
-          decoded.map((emote) => EmoteTwitch.fromJson(emote)).toList();
+    final decoded = data['data'] as JsonList;
+    final emotes = decoded.map((emote) => EmoteTwitch.fromJson(emote)).toList();
 
-      return emotes
-          .map((emote) => Emote.fromTwitch(emote, EmoteType.twitchGlobal))
-          .toList();
-    } else {
-      return Future.error('Failed to get Twitch global emotes');
-    }
+    return emotes
+        .map((emote) => Emote.fromTwitch(emote, EmoteType.twitchGlobal))
+        .toList();
   }
 
   /// Returns a list of a channel's Twitch emotes given their [id].
-  Future<List<Emote>> getEmotesChannel({
-    required String id,
-    required Map<String, String> headers,
-  }) async {
-    final url =
-        Uri.parse('https://api.twitch.tv/helix/chat/emotes?broadcaster_id=$id');
+  Future<List<Emote>> getEmotesChannel({required String id}) async {
+    final data = await get<JsonMap>(
+      '/chat/emotes',
+      queryParameters: {'broadcaster_id': id},
+    );
 
-    final response = await _client.get(url, headers: headers);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body)['data'] as List;
-      final emotes =
-          decoded.map((emote) => EmoteTwitch.fromJson(emote)).toList();
+    final decoded = data['data'] as JsonList;
+    final emotes = decoded.map((emote) => EmoteTwitch.fromJson(emote)).toList();
 
-      return emotes.map((emote) {
-        switch (emote.emoteType) {
-          case 'bitstier':
-            return Emote.fromTwitch(emote, EmoteType.twitchBits);
-          case 'follower':
-            return Emote.fromTwitch(emote, EmoteType.twitchFollower);
-          case 'subscriptions':
-            return Emote.fromTwitch(emote, EmoteType.twitchChannel);
-          default:
-            return Emote.fromTwitch(emote, EmoteType.twitchChannel);
-        }
-      }).toList();
-    } else {
-      return Future.error('Failed to get Twitch channel emotes');
-    }
+    return emotes.map((emote) {
+      switch (emote.emoteType) {
+        case 'bitstier':
+          return Emote.fromTwitch(emote, EmoteType.twitchBits);
+        case 'follower':
+          return Emote.fromTwitch(emote, EmoteType.twitchFollower);
+        case 'subscriptions':
+          return Emote.fromTwitch(emote, EmoteType.twitchChannel);
+        default:
+          return Emote.fromTwitch(emote, EmoteType.twitchChannel);
+      }
+    }).toList();
   }
 
   /// Returns a list of Twitch emotes under the provided [setId].
-  Future<List<Emote>> getEmotesSets({
-    required String setId,
-    required Map<String, String> headers,
-  }) async {
-    final url = Uri.parse(
-        'https://api.twitch.tv/helix/chat/emotes/set?emote_set_id=$setId');
+  Future<List<Emote>> getEmotesSets({required String setId}) async {
+    final data = await get<JsonMap>(
+      '/chat/emotes/set',
+      queryParameters: {'emote_set_id': setId},
+    );
 
-    final response = await _client.get(url, headers: headers);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body)['data'] as List;
-      final emotes =
-          decoded.map((emote) => EmoteTwitch.fromJson(emote)).toList();
+    final decoded = data['data'] as JsonList;
+    final emotes = decoded.map((emote) => EmoteTwitch.fromJson(emote)).toList();
 
-      return emotes.map((emote) {
-        switch (emote.emoteType) {
-          case 'globals':
-          case 'smilies':
-            return Emote.fromTwitch(emote, EmoteType.twitchGlobal);
-          case 'subscriptions':
-            return Emote.fromTwitch(emote, EmoteType.twitchSub);
-          default:
-            return Emote.fromTwitch(emote, EmoteType.twitchUnlocked);
-        }
-      }).toList();
-    } else {
-      return Future.error('Failed to get Twitch emotes set');
-    }
+    return emotes.map((emote) {
+      switch (emote.emoteType) {
+        case 'globals':
+        case 'smilies':
+          return Emote.fromTwitch(emote, EmoteType.twitchGlobal);
+        case 'subscriptions':
+          return Emote.fromTwitch(emote, EmoteType.twitchSub);
+        default:
+          return Emote.fromTwitch(emote, EmoteType.twitchUnlocked);
+      }
+    }).toList();
   }
 
   /// Returns a map of global Twitch badges to their [Emote] object.
-  Future<Map<String, ChatBadge>> getBadgesGlobal(
-      {required Map<String, String> headers}) async {
-    final url = Uri.parse('https://api.twitch.tv/helix/chat/badges/global');
+  Future<Map<String, ChatBadge>> getBadgesGlobal() async {
+    final data = await get<JsonMap>('/chat/badges/global');
 
-    final response = await _client.get(url, headers: headers);
-    if (response.statusCode == 200) {
-      final result = <String, ChatBadge>{};
-      final decoded = jsonDecode(response.body)['data'] as List;
+    final result = <String, ChatBadge>{};
+    final decoded = data['data'] as JsonList;
 
-      for (final badge in decoded) {
-        final id = badge['set_id'] as String;
-        final versions = badge['versions'] as List;
+    for (final badge in decoded) {
+      final id = badge['set_id'] as String;
+      final versions = badge['versions'] as JsonList;
 
-        for (final version in versions) {
-          final badgeInfo = BadgeInfoTwitch.fromJson(version);
-          result['$id/${badgeInfo.id}'] = ChatBadge.fromTwitch(badgeInfo);
-        }
+      for (final version in versions) {
+        final badgeInfo = BadgeInfoTwitch.fromJson(version);
+        result['$id/${badgeInfo.id}'] = ChatBadge.fromTwitch(badgeInfo);
       }
-
-      return result;
-    } else {
-      return Future.error('Failed to get Twitch global badges');
     }
+
+    return result;
   }
 
   /// Returns a map of a channel's Twitch badges to their [Emote] object.
-  Future<Map<String, ChatBadge>> getBadgesChannel({
-    required String id,
-    required Map<String, String> headers,
-  }) async {
-    final url =
-        Uri.parse('https://api.twitch.tv/helix/chat/badges?broadcaster_id=$id');
+  Future<Map<String, ChatBadge>> getBadgesChannel({required String id}) async {
+    final data = await get<JsonMap>(
+      '/chat/badges',
+      queryParameters: {'broadcaster_id': id},
+    );
 
-    final response = await _client.get(url, headers: headers);
-    if (response.statusCode == 200) {
-      final result = <String, ChatBadge>{};
-      final decoded = jsonDecode(response.body)['data'] as List;
+    final result = <String, ChatBadge>{};
+    final decoded = data['data'] as JsonList;
 
-      for (final badge in decoded) {
-        final id = badge['set_id'] as String;
-        final versions = badge['versions'] as List;
+    for (final badge in decoded) {
+      final id = badge['set_id'] as String;
+      final versions = badge['versions'] as JsonList;
 
-        for (final version in versions) {
-          final badgeInfo = BadgeInfoTwitch.fromJson(version);
-          result['$id/${badgeInfo.id}'] = ChatBadge.fromTwitch(badgeInfo);
-        }
+      for (final version in versions) {
+        final badgeInfo = BadgeInfoTwitch.fromJson(version);
+        result['$id/${badgeInfo.id}'] = ChatBadge.fromTwitch(badgeInfo);
       }
-
-      return result;
-    } else {
-      return Future.error('Failed to get Twitch channel badges');
     }
+
+    return result;
   }
 
-  /// Returns the user's info given their token through [headers].
-  Future<UserTwitch> getUserInfo({required Map<String, String> headers}) async {
-    final url = Uri.parse('https://api.twitch.tv/helix/users');
+  /// Returns the user's info given their token.
+  Future<UserTwitch> getUserInfo() async {
+    final data = await get<JsonMap>('/users');
 
-    final response = await _client.get(url, headers: headers);
-    if (response.statusCode == 200) {
-      final userData = jsonDecode(response.body)['data'] as List;
-
-      return UserTwitch.fromJson(userData.first);
-    } else {
-      return Future.error('Failed to get Twitch user info');
-    }
+    final userData = data['data'] as JsonList;
+    return UserTwitch.fromJson(userData.first);
   }
 
   /// Returns a token for an anonymous user.
   Future<String> getDefaultToken() async {
-    final url = Uri(
-      scheme: 'https',
-      host: 'id.twitch.tv',
-      path: '/oauth2/token',
+    // Use custom base URL for OAuth
+    final data = await post<JsonMap>(
+      '$_oauthBaseUrl/token',
       queryParameters: {
         'client_id': clientId,
         'client_secret': secret,
@@ -178,314 +142,612 @@ class TwitchApi {
       },
     );
 
-    final response = await _client.post(url);
-    if (response.statusCode == 200) {
-      return jsonDecode(response.body)['access_token'];
-    } else {
-      return Future.error('Failed to get default token');
+    return data['access_token'] as String;
+  }
+
+  /// Validates [token] with Twitch.
+  ///
+  /// Returns token info (scopes + optional `user_id`) when valid, or `null`
+  /// when invalid/expired. App-access tokens may omit `user_id` and return an
+  /// empty scope list.
+  Future<TwitchTokenInfo?> validateToken({required String token}) async {
+    try {
+      final data = await get<JsonMap>(
+        '$_oauthBaseUrl/validate',
+        headers: {'Authorization': 'Bearer $token'},
+      );
+      final scopes = data['scopes'];
+      final scopeList = scopes is List
+          ? scopes.map((scope) => scope.toString()).toList()
+          : const <String>[];
+      final userId = data['user_id']?.toString();
+      return TwitchTokenInfo(
+        scopes: scopeList,
+        userId: userId == null || userId.isEmpty ? null : userId,
+      );
+    } on UnauthorizedException {
+      // 401 -> token is invalid/expired (propagated from interceptor for validate requests)
+      return null;
+    } on ApiException catch (e) {
+      // Network/timeout/server errors -> treat as indeterminate, not invalid
+      debugPrint('Token validation indeterminate: $e');
+      rethrow;
     }
   }
 
-  /// Returns a bool indicating the validity of the given token.
-  Future<bool> validateToken({required String token}) async {
-    final url = Uri.parse('https://id.twitch.tv/oauth2/validate');
-
-    final response =
-        await _client.get(url, headers: {'Authorization': 'Bearer $token'});
-    if (response.statusCode == 200) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  /// Returns a [StreamsTwitch] object that contains the top 20 streams and a cursor for further requests.
+  /// Returns a [StreamsTwitch] object that contains top streams and a cursor for further requests.
+  ///
+  /// [language] is an optional ISO 639-1 code (Helix accepts only one).
   Future<StreamsTwitch> getTopStreams({
-    required Map<String, String> headers,
     String? cursor,
+    String? language,
+    int first = 100,
   }) async {
-    final url = Uri.parse(cursor == null
-        ? 'https://api.twitch.tv/helix/streams'
-        : 'https://api.twitch.tv/helix/streams?after=$cursor');
+    final queryParams = <String, dynamic>{
+      'first': first,
+      if (cursor != null) 'after': cursor,
+      if (language != null && language.isNotEmpty) 'language': language,
+    };
 
-    final response = await _client.get(url, headers: headers);
-    final decoded = jsonDecode(response.body);
-    if (response.statusCode == 200) {
-      return StreamsTwitch.fromJson(decoded);
-    } else {
-      return Future.error('Failed to get top streams: ${decoded['message']}');
-    }
+    final data = await get<JsonMap>(
+      '/streams',
+      queryParameters: queryParams,
+    );
+
+    return StreamsTwitch.fromJson(data);
   }
 
   /// Returns a [StreamsTwitch] object that contains the given user ID's top 20 followed streams and a cursor for further requests.
   Future<StreamsTwitch> getFollowedStreams({
     required String id,
-    required Map<String, String> headers,
     String? cursor,
   }) async {
-    final url = Uri.parse(cursor == null
-        ? 'https://api.twitch.tv/helix/streams/followed?user_id=$id'
-        : 'https://api.twitch.tv/helix/streams/followed?user_id=$id&after=$cursor');
+    final queryParams = {'user_id': id, 'first': '100'};
+    if (cursor != null) queryParams['after'] = cursor;
 
-    final response = await _client.get(url, headers: headers);
-    final decoded = jsonDecode(response.body);
-    if (response.statusCode == 200) {
-      return StreamsTwitch.fromJson(decoded);
-    } else {
-      return Future.error(
-          'Failed to get followed streams: ${decoded['message']}');
-    }
+    final data = await get<JsonMap>(
+      '/streams/followed',
+      queryParameters: queryParams,
+    );
+
+    return StreamsTwitch.fromJson(data);
+  }
+
+  /// Returns a [FollowedChannels] object containing all followed channels (including offline ones) for the given user ID.
+  Future<FollowedChannels> getFollowedChannels({
+    required String userId,
+    String? cursor,
+  }) async {
+    final queryParams = {'user_id': userId, 'first': '100'};
+    if (cursor != null) queryParams['after'] = cursor;
+
+    final data = await get<JsonMap>(
+      '/channels/followed',
+      queryParameters: queryParams,
+    );
+
+    return FollowedChannels.fromJson(data);
+  }
+
+  /// Whether [userId] follows [broadcasterId], via Helix (read-only; create/delete
+  /// follows were removed from the public API).
+  Future<bool> isFollowingChannel({
+    required String userId,
+    required String broadcasterId,
+  }) async {
+    final data = await get<JsonMap>(
+      '/channels/followed',
+      queryParameters: {
+        'user_id': userId,
+        'broadcaster_id': broadcasterId,
+        'first': '1',
+      },
+    );
+
+    final list = data['data'] as List? ?? const [];
+    return list.isNotEmpty;
   }
 
   /// Returns a [StreamsTwitch] object that contains the list of streams under the given game/category ID.
   Future<StreamsTwitch> getStreamsUnderCategory({
     required String gameId,
-    required Map<String, String> headers,
     String? cursor,
+    String? language,
+    int first = 100,
   }) async {
-    final url = Uri.parse(cursor == null
-        ? 'https://api.twitch.tv/helix/streams?game_id=$gameId'
-        : 'https://api.twitch.tv/helix/streams?game_id=$gameId&after=$cursor');
+    final queryParams = <String, dynamic>{
+      'game_id': gameId,
+      'first': first,
+      if (cursor != null) 'after': cursor,
+      if (language != null && language.isNotEmpty) 'language': language,
+    };
 
-    final response = await _client.get(url, headers: headers);
-    final decoded = jsonDecode(response.body);
-    if (response.statusCode == 200) {
-      return StreamsTwitch.fromJson(decoded);
+    final data = await get<JsonMap>('/streams', queryParameters: queryParams);
+
+    return StreamsTwitch.fromJson(data);
+  }
+
+  /// Fetches Helix directory pages until enough streams match [languages] and
+  /// optional [freeformTag] (case-insensitive tag name), or the directory ends.
+  ///
+  /// Helix is always viewer-desc and supports at most one `language` query
+  /// param; tags are filtered client-side. Used as fallback when GQL directory
+  /// pagination lacks a Client-Integrity token.
+  ///
+  /// When a [freeformTag] filter yields no matches in a Helix window, this
+  /// keeps scanning (up to [maxPages]) and still returns the Helix cursor so
+  /// callers can continue — an empty match set alone is not end-of-list.
+  Future<StreamsTwitch> getDirectoryStreams({
+    List<String> languages = const [],
+    String? gameId,
+    String? freeformTag,
+    String? cursor,
+    int minCount = 50,
+    int maxPages = 12,
+  }) async {
+    final wantedLangs = languages
+        .map((l) => l.trim().toLowerCase())
+        .where((l) => l.isNotEmpty)
+        .toSet();
+    final tagNeedle = freeformTag?.trim().toLowerCase();
+    final hasTag = tagNeedle != null && tagNeedle.isNotEmpty;
+
+    bool matches(StreamTwitch stream) {
+      if (wantedLangs.isNotEmpty &&
+          !wantedLangs.contains(stream.language.toLowerCase())) {
+        return false;
+      }
+      if (hasTag) {
+        final hit = stream.tags.any((t) => t.toLowerCase() == tagNeedle);
+        if (!hit) return false;
+      }
+      return true;
+    }
+
+    // Fast path: no tag filter and 0–1 languages → one Helix call.
+    if (!hasTag && wantedLangs.length <= 1) {
+      final lang = wantedLangs.isEmpty ? null : wantedLangs.first;
+      return gameId == null
+          ? getTopStreams(cursor: cursor, language: lang)
+          : getStreamsUnderCategory(
+              gameId: gameId,
+              cursor: cursor,
+              language: lang,
+            );
+    }
+
+    // Sparse tags need a deeper Helix scan per request.
+    final effectiveMin = hasTag ? minCount.clamp(1, 100) : minCount;
+    final effectiveMax = hasTag ? (maxPages < 25 ? 25 : maxPages) : maxPages;
+
+    // When filtering by tag and exactly one language, still pass language to
+    // Helix so each page is denser in matches.
+    final helixLanguage =
+        wantedLangs.length == 1 ? wantedLangs.first : null;
+
+    final matched = <StreamTwitch>[];
+    String? pageCursor = cursor;
+    String? nextCursor;
+    var pages = 0;
+
+    while (matched.length < effectiveMin && pages < effectiveMax) {
+      final page = gameId == null
+          ? await getTopStreams(cursor: pageCursor, language: helixLanguage)
+          : await getStreamsUnderCategory(
+              gameId: gameId,
+              cursor: pageCursor,
+              language: helixLanguage,
+            );
+      pages++;
+      nextCursor = page.pagination['cursor'];
+      for (final stream in page.data) {
+        if (matches(stream)) matched.add(stream);
+      }
+      if (nextCursor == null ||
+          nextCursor.isEmpty ||
+          page.data.isEmpty) {
+        nextCursor = null;
+        break;
+      }
+      pageCursor = nextCursor;
+    }
+
+    return StreamsTwitch(
+      matched,
+      nextCursor != null && nextCursor.isNotEmpty
+          ? {'cursor': nextCursor}
+          : const {},
+    );
+  }
+
+  /// Deprecated name — use [getDirectoryStreams].
+  Future<StreamsTwitch> getStreamsMatchingLanguages({
+    required List<String> languages,
+    String? gameId,
+    String? cursor,
+    int minCount = 40,
+    int maxPages = 8,
+  }) =>
+      getDirectoryStreams(
+        languages: languages,
+        gameId: gameId,
+        cursor: cursor,
+        minCount: minCount,
+        maxPages: maxPages,
+      );
+
+  /// Returns a [StreamTwitch] object containing the stream info associated with the given [userLogin].
+  Future<StreamTwitch> getStream({required String userLogin}) async {
+    final data = await get<JsonMap>(
+      '/streams',
+      queryParameters: {'user_login': userLogin},
+    );
+
+    final streamData = data['data'] as JsonList;
+    if (streamData.isNotEmpty) {
+      return StreamTwitch.fromJson(streamData.first);
     } else {
-      return Future.error(
-          'Failed to get streams under category: ${decoded['message']}');
+      throw ApiException('$userLogin is offline', 404);
     }
   }
 
-  /// Returns a [StreamTwitch] object containing the stream info associated with the given [userLogin].
-  Future<StreamTwitch> getStream({
-    required String userLogin,
-    required Map<String, String> headers,
-  }) async {
-    final uri =
-        Uri.parse('https://api.twitch.tv/helix/streams?user_login=$userLogin');
+  Future<StreamsTwitch> getStreamsByIds({required List<String> userIds}) async {
+    // Create query string manually for multiple user_id parameters
+    final userIdParams = userIds.map((id) => 'user_id=$id').join('&');
+    final url = '/streams?$userIdParams&first=100';
 
-    final response = await _client.get(uri, headers: headers);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body);
-      final data = decoded['data'] as List;
+    final data = await get<JsonMap>(url);
 
-      if (data.isNotEmpty) {
-        return StreamTwitch.fromJson(data.first);
-      } else {
-        return Future.error('$userLogin is offline');
-      }
-    } else {
-      return Future.error('Failed to get stream info');
-    }
+    return StreamsTwitch.fromJson(data);
   }
 
   /// Returns a [UserTwitch] object containing the user info associated with the given [userLogin].
-  Future<UserTwitch> getUser({
-    String? userLogin,
-    String? id,
-    required Map<String, String> headers,
-  }) async {
-    final url = Uri.parse(id != null
-        ? 'https://api.twitch.tv/helix/users?id=$id'
-        : 'https://api.twitch.tv/helix/users?login=$userLogin');
+  Future<UserTwitch> getUser({String? userLogin, String? id}) async {
+    final queryParams = <String, String>{};
+    if (id != null) {
+      queryParams['id'] = id;
+    } else if (userLogin != null) {
+      queryParams['login'] = userLogin;
+    }
 
-    final response = await _client.get(url, headers: headers);
-    final decoded = jsonDecode(response.body);
+    final data = await get<JsonMap>('/users', queryParameters: queryParams);
 
-    if (response.statusCode == 200) {
-      final userData = decoded['data'] as List;
-
-      if (userData.isNotEmpty) {
-        return UserTwitch.fromJson(userData.first);
-      } else {
-        return Future.error('User does not exist');
-      }
+    final userData = data['data'] as JsonList;
+    if (userData.isNotEmpty) {
+      return UserTwitch.fromJson(userData.first);
     } else {
-      return Future.error('Failed to get user: ${decoded['message']}');
+      throw NotFoundException('User does not exist');
     }
   }
 
   /// Returns a [Channel] object containing a channels's info associated with the given [userId].
-  Future<Channel> getChannel({
-    required String userId,
-    required Map<String, String> headers,
-  }) async {
-    final url = Uri.parse(
-        'https://api.twitch.tv/helix/channels?broadcaster_id=$userId');
+  Future<Channel> getChannel({required String userId}) async {
+    final data = await get<JsonMap>(
+      '/channels',
+      queryParameters: {'broadcaster_id': userId},
+    );
 
-    final response = await _client.get(url, headers: headers);
-    final decoded = jsonDecode(response.body);
-    if (response.statusCode == 200) {
-      final channelData = decoded['data'] as List;
-
-      if (channelData.isNotEmpty) {
-        return Channel.fromJson(channelData.first);
-      } else {
-        return Future.error('Channel does not exist');
-      }
+    final channelData = data['data'] as JsonList;
+    if (channelData.isNotEmpty) {
+      return Channel.fromJson(channelData.first);
     } else {
-      return Future.error('Failed to get channel: ${decoded['message']}');
+      throw ApiException('Channel does not exist', 404);
     }
   }
 
   /// Returns a list of [ChannelQuery] objects closest matching the given [query].
-  Future<List<ChannelQuery>> searchChannels({
-    required String query,
-    required Map<String, String> headers,
-  }) async {
-    final url = Uri.parse(
-        'https://api.twitch.tv/helix/search/channels?first=8&query=$query');
+  Future<List<ChannelQuery>> searchChannels({required String query}) async {
+    final data = await get<JsonMap>(
+      '/search/channels',
+      queryParameters: {'first': '8', 'query': query},
+    );
 
-    final response = await _client.get(url, headers: headers);
-    if (response.statusCode == 200) {
-      final channelData = jsonDecode(response.body)['data'] as List;
-
-      return channelData.map((e) => ChannelQuery.fromJson(e)).toList();
-    } else {
-      return Future.error('Failed to get channels');
-    }
+    final channelData = data['data'] as JsonList;
+    return channelData.map((e) => ChannelQuery.fromJson(e)).toList();
   }
 
   /// Returns a [CategoriesTwitch] object containing the next top 20 categories/games and a cursor for further requests.
-  Future<CategoriesTwitch> getTopCategories({
-    required Map<String, String> headers,
-    String? cursor,
-  }) async {
-    final url = Uri.parse(cursor == null
-        ? 'https://api.twitch.tv/helix/games/top'
-        : 'https://api.twitch.tv/helix/games/top?after=$cursor');
+  Future<CategoriesTwitch> getTopCategories({String? cursor}) async {
+    final data = await get<JsonMap>(
+      '/games/top',
+      queryParameters: cursor != null ? {'after': cursor} : null,
+    );
 
-    final response = await _client.get(url, headers: headers);
-    final decoded = jsonDecode(response.body);
-    if (response.statusCode == 200) {
-      return CategoriesTwitch.fromJson(decoded);
-    } else {
-      return Future.error(
-          'Failed to get top categories: ${decoded['message']}');
-    }
+    return CategoriesTwitch.fromJson(data);
   }
 
   /// Returns a [CategoriesTwitch] object containing the category info corresponding to the provided [gameId].
-  Future<CategoriesTwitch> getCategory({
-    required Map<String, String> headers,
-    required String gameId,
-  }) async {
-    final url = Uri.parse('https://api.twitch.tv/helix/games?id=$gameId');
+  Future<CategoriesTwitch> getCategory({required String gameId}) async {
+    final data = await get<JsonMap>('/games', queryParameters: {'id': gameId});
 
-    final response = await _client.get(url, headers: headers);
-    final decoded = jsonDecode(response.body);
-    if (response.statusCode == 200) {
-      return CategoriesTwitch.fromJson(decoded);
-    } else {
-      return Future.error('Failed to get category: ${decoded['message']}');
-    }
+    return CategoriesTwitch.fromJson(data);
   }
 
   /// Returns a [CategoriesTwitch] containing up to 20 categories/games closest matching the [query] and a cursor for further requests.
   Future<CategoriesTwitch> searchCategories({
-    required Map<String, String> headers,
     required String query,
     String? cursor,
   }) async {
-    final url = Uri.parse(cursor == null
-        ? 'https://api.twitch.tv/helix/search/categories?first=8&query=$query'
-        : 'https://api.twitch.tv/helix/search/categories?first=8&query=$query&after=$cursor');
+    final queryParams = {'first': '8', 'query': query};
+    if (cursor != null) queryParams['after'] = cursor;
 
-    final response = await _client.get(url, headers: headers);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body);
+    final data = await get<JsonMap>(
+      '/search/categories',
+      queryParameters: queryParams,
+    );
 
-      return CategoriesTwitch.fromJson(decoded);
-    } else {
-      return Future.error('Failed to get categories');
-    }
+    return CategoriesTwitch.fromJson(data);
   }
 
   /// Returns the sub count associated with the given [userId].
-  Future<int> getSubscriberCount({
-    required String userId,
-    required Map<String, String> headers,
-  }) async {
-    final uri = Uri.parse(
-        'https://api.twitch.tv/helix/subscriptions?broadcaster_id=$userId');
+  Future<int> getSubscriberCount({required String userId}) async {
+    final data = await get<JsonMap>(
+      '/subscriptions',
+      queryParameters: {'broadcaster_id': userId},
+    );
 
-    final response = await _client.get(uri, headers: headers);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body);
-
-      return decoded['total'] as int;
-    } else {
-      return Future.error('Failed to get sub count');
-    }
+    return data['total'] as int;
   }
 
   /// Returns a user's list of blocked users given their id.
   Future<List<UserBlockedTwitch>> getUserBlockedList({
     required String id,
-    required Map<String, String> headers,
     String? cursor,
   }) async {
-    final url = Uri.parse(cursor == null
-        ? 'https://api.twitch.tv/helix/users/blocks?first=100&broadcaster_id=$id'
-        : 'https://api.twitch.tv/helix/users/blocks?first=100&broadcaster_id=$id&after=$cursor');
+    final queryParams = {'first': '100', 'broadcaster_id': id};
+    if (cursor != null) queryParams['after'] = cursor;
 
-    final response = await _client.get(url, headers: headers);
-    if (response.statusCode == 200) {
-      final decoded = jsonDecode(response.body);
-      final cursor = decoded['pagination']['cursor'];
-      final blockedList = decoded['data'] as List;
+    final data = await get<JsonMap>(
+      '/users/blocks',
+      queryParameters: queryParams,
+    );
 
-      if (blockedList.isNotEmpty) {
-        final result =
-            blockedList.map((e) => UserBlockedTwitch.fromJson(e)).toList();
+    final paginationCursor = data['pagination']['cursor'];
+    final blockedList = data['data'] as JsonList;
 
-        if (cursor != null) {
-          // Wait a bit (150 milliseconds) before recursively calling.
-          // This will prevent going over the rate limit to due a massive blocked users list.
-          //
-          // With the Twitch API, we can make up to 800 requests per minute.
-          // Waiting 150 milliseconds between requests will cap the rate here at 400 requests per minute.
-          await Future.delayed(const Duration(milliseconds: 150));
-          result.addAll(await getUserBlockedList(
-              id: id, cursor: cursor, headers: headers));
-        }
+    if (blockedList.isNotEmpty) {
+      final result = blockedList
+          .map((e) => UserBlockedTwitch.fromJson(e))
+          .toList();
 
-        return result;
-      } else {
-        debugPrint('User does not have anyone blocked');
-        return [];
+      if (paginationCursor != null) {
+        // Wait a bit (150 milliseconds) before recursively calling.
+        // This will prevent going over the rate limit to due a massive blocked users list.
+        //
+        // With the Twitch API, we can make up to 800 requests per minute.
+        // Waiting 150 milliseconds between requests will cap the rate here at 400 requests per minute.
+        await Future.delayed(const Duration(milliseconds: 150));
+        result.addAll(
+          await getUserBlockedList(id: id, cursor: paginationCursor),
+        );
       }
+
+      return result;
     } else {
-      return Future.error('User does not exist');
+      debugPrint('User does not have anyone blocked');
+      return [];
     }
   }
 
   // Blocks the user with the given ID and returns true on success or false on failure.
-  Future<bool> blockUser(
-      {required String userId, required Map<String, String> headers}) async {
-    final url = Uri.parse(
-        'https://api.twitch.tv/helix/users/blocks?target_user_id=$userId');
-
-    final response = await _client.put(url, headers: headers);
-    if (response.statusCode == 204) {
-      return true;
-    } else {
+  Future<bool> blockUser({required String userId}) async {
+    try {
+      await put<dynamic>(
+        '/users/blocks',
+        queryParameters: {'target_user_id': userId},
+      );
+      return true; // If no exception, operation succeeded
+    } on ApiException {
       return false;
     }
   }
 
   // Unblocks the user with the given ID and returns true on success or false on failure.
-  Future<bool> unblockUser(
-      {required String userId, required Map<String, String> headers}) async {
-    final url = Uri.parse(
-        'https://api.twitch.tv/helix/users/blocks?target_user_id=$userId');
-
-    final response = await _client.delete(url, headers: headers);
-    if (response.statusCode == 204) {
-      return true;
-    } else {
+  Future<bool> unblockUser({required String userId}) async {
+    try {
+      await delete<dynamic>(
+        '/users/blocks',
+        queryParameters: {'target_user_id': userId},
+      );
+      return true; // If no exception, operation succeeded
+    } on ApiException {
       return false;
     }
   }
+
+  Future<SharedChatSession?> getSharedChatSession({
+    required String broadcasterId,
+  }) async {
+    final data = await get<JsonMap>(
+      '/shared_chat/session',
+      queryParameters: {'broadcaster_id': broadcasterId},
+    );
+
+    final sessionData = data['data'] as JsonList;
+    if (sessionData.isEmpty) {
+      return null;
+    }
+
+    return SharedChatSession.fromJson(sessionData.first);
+  }
+
+  /// Gets the color used for the user's name in chat.
+  /// [userId] - The ID of the user whose chat color to get
+  /// Returns the color as a hex string or empty string if no color is set.
+  Future<String> getUserChatColor({required String userId}) async {
+    try {
+      final data = await get<JsonMap>(
+        '/chat/color',
+        queryParameters: {'user_id': userId},
+      );
+
+      final users = data['data'] as JsonList;
+      if (users.isNotEmpty) {
+        final user = users.first as JsonMap;
+        return user['color'] as String? ?? '';
+      }
+
+      return '';
+    } on ApiException {
+      return '';
+    }
+  }
+
+  /// Updates the color used for the user's name in chat.
+  /// [userId] - The ID of the user whose chat color to update
+  /// [color] - The color to use. Can be a named color (blue, blue_violet, etc.) or hex code for Turbo/Prime users
+  /// Returns true on success or false on failure.
+  Future<bool> updateUserChatColor({
+    required String userId,
+    required String color,
+  }) async {
+    try {
+      await put<dynamic>(
+        '/chat/color',
+        queryParameters: {'user_id': userId, 'color': color},
+      );
+      return true; // If no exception, operation succeeded
+    } on ApiException catch (e) {
+      // Log the specific error for debugging
+      debugPrint('Failed to update chat color: $e');
+      return false;
+    }
+  }
+
+  // Gets recent messages from a third-party service.
+  Future<JsonList> getRecentMessages({required String userLogin}) async {
+    // Use custom base URL for third-party service
+    final data = await get<JsonMap>(
+      '$_recentMessagesUrl/recent-messages/$userLogin',
+    );
+
+    return data['messages'] as JsonList;
+  }
+
+  /// Returns a list of broadcaster IDs for channels the authenticated user
+  /// moderates, following pagination so moderators of more than one page of
+  /// channels aren't silently truncated at the first 100.
+  Future<List<String>> getModeratedChannels({
+    required String id,
+    String? cursor,
+  }) async {
+    try {
+      // Default page size is 20; request the max to keep the request count low.
+      final queryParams = {'user_id': id, 'first': '100'};
+      if (cursor != null) queryParams['after'] = cursor;
+
+      final data = await get<JsonMap>(
+        '/moderation/channels',
+        queryParameters: queryParams,
+      );
+
+      final channels = data['data'] as JsonList;
+      final result = channels
+          .map((channel) => (channel as JsonMap)['broadcaster_id'] as String?)
+          .whereType<String>()
+          .toList();
+
+      final paginationCursor = data['pagination']['cursor'];
+      if (paginationCursor != null && channels.isNotEmpty) {
+        // Throttle between pages to stay under Twitch's rate limit, matching
+        // getUserBlockedList above.
+        await Future.delayed(const Duration(milliseconds: 150));
+        result.addAll(
+          await getModeratedChannels(id: id, cursor: paginationCursor),
+        );
+      }
+
+      return result;
+    } on ApiException catch (e) {
+      // Backstop: callers should skip this without moderator scopes, but a
+      // stale/partial token must not take down chat.
+      debugPrint('Failed to get moderated channels: $e');
+      return [];
+    }
+  }
+
+  /// Deletes a specific chat message.
+  Future<bool> deleteChatMessage({
+    required String broadcasterId,
+    required String moderatorId,
+    required String messageId,
+  }) async {
+    // Let ApiException propagate so the caller can surface Twitch's reason
+    // (e.g. you can't delete the broadcaster's or another moderator's message)
+    // instead of a generic failure.
+    await delete<dynamic>(
+      '/moderation/chat',
+      queryParameters: {
+        'broadcaster_id': broadcasterId,
+        'moderator_id': moderatorId,
+        'message_id': messageId,
+      },
+    );
+    return true;
+  }
+
+  /// Bans or times out a user from a channel.
+  ///
+  /// The optional `duration` in seconds will timeout the user. If omitted, the user is banned.
+  /// The optional `reason` will be displayed to the banned user and other moderators.
+  Future<bool> banUser({
+    required String broadcasterId,
+    required String moderatorId,
+    required String userIdToBan,
+    int? duration,
+    String? reason,
+  }) async {
+    final requestBody = {
+      'data': {
+        'user_id': userIdToBan,
+        'duration': ?duration,
+        'reason': ?reason,
+      },
+    };
+
+    // Let ApiException propagate so the caller can surface Twitch's reason
+    // (e.g. the target is a moderator and can't be banned) instead of a
+    // generic failure.
+    final response = await post<JsonMap>(
+      '/moderation/bans',
+      data: requestBody,
+      queryParameters: {
+        'broadcaster_id': broadcasterId,
+        'moderator_id': moderatorId,
+      },
+    );
+    final data = response['data'] as JsonList;
+    return data.isNotEmpty;
+  }
+
+  /// Removes a ban or timeout for a user in a channel.
+  ///
+  /// A timeout is a time-limited ban, so this lifts both. Lets ApiException
+  /// propagate (e.g. the user isn't currently banned) so the caller can show
+  /// Twitch's reason.
+  Future<bool> unbanUser({
+    required String broadcasterId,
+    required String moderatorId,
+    required String userId,
+  }) async {
+    await delete<dynamic>(
+      '/moderation/bans',
+      queryParameters: {
+        'broadcaster_id': broadcasterId,
+        'moderator_id': moderatorId,
+        'user_id': userId,
+      },
+    );
+    return true;
+  }
+}
+
+/// Result of a successful Twitch `/oauth2/validate` call.
+class TwitchTokenInfo {
+  final List<String> scopes;
+
+  /// Present for user access tokens; omitted for app access tokens.
+  final String? userId;
+
+  const TwitchTokenInfo({required this.scopes, this.userId});
 }
diff --git a/lib/apis/twitch_auth_interceptor.dart b/lib/apis/twitch_auth_interceptor.dart
new file mode 100644
index 00000000..b5cd0a97
--- /dev/null
+++ b/lib/apis/twitch_auth_interceptor.dart
@@ -0,0 +1,31 @@
+import 'package:dio/dio.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+
+/// Dio interceptor that automatically adds Twitch authentication headers
+/// to requests targeting Twitch API endpoints.
+class TwitchAuthInterceptor extends Interceptor {
+  final AuthStore _authStore;
+
+  const TwitchAuthInterceptor(this._authStore);
+
+  @override
+  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
+    // Check if this is a Twitch API request that needs authentication
+    if (_shouldAddTwitchHeaders(options.uri)) {
+      // Add Twitch auth headers automatically
+      final twitchHeaders = _authStore.headersTwitch;
+      options.headers.addAll(twitchHeaders);
+    }
+
+    handler.next(options);
+  }
+
+  /// Determines if the request URL is for a Twitch API endpoint that requires authentication
+  bool _shouldAddTwitchHeaders(Uri uri) {
+    final url = uri.toString();
+
+    // Add headers for Twitch Helix API and OAuth endpoints
+    return url.startsWith('https://api.twitch.tv/helix') ||
+        url.startsWith('https://id.twitch.tv/oauth2');
+  }
+}
diff --git a/lib/apis/twitch_gql_api.dart b/lib/apis/twitch_gql_api.dart
new file mode 100644
index 00000000..3923d500
--- /dev/null
+++ b/lib/apis/twitch_gql_api.dart
@@ -0,0 +1,559 @@
+import 'dart:math';
+
+import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_integrity.dart';
+import 'package:frosty/constants.dart';
+import 'package:frosty/models/playback_access_token.dart';
+import 'package:frosty/models/stream.dart';
+
+/// Viewer sort for GQL directory / tag stream lists.
+enum StreamViewerSort {
+  viewersDesc,
+  viewersAsc;
+
+  String get gqlValue => switch (this) {
+    StreamViewerSort.viewersDesc => 'VIEWER_COUNT',
+    StreamViewerSort.viewersAsc => 'VIEWER_COUNT_ASC',
+  };
+}
+
+/// Twitch GQL API client for playback tokens and directory queries
+/// (freeform tags + sorted streams) that Helix does not expose.
+///
+/// Uses the Twitch web client ID (not the app's registered client ID)
+/// since the GQL endpoint requires it.
+class TwitchGqlApi extends BaseApiClient {
+  TwitchGqlApi(Dio dio) : super(dio, 'https://gql.twitch.tv');
+
+  static const _gqlHeaders = <String, String>{
+    'Client-ID': twitchGqlClientId,
+    'Content-Type': 'application/json',
+  };
+
+  Future<JsonMap> _gql(
+    Map<String, Object?> body, {
+    Map<String, String>? extraHeaders,
+  }) async {
+    final response = await post<JsonMap>(
+      '/gql',
+      data: body,
+      headers: {..._gqlHeaders, ...?extraHeaders},
+    );
+    final errors = response['errors'];
+    if (errors is List && errors.isNotEmpty) {
+      final message = (errors.first as JsonMap)['message'] as String? ??
+          'Twitch GQL error';
+      if (message.toLowerCase().contains('integrity')) {
+        throw IntegrityCheckException(message);
+      }
+      final data = response['data'];
+      final dataEmpty = data == null ||
+          (data is Map &&
+              data.values.every((value) => value == null));
+      if (dataEmpty) {
+        throw ApiException(message);
+      }
+    }
+    return response;
+  }
+
+  /// Optional web-session headers for directory pagination (page-2+).
+  Map<String, String> _directoryHeaders({
+    String? authToken,
+    String? integrityToken,
+    String? deviceId,
+  }) {
+    return {
+      'User-Agent': playbackUserAgent,
+      if (authToken != null && authToken.isNotEmpty)
+        'Authorization': 'OAuth $authToken',
+      if (deviceId != null && deviceId.isNotEmpty) 'X-Device-Id': deviceId,
+      if (integrityToken != null && integrityToken.isNotEmpty)
+        'Client-Integrity': integrityToken,
+    };
+  }
+
+  /// Browser-consistent User-Agent for playback-related requests. Twitch has
+  /// rejected access-token requests with non-browser UAs before
+  /// (streamlink#6574); sending one consistent with the web client ID and
+  /// web session token avoids the obvious fingerprint mismatch.
+  static const playbackUserAgent =
+      'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 '
+      '(KHTML, like Gecko) Chrome/140.0.0.0 Safari/537.36';
+
+  /// Headers for the HLS playlist/segment requests issued by the native
+  /// player, mirroring what the web player sends to Usher/weaver.
+  static const playbackHttpHeaders = <String, String>{
+    'User-Agent': playbackUserAgent,
+    'Referer': 'https://player.twitch.tv',
+    'Origin': 'https://player.twitch.tv',
+  };
+
+  /// Fetches a playback access token for the given channel [login].
+  ///
+  /// When [authToken] is provided, the request is authenticated which may
+  /// grant ad-free playback for subscribers and Turbo users.
+  ///
+  /// [playerType] / [platform] mirror the web player's GQL variables. Ad
+  /// blocking (TwitchAdSolutions / vaft) uses non-`site` player types such as
+  /// `popout` / `embed` / `autoplay`.
+  ///
+  /// Uses the web client's persisted GQL query (smaller payload, blends in
+  /// with regular web traffic); falls back to the inline query template if
+  /// Twitch ever rotates the persisted-query hash.
+  Future<PlaybackAccessToken> getPlaybackAccessToken({
+    required String login,
+    String? authToken,
+    String playerType = 'site',
+    String platform = 'web',
+  }) async {
+    final headers = <String, String>{
+      'Client-ID': twitchGqlClientId,
+      'User-Agent': playbackUserAgent,
+      if (authToken != null) 'Authorization': 'OAuth $authToken',
+    };
+
+    final variables = {
+      'isLive': true,
+      'login': login,
+      'isVod': false,
+      'vodID': '',
+      'playerType': playerType,
+      'platform': platform,
+    };
+
+    Future<JsonMap> query(Map<String, Object> body) =>
+        post<JsonMap>('/gql', data: body, headers: headers);
+
+    final response = await query({
+      'operationName': 'PlaybackAccessToken',
+      'extensions': {
+        'persistedQuery': {
+          'version': 1,
+          // Stable for years; used by the web player and streamlink.
+          'sha256Hash':
+              'ed230aa1e33e07eebb8928504583da78a5173989fadfb1ac94be06a04f3cdbe9',
+        },
+      },
+      'variables': variables,
+    });
+
+    // PersistedQueryNotFound (or similar) comes back as a 200 with an
+    // errors array — retry once with the inline template before failing.
+    if (response['errors'] != null && response['data'] == null) {
+      debugPrint(
+        'TwitchGqlApi: persisted query failed (${response['errors']}), '
+        'falling back to inline template',
+      );
+      return PlaybackAccessToken.fromGqlResponse(
+        await query({
+          'operationName': 'PlaybackAccessToken_Template',
+          'query':
+              'query PlaybackAccessToken_Template(\$login: String!, \$isLive: Boolean!, \$vodID: ID!, \$isVod: Boolean!, \$playerType: String!) { streamPlaybackAccessToken(channelName: \$login, params: {platform: "web", playerBackend: "mediaplayer", playerType: \$playerType}) @include(if: \$isLive) { value signature __typename } videoPlaybackAccessToken(id: \$vodID, params: {platform: "web", playerBackend: "mediaplayer", playerType: \$playerType}) @include(if: \$isVod) { value signature __typename } }',
+          'variables': variables,
+        }),
+      );
+    }
+
+    return PlaybackAccessToken.fromGqlResponse(response);
+  }
+
+  /// Fetches raw playlist text (multivariant or media) with playback headers.
+  Future<String> fetchPlaylistText(String url) async {
+    return get<String>(url, headers: playbackHttpHeaders);
+  }
+
+  /// Builds the HLS stream URL for the given channel [login] and [token].
+  String buildHlsUrl({
+    required String login,
+    required PlaybackAccessToken token,
+  }) {
+    final random = Random().nextInt(999999);
+    final encodedToken = Uri.encodeComponent(token.value);
+
+    // Usher v2 — what the web player and streamlink use today. Same query
+    // params and token; the multivariant playlist is standards-compliant
+    // (EXT-X-SESSION-DATA + STREAM-INF only, no EXT-X-MEDIA/TWITCH-INFO).
+    return 'https://usher.ttvnw.net/api/v2/channel/hls/$login.m3u8'
+        '?sig=${token.signature}'
+        '&token=$encodedToken'
+        '&allow_source=true'
+        '&allow_audio_only=true'
+        '&fast_bread=true'
+        '&supported_codecs=av1,h265,h264'
+        '&reassignments_supported=true'
+        '&platform=web'
+        '&player_backend=mediaplayer'
+        '&play_session_id=${_randomSessionId()}'
+        '&playlist_include_framerate=true'
+        '&p=$random';
+  }
+
+  /// 32-char hex play-session id, matching the web client and streamlink. Sent
+  /// to Usher to identify the playback session; Usher tolerates its absence
+  /// today but has historically tightened required params.
+  String _randomSessionId() {
+    final random = Random();
+    final buffer = StringBuffer();
+    for (var i = 0; i < 32; i++) {
+      buffer.write(random.nextInt(16).toRadixString(16));
+    }
+    return buffer.toString();
+  }
+
+  /// Freeform tag name suggestions for search-as-you-type.
+  Future<List<String>> searchFreeformTags({
+    required String query,
+    int first = 20,
+  }) async {
+    if (query.trim().isEmpty) return const [];
+
+    final response = await _gql({
+      'operationName': 'SearchFreeformTags',
+      'query':
+          r'query SearchFreeformTags($query: String!, $first: Int) {'
+          r' searchFreeformTags(userQuery: $query, first: $first) {'
+          r' edges { node { tagName } } } }',
+      'variables': {'query': query, 'first': first},
+    });
+
+    final edges =
+        (((response['data'] as JsonMap?)?['searchFreeformTags']
+                as JsonMap?)?['edges']
+            as List?) ??
+        const [];
+
+    return edges
+        .map((edge) {
+          final node = (edge as JsonMap)['node'] as JsonMap?;
+          return node?['tagName'] as String?;
+        })
+        .whereType<String>()
+        .toList();
+  }
+
+  /// Live streams matching optional [freeformTags] / [languages], sorted by viewers.
+  ///
+  /// Twitch caps `first` at 30 for this connection. Cursor pagination needs a
+  /// Client-Integrity token (+ matching [deviceId] / web [authToken]); without
+  /// them page-2 throws [IntegrityCheckException].
+  Future<StreamsTwitch> getStreams({
+    List<String>? freeformTags,
+    List<String>? languages,
+    StreamViewerSort sort = StreamViewerSort.viewersDesc,
+    String? cursor,
+    int first = 30,
+    String? authToken,
+    String? integrityToken,
+    String? deviceId,
+  }) async {
+    final cappedFirst = first.clamp(1, 30);
+    final gqlLangs = languages == null || languages.isEmpty
+        ? null
+        : languages
+              .map((l) => l.trim().toUpperCase())
+              .where((l) => l.isNotEmpty)
+              .toList();
+
+    final response = await _gql(
+      {
+        'operationName': 'FrostyTopStreams',
+        'query':
+            r'query FrostyTopStreams($first: Int, $after: Cursor, $tags: [String!], $sort: StreamSort, $langs: [Language!]) {'
+            r' streams(first: $first, after: $after, options: { sort: $sort, freeformTags: $tags, languages: $langs }) {'
+            r' edges { cursor node {'
+            r' id title viewersCount createdAt language'
+            r' game { id name }'
+            r' broadcaster { id login displayName }'
+            r' } } pageInfo { hasNextPage } } }',
+        'variables': {
+          'first': cappedFirst,
+          'after': cursor,
+          'tags': freeformTags,
+          'sort': sort.gqlValue,
+          'langs': gqlLangs,
+        },
+      },
+      extraHeaders: _directoryHeaders(
+        authToken: authToken,
+        integrityToken: integrityToken,
+        deviceId: deviceId,
+      ),
+    );
+
+    final connection =
+        (response['data'] as JsonMap?)?['streams'] as JsonMap? ?? const {};
+    return _streamsFromConnection(connection);
+  }
+
+  /// Live streams under a category/game, with viewer sort and optional languages.
+  Future<StreamsTwitch> getGameStreams({
+    required String gameId,
+    List<String>? languages,
+    StreamViewerSort sort = StreamViewerSort.viewersDesc,
+    String? cursor,
+    int first = 30,
+    String? authToken,
+    String? integrityToken,
+    String? deviceId,
+  }) async {
+    final cappedFirst = first.clamp(1, 30);
+    final gqlLangs = languages == null || languages.isEmpty
+        ? null
+        : languages
+              .map((l) => l.trim().toUpperCase())
+              .where((l) => l.isNotEmpty)
+              .toList();
+
+    final response = await _gql(
+      {
+        'operationName': 'FrostyGameStreams',
+        'query':
+            r'query FrostyGameStreams($id: ID!, $first: Int, $after: Cursor, $sort: StreamSort, $langs: [Language!]) {'
+            r' game(id: $id) { streams(first: $first, after: $after, options: { sort: $sort, languages: $langs }) {'
+            r' edges { cursor node {'
+            r' id title viewersCount createdAt language'
+            r' game { id name }'
+            r' broadcaster { id login displayName }'
+            r' } } pageInfo { hasNextPage } } } }',
+        'variables': {
+          'id': gameId,
+          'first': cappedFirst,
+          'after': cursor,
+          'sort': sort.gqlValue,
+          'langs': gqlLangs,
+        },
+      },
+      extraHeaders: _directoryHeaders(
+        authToken: authToken,
+        integrityToken: integrityToken,
+        deviceId: deviceId,
+      ),
+    );
+
+    final game = (response['data'] as JsonMap?)?['game'] as JsonMap?;
+    if (game == null) {
+      return const StreamsTwitch([], {});
+    }
+    return _streamsFromConnection(game['streams'] as JsonMap? ?? const {});
+  }
+
+  /// Persisted hashes used by the Twitch web Follow button (same as Xtra).
+  static const _followUserHash =
+      '800e7346bdf7e5278a3c1d3f21b2b56e2639928f86815677a7126b093b2fdd08';
+  static const _unfollowUserHash =
+      'f7dae976ebf41c755ae2d758546bfd176b4eeb856656098bb40e0a672ca0d880';
+
+  /// Follows [targetId] using the web GQL session. Helix no longer supports this.
+  ///
+  /// Requires [authToken] from the Twitch web cookie (`gqlToken`). Some accounts
+  /// need a [integrityToken] + matching [deviceId]; callers should retry after
+  /// [fetchIntegrityToken] when [IntegrityCheckException] is thrown.
+  Future<void> followUser({
+    required String targetId,
+    required String authToken,
+    bool disableNotifications = false,
+    String? integrityToken,
+    String? deviceId,
+  }) async {
+    await _mutateFollow(
+      operationName: 'FollowButton_FollowUser',
+      sha256Hash: _followUserHash,
+      authToken: authToken,
+      integrityToken: integrityToken,
+      deviceId: deviceId,
+      variables: {
+        'input': {
+          'disableNotifications': disableNotifications,
+          'targetID': targetId,
+        },
+      },
+      successPath: const ['followUser'],
+    );
+  }
+
+  /// Unfollows [targetId] using the web GQL session.
+  Future<void> unfollowUser({
+    required String targetId,
+    required String authToken,
+    String? integrityToken,
+    String? deviceId,
+  }) async {
+    await _mutateFollow(
+      operationName: 'FollowButton_UnfollowUser',
+      sha256Hash: _unfollowUserHash,
+      authToken: authToken,
+      integrityToken: integrityToken,
+      deviceId: deviceId,
+      variables: {
+        'input': {'targetID': targetId},
+      },
+      successPath: const ['unfollowUser'],
+    );
+  }
+
+  /// Mints a Client-Integrity token for authenticated GQL mutations.
+  ///
+  /// Bound to [deviceId] and [authToken]; send the same values on follow calls.
+  /// Tokens minted outside a real browser are usually flagged `is_bad_bot` —
+  /// those throw [IntegrityCheckException] so callers can fall back to a
+  /// WebView capture.
+  Future<({String token, int expirationMs})> fetchIntegrityToken({
+    required String authToken,
+    required String deviceId,
+  }) async {
+    final response = await post<JsonMap>(
+      '/integrity',
+      data: <String, dynamic>{},
+      headers: {
+        'Client-ID': twitchGqlClientId,
+        'Authorization': 'OAuth $authToken',
+        'X-Device-Id': deviceId,
+        'User-Agent': playbackUserAgent,
+        'Content-Type': 'application/json',
+      },
+    );
+
+    final token = response['token'] as String?;
+    final expiration = response['expiration'];
+    if (token == null || token.isEmpty) {
+      throw const ApiException('Twitch integrity token missing from response');
+    }
+    if (TwitchIntegrity.isBadBot(token)) {
+      throw const IntegrityCheckException(
+        'Twitch integrity token flagged as bad bot',
+      );
+    }
+    final expirationMs = expiration is int
+        ? expiration
+        : int.tryParse('$expiration') ??
+              TwitchIntegrity.expirationMs(token) ??
+              0;
+    return (token: token, expirationMs: expirationMs);
+  }
+
+  Future<void> _mutateFollow({
+    required String operationName,
+    required String sha256Hash,
+    required String authToken,
+    required JsonMap variables,
+    required List<String> successPath,
+    String? integrityToken,
+    String? deviceId,
+  }) async {
+    final headers = <String, String>{
+      'Client-ID': twitchGqlClientId,
+      'Content-Type': 'application/json',
+      'Authorization': 'OAuth $authToken',
+      'User-Agent': playbackUserAgent,
+      if (deviceId != null && deviceId.isNotEmpty) 'X-Device-Id': deviceId,
+      if (integrityToken != null && integrityToken.isNotEmpty)
+        'Client-Integrity': integrityToken,
+    };
+
+    final response = await post<dynamic>(
+      '/gql',
+      data: {
+        'operationName': operationName,
+        'variables': variables,
+        'extensions': {
+          'persistedQuery': {
+            'version': 1,
+            'sha256Hash': sha256Hash,
+          },
+        },
+      },
+      headers: headers,
+    );
+
+    final map = _gqlPayloadMap(response);
+    _throwIfGqlFailed(map);
+
+    JsonMap? cursor = map['data'] as JsonMap?;
+    for (final key in successPath) {
+      final next = cursor?[key];
+      if (next is JsonMap) {
+        cursor = next;
+      } else if (next == null) {
+        throw ApiException('Twitch $operationName returned no data');
+      } else {
+        return;
+      }
+    }
+  }
+
+  JsonMap _gqlPayloadMap(dynamic response) {
+    if (response is List) {
+      if (response.isEmpty || response.first is! Map) {
+        throw const ApiException('Unexpected Twitch GQL response');
+      }
+      return Map<String, dynamic>.from(response.first as Map);
+    }
+    if (response is Map) {
+      return Map<String, dynamic>.from(response);
+    }
+    throw const ApiException('Unexpected Twitch GQL response');
+  }
+
+  void _throwIfGqlFailed(JsonMap map) {
+    final errors = map['errors'];
+    if (errors is! List || errors.isEmpty) return;
+
+    final message =
+        (errors.first as JsonMap)['message'] as String? ?? 'Twitch GQL error';
+    final lower = message.toLowerCase();
+    if (lower.contains('integrity')) {
+      throw IntegrityCheckException(message);
+    }
+    throw ApiException(message);
+  }
+
+  StreamsTwitch _streamsFromConnection(JsonMap connection) {
+    final edges = (connection['edges'] as List?) ?? const [];
+    final pageInfo = connection['pageInfo'] as JsonMap?;
+    // Prefer explicit pageInfo; if missing, assume more when we got a full page.
+    final hasNext = pageInfo?['hasNextPage'] as bool? ?? edges.length >= 30;
+
+    final streams = <StreamTwitch>[];
+    String? nextCursor;
+
+    for (final edge in edges) {
+      final edgeMap = edge as JsonMap;
+      nextCursor = edgeMap['cursor'] as String?;
+      final node = edgeMap['node'] as JsonMap?;
+      if (node == null) continue;
+      streams.add(_streamFromNode(node));
+    }
+
+    return StreamsTwitch(
+      streams,
+      hasNext && nextCursor != null && nextCursor.isNotEmpty
+          ? {'cursor': nextCursor}
+          : const {},
+    );
+  }
+
+  StreamTwitch _streamFromNode(JsonMap node) {
+    final broadcaster = node['broadcaster'] as JsonMap? ?? const {};
+    final game = node['game'] as JsonMap? ?? const {};
+    final login = broadcaster['login'] as String? ?? '';
+    final language = (node['language'] as String? ?? '').toLowerCase();
+
+    return StreamTwitch(
+      broadcaster['id'] as String? ?? '',
+      login,
+      broadcaster['displayName'] as String? ?? login,
+      game['id'] as String? ?? '',
+      game['name'] as String? ?? '',
+      node['title'] as String? ?? '',
+      (node['viewersCount'] as num?)?.toInt() ?? 0,
+      node['createdAt'] as String? ?? '',
+      // Helix-style placeholder so existing thumbnail widgets keep working.
+      'https://static-cdn.jtvnw.net/previews-ttv/live_user_$login-{width}x{height}.jpg',
+      language,
+      const [],
+    );
+  }
+}
diff --git a/lib/apis/twitch_integrity.dart b/lib/apis/twitch_integrity.dart
new file mode 100644
index 00000000..efef0346
--- /dev/null
+++ b/lib/apis/twitch_integrity.dart
@@ -0,0 +1,81 @@
+import 'dart:convert';
+
+/// Helpers for Twitch `Client-Integrity` tokens (`v4.public.*` / `v4.local.*`).
+class TwitchIntegrity {
+  const TwitchIntegrity._();
+
+  /// Decodes the JSON payload embedded in an integrity token, if present.
+  static Map<String, dynamic>? decodePayload(String token) {
+    final parts = token.split('.');
+    if (parts.length < 2) return null;
+
+    for (final part in parts.skip(1)) {
+      if (part.isEmpty) continue;
+      try {
+        final normalized = base64Url.normalize(part);
+        final decoded = utf8.decode(base64Url.decode(normalized));
+        final dynamic json = jsonDecode(decoded);
+        if (json is Map &&
+            (json.containsKey('is_bad_bot') ||
+                json.containsKey('client_id') ||
+                json.containsKey('device_id'))) {
+          return Map<String, dynamic>.from(json);
+        }
+      } catch (_) {
+        // Try the next segment — token layout varies by version.
+      }
+    }
+    return null;
+  }
+
+  /// Dio/`POST /integrity` tokens from non-browser clients are usually flagged.
+  static bool isBadBot(String token) {
+    final payload = decodePayload(token);
+    if (payload == null) return false;
+    final flag = payload['is_bad_bot'];
+    if (flag is bool) return flag;
+    if (flag is String) return flag.toLowerCase() == 'true';
+    return false;
+  }
+
+  /// Expiration in epoch millis from the payload, if present.
+  static int? expirationMs(String token) {
+    final payload = decodePayload(token);
+    if (payload == null) return null;
+
+    final exp = payload['exp'];
+    if (exp is int) {
+      // Already millis if large; seconds if typical JWT.
+      return exp > 100000000000 ? exp : exp * 1000;
+    }
+    if (exp is String) {
+      final asInt = int.tryParse(exp);
+      if (asInt != null) {
+        return asInt > 100000000000 ? asInt : asInt * 1000;
+      }
+      final dt = DateTime.tryParse(exp);
+      if (dt != null) return dt.millisecondsSinceEpoch;
+    }
+    return null;
+  }
+
+  /// Device id the token was minted for (`X-Device-Id` must match).
+  static String? deviceId(String token) {
+    final payload = decodePayload(token);
+    final id = payload?['device_id'];
+    return id is String && id.isNotEmpty ? id : null;
+  }
+}
+
+/// Credentials captured from a browser/WebView GQL request.
+class GqlIntegrityCredentials {
+  final String integrityToken;
+  final String deviceId;
+  final int expirationMs;
+
+  const GqlIntegrityCredentials({
+    required this.integrityToken,
+    required this.deviceId,
+    required this.expirationMs,
+  });
+}
diff --git a/lib/apis/unauthorized_interceptor.dart b/lib/apis/unauthorized_interceptor.dart
new file mode 100644
index 00000000..318a04ce
--- /dev/null
+++ b/lib/apis/unauthorized_interceptor.dart
@@ -0,0 +1,143 @@
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:frosty/main.dart';
+import 'package:frosty/screens/onboarding/login_webview.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/utils/twitch_oauth_scopes.dart';
+import 'package:frosty/widgets/frosty_dialog.dart';
+import 'package:provider/provider.dart';
+
+/// Dio interceptor that catches 401 Unauthorized errors and shows a login dialog
+class UnauthorizedInterceptor extends Interceptor {
+  final AuthStore _authStore;
+
+  UnauthorizedInterceptor(this._authStore);
+
+  @override
+  void onError(DioException err, ErrorInterceptorHandler handler) {
+    // Check if this is a 401 Unauthorized error on a Twitch Helix/OAuth request
+    if (err.response?.statusCode == 401 &&
+        _isTwitchHelixOrOAuth(err.requestOptions.uri)) {
+      // For token validation requests, let the error propagate so validateToken can handle it
+      if (err.requestOptions.uri.path.endsWith('/validate')) {
+        handler.next(err);
+        return;
+      }
+
+      final path = err.requestOptions.uri.path;
+
+      // Background moderated-channels fetches must never nag — especially for
+      // core-only tokens after an app upgrade.
+      if (isTwitchModeratedChannelsPath(path)) {
+        handler.reject(err);
+        return;
+      }
+
+      // Moderator actions without scopes → opt-in Enable flow, not a generic
+      // "missing permissions" re-login for core scopes.
+      if (isTwitchModeratorActionPath(path) &&
+          !_authStore.hasModeratorScopes) {
+        _showAuthDialog(
+          title: 'Enable moderator tools',
+          message: enableModeratorToolsDialogMessage(),
+          primaryLabel: 'Enable',
+          onPrimary: () => openEnableModeratorTools(_authStore),
+        );
+        handler.reject(err);
+        return;
+      }
+
+      // Core-only messaging: if core scopes are present, prefer "Session expired"
+      // over "Missing permissions" (401 ≠ always missing scope).
+      final isLoggedIn = _authStore.isLoggedIn;
+      final missingCore = missingTwitchScopes(
+        granted: _authStore.grantedScopes,
+      );
+      _showAuthDialog(
+        title: isLoggedIn && missingCore.isNotEmpty
+            ? 'Missing permissions'
+            : 'Session expired',
+        message: unauthorizedDialogMessage(
+          isLoggedIn: isLoggedIn,
+          grantedScopes: _authStore.grantedScopes,
+        ),
+        primaryLabel: 'Log in',
+        onPrimary: () {
+          final context = navigatorKey.currentContext;
+          if (context == null) return;
+          Navigator.of(context).push(
+            MaterialPageRoute(
+              builder: (context) => Provider<AuthStore>.value(
+                value: _authStore,
+                child: const LoginWebView(),
+              ),
+            ),
+          );
+        },
+      );
+      handler.reject(err);
+      return;
+    }
+
+    // For non-401 errors, continue with normal error handling
+    handler.next(err);
+  }
+
+  void _showAuthDialog({
+    required String title,
+    required String message,
+    required String primaryLabel,
+    required VoidCallback onPrimary,
+  }) {
+    final context = navigatorKey.currentContext;
+    if (context == null) return;
+    if (_isDialogShowing) return;
+    _isDialogShowing = true;
+
+    showDialog(
+      context: context,
+      barrierDismissible: false,
+      builder: (BuildContext dialogContext) {
+        return FrostyDialog(
+          title: title,
+          message: message,
+          actions: [
+            TextButton(
+              onPressed: () {
+                _isDialogShowing = false;
+                Navigator.of(dialogContext).pop();
+              },
+              child: const Text('Cancel'),
+            ),
+            FilledButton(
+              onPressed: () {
+                _isDialogShowing = false;
+                Navigator.of(dialogContext).pop();
+                onPrimary();
+              },
+              child: Text(primaryLabel),
+            ),
+          ],
+        );
+      },
+    ).then((_) {
+      _isDialogShowing = false;
+    });
+  }
+
+  static bool _isDialogShowing = false;
+
+  bool _isTwitchHelixOrOAuth(Uri uri) {
+    final url = uri.toString();
+    return url.startsWith('https://api.twitch.tv/helix') ||
+        url.startsWith('https://id.twitch.tv/oauth2');
+  }
+}
+
+/// Helix path for listing channels the user moderates.
+bool isTwitchModeratedChannelsPath(String path) =>
+    path.contains('/moderation/channels');
+
+/// Helix paths for delete / ban / timeout / unban.
+bool isTwitchModeratorActionPath(String path) =>
+    path.contains('/moderation/chat') || path.contains('/moderation/bans');
diff --git a/lib/cache_manager.dart b/lib/cache_manager.dart
new file mode 100644
index 00000000..b3d61f48
--- /dev/null
+++ b/lib/cache_manager.dart
@@ -0,0 +1,44 @@
+import 'dart:io';
+
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:path_provider/path_provider.dart';
+
+class CustomCacheManager {
+  static const key = 'libCachedImageData';
+  static final _repo = CacheObjectProvider(databaseName: key);
+  static final instance = CacheManager(
+    Config(
+      key,
+      stalePeriod: const Duration(days: 30),
+      maxNrOfCacheObjects: 10000,
+      repo: _repo,
+    ),
+  );
+
+  static Future<void> removeOrphanedCacheFiles() async {
+    final tempDir = await getTemporaryDirectory();
+    final cacheDir = Directory('${tempDir.path}/$key');
+
+    if (!await cacheDir.exists()) {
+      return;
+    }
+
+    final allFiles = cacheDir.listSync(recursive: true).toList();
+
+    await _repo.open();
+    final cachedObjects = await _repo.getAllObjects();
+    final dbFiles = cachedObjects.map((e) => e.relativePath).toSet();
+
+    final orphanedFiles = allFiles.where((file) {
+      final relativePath = file.path.split('$key/').last;
+      return !dbFiles.contains(relativePath);
+    }).toList();
+
+    final deletions = orphanedFiles.map((file) => file.delete()).toList();
+
+    try {
+      await Future.wait(deletions);
+      // ignore: empty_catches
+    } catch (e) {}
+  }
+}
diff --git a/lib/constants.dart b/lib/constants.dart
index 68c67376..0b977e2a 100644
--- a/lib/constants.dart
+++ b/lib/constants.dart
@@ -1,6 +1,20 @@
+import 'package:flutter/material.dart';
+
 /// Twitch API client ID.
 const clientId = String.fromEnvironment('CLIENT_ID');
 
+/// Twitch GQL client ID (web player, used for playback access tokens).
+const twitchGqlClientId = 'kimne78kx3ncx6brgo4mv6wki5h1ko';
+
+/// SharedPreferences key for the per-channel last-selected stream quality.
+/// A saved variant that doesn't exist on the target channel (e.g. 1080p on a
+/// source-only channel) falls back to Auto via the quality-list lookup.
+String lastStreamQualityKey(String userLogin) =>
+    'last_stream_quality_$userLogin';
+
+/// Legacy global key. Cleared on startup during SharedPreferences init.
+const kLegacyLastStreamQualityKey = 'last_stream_quality';
+
 /// Twitch API client secret.
 const secret = String.fromEnvironment('SECRET');
 
@@ -19,8 +33,70 @@ const zeroWidthEmotes = [
 /// Regex for matching strings that contain lower or upper case English characters.
 final regexEnglish = RegExp(r'[a-zA-Z]');
 
+/// Regex for matching strings that contain only numeric characters.
+final regexNumbersOnly = RegExp(r'^\d+$');
+
+/// Regex for matching URLs and file names in text.
+final regexLink = RegExp(
+  r'(?<![A-Za-z0-9_.-])' // left boundary
+  r'(?:' // ───────── URL ─────────
+  r'(?:www\.)?' // optional www.
+  r'(?:[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?\.)+'
+  r'[A-Za-z]{2,63}' // TLD
+  r'(?::\d{1,5})?' // optional :port
+  r'(?:/[^\s]*)?' // optional path / query / hash
+  r'|' // ───── file names ──────
+  r'[A-Za-z0-9_-]+\.(?:' // bare `doom.exe`, `logo.png`, …
+  r'exe|png|jpe?g|gif|bmp|webp|mp4|avi|zip|rar|pdf'
+  r')'
+  r')'
+  r'(?![A-Za-z0-9-])', // right boundary
+  caseSensitive: false,
+);
+
+/// Standard corner radius for card thumbnails and box art.
+const kCardBorderRadius = BorderRadius.all(Radius.circular(8));
+
 /// The default badge width and height.
 const defaultBadgeSize = 18.0;
 
 /// The default emote width and height when none are provided.
 const defaultEmoteSize = 28.0;
+
+/// Available named chat colors for Twitch users.
+const chatColorNames = [
+  'blue',
+  'blue_violet',
+  'cadet_blue',
+  'chocolate',
+  'coral',
+  'dodger_blue',
+  'firebrick',
+  'golden_rod',
+  'green',
+  'hot_pink',
+  'orange_red',
+  'red',
+  'sea_green',
+  'spring_green',
+  'yellow_green',
+];
+
+/// Color values for the named chat colors.
+const Map<String, Color> chatColorValues = {
+  'blue': Color(0xFF0000FF),
+  'blue_violet': Color(0xFF8A2BE2),
+  'cadet_blue': Color(0xFF5F9EA0),
+  'chocolate': Color(0xFFD2691E),
+  'coral': Color(0xFFFF7F50),
+  'dodger_blue': Color(0xFF1E90FF),
+  'firebrick': Color(0xFFB22222),
+  'golden_rod': Color(0xFFDAA520),
+  'green': Color(0xFF008000),
+  'hot_pink': Color(0xFFFF69B4),
+  'orange_red': Color(0xFFFF4500),
+  'red': Color(0xFFFF0000),
+  'sea_green': Color(0xFF2E8B57),
+  'spring_green': Color(0xFF00FF7F),
+  'yellow_green': Color(0xFF9ACD32),
+};
diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart
index 5349f973..39d94664 100644
--- a/lib/firebase_options.dart
+++ b/lib/firebase_options.dart
@@ -63,7 +63,8 @@ class DefaultFirebaseOptions {
     messagingSenderId: '403282332389',
     projectId: 'frosty-128de',
     storageBucket: 'frosty-128de.appspot.com',
-    iosClientId: '403282332389-gst8k8gl71a7vrhf5k69nl8pnsq19rg8.apps.googleusercontent.com',
+    iosClientId:
+        '403282332389-gst8k8gl71a7vrhf5k69nl8pnsq19rg8.apps.googleusercontent.com',
     iosBundleId: 'com.tommychow.frosty',
   );
 }
diff --git a/lib/main.dart b/lib/main.dart
index 437f2259..b0b87d00 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,43 +1,129 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:device_preview/device_preview.dart';
+import 'package:advanced_in_app_review/advanced_in_app_review.dart';
+import 'package:app_links/app_links.dart';
+import 'package:dio/dio.dart';
+import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+import 'package:firebase_performance/firebase_performance.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:frosty/apis/base_api_client.dart' show ApiException;
 import 'package:frosty/apis/bttv_api.dart';
+import 'package:frosty/apis/dio_client.dart';
 import 'package:frosty/apis/ffz_api.dart';
 import 'package:frosty/apis/seventv_api.dart';
 import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_auth_interceptor.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/apis/unauthorized_interceptor.dart';
+import 'package:frosty/cache_manager.dart';
+import 'package:frosty/constants.dart';
 import 'package:frosty/firebase_options.dart';
+import 'package:frosty/screens/channel/channel.dart';
 import 'package:frosty/screens/home/home.dart';
 import 'package:frosty/screens/onboarding/onboarding_intro.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
-import 'package:http/http.dart';
+import 'package:frosty/stores/global_assets_store.dart';
+import 'package:frosty/theme.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/widgets/alert_message.dart';
 import 'package:mobx/mobx.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:url_launcher/url_launcher.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
+
+/// Errors that are expected on a mobile client — transient network/I/O, plugin
+/// teardown races, and image fetch failures — and therefore shouldn't be
+/// reported to Crashlytics as fatal crashes (which would tank the crash-free
+/// metric and bucket unrelated errors together under the global handlers).
+///
+/// This is a last-resort net. The layers that own these errors already record
+/// them non-fatally with precise reasons (e.g. base_api_client, the IRC
+/// websocket handlers); this only catches what escapes that local handling.
+bool _isNonFatalError(Object error) {
+  return error is SocketException ||
+      error is HttpException ||
+      error is WebSocketChannelException ||
+      error is ApiException ||
+      error is MissingPluginException ||
+      error is NetworkImageLoadException ||
+      (error is DioException && error.type != DioExceptionType.badResponse);
+}
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
+  CustomCacheManager.removeOrphanedCacheFiles();
+
+  await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+
+  // Route uncaught framework errors to Crashlytics. Non-crashing UI errors
+  // (layout overflows, image-load failures) and other expected transient
+  // failures are recorded as non-fatal so they don't inflate the crash count.
+  FlutterError.onError = (details) {
+    // Run the cheap type checks first; only fall back to the diagnostics string
+    // (RenderFlex overflow has no typed signal) when those miss.
+    final isNonFatal =
+        _isNonFatalError(details.exception) ||
+        details.exceptionAsString().contains('overflowed');
+    if (isNonFatal) {
+      FirebaseCrashlytics.instance.recordFlutterError(details);
+    } else {
+      FirebaseCrashlytics.instance.recordFlutterFatalError(details);
+    }
+  };
+
+  // Pass uncaught asynchronous errors to Crashlytics. Expected transient errors
+  // are recorded non-fatally; everything else stays fatal. The reason gives the
+  // grouping engine a real signal so distinct errors don't collapse into one
+  // catch-all issue under this handler frame.
+  PlatformDispatcher.instance.onError = (error, stack) {
+    FirebaseCrashlytics.instance.recordError(
+      error,
+      stack,
+      reason: error.runtimeType.toString(),
+      fatal: !_isNonFatalError(error),
+    );
+    return true;
+  };
+
   final prefs = await SharedPreferences.getInstance();
 
+  // One-time migration: the quality preference used to be stored under a
+  // single global key, which meant a saved 1080p60 from one channel could
+  // pin another channel to a variant it doesn't serve. Remove the legacy
+  // key; new writes go under per-channel keys.
+  await prefs.remove(kLegacyLastStreamQualityKey);
+
   final firstRun = prefs.getBool('first_run') ?? true;
 
   // Workaround for clearing stored tokens on uninstall.
   // If first time running app, will clear all tokens in the secure storage.
+  // Run non-blocking to avoid ANR on slow Android devices (especially Android 14).
   if (firstRun) {
     debugPrint('Clearing secure storage...');
     const storage = FlutterSecureStorage();
 
-    await storage.deleteAll();
+    // Don't block - run in background after app starts.
+    // This is safe because first run means no active session depends on this data.
+    unawaited(
+      storage.deleteAll().catchError((e) {
+        debugPrint('Error clearing secure storage: $e');
+      }),
+    );
   }
 
+  await initUtils();
+
   // With the shared preferences instance, obtain the existing user settings if it exists.
   // If default settings don't exist, use an empty JSON string to use the default values.
   final userSettings = prefs.getString('settings') ?? '{}';
@@ -45,50 +131,72 @@ void main() async {
   // Initialize a settings store from the settings JSON string.
   final settingsStore = SettingsStore.fromJson(jsonDecode(userSettings));
 
+  // Disable Firebase collection in debug builds to avoid polluting production data.
+  // In release builds, respect the user's preference.
+  if (kDebugMode) {
+    FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(false);
+    FirebaseAnalytics.instance.setAnalyticsCollectionEnabled(false);
+    FirebasePerformance.instance.setPerformanceCollectionEnabled(false);
+  } else {
+    final shareEnabled = settingsStore.shareCrashLogsAndAnalytics;
+    FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(shareEnabled);
+    FirebaseAnalytics.instance.setAnalyticsCollectionEnabled(shareEnabled);
+    FirebasePerformance.instance.setPerformanceCollectionEnabled(shareEnabled);
+  }
+
   // Create a MobX reaction that will save the settings on disk every time they are changed.
   autorun((_) => prefs.setString('settings', jsonEncode(settingsStore)));
 
-  await Firebase.initializeApp(
-    options: DefaultFirebaseOptions.currentPlatform,
+  /// Initialize API services with a common Dio client.
+  /// This will prevent every request from creating a new client instance.
+  final dioClient = DioClient.createClient();
+
+  // Create API services
+  final twitchApiService = TwitchApi(dioClient);
+  final bttvApiService = BTTVApi(dioClient);
+  final ffzApiService = FFZApi(dioClient);
+  final sevenTVApiService = SevenTVApi(dioClient);
+  final twitchGqlApiService = TwitchGqlApi(dioClient);
+
+  // Create global assets store (shared cache for global emotes/badges)
+  final globalAssetsStore = GlobalAssetsStore(
+    twitchApi: twitchApiService,
+    bttvApi: bttvApiService,
+    ffzApi: ffzApiService,
+    sevenTVApi: sevenTVApiService,
   );
 
-  // Pass all uncaught "fatal" errors from the framework to Crashlytics
-  FlutterError.onError = FirebaseCrashlytics.instance.recordFlutterFatalError;
-
-  // Pass all uncaught asynchronous errors that aren't handled by the Flutter framework to Crashlytics
-  PlatformDispatcher.instance.onError = (error, stack) {
-    FirebaseCrashlytics.instance.recordError(error, stack, fatal: true);
-    return true;
-  };
-
-  /// Initialize API services with a common client.
-  /// This will prevent every request from creating a new client instance.
-  final client = Client();
-  final twitchApiService = TwitchApi(client);
-  final bttvApiService = BTTVApi(client);
-  final ffzApiService = FFZApi(client);
-  final sevenTVApiService = SevenTVApi(client);
-
   // Create and initialize the authentication store
-  final authStore = AuthStore(twitchApi: twitchApiService);
+  final authStore = AuthStore(
+    twitchApi: twitchApiService,
+    twitchGqlApi: twitchGqlApiService,
+  );
+
+  // Add the auth interceptor to the Dio client after AuthStore creation
+  dioClient.interceptors.add(TwitchAuthInterceptor(authStore));
+
+  // Add the unauthorized interceptor to catch 401 errors
+  dioClient.interceptors.add(UnauthorizedInterceptor(authStore));
+
   await authStore.init();
+  FirebaseCrashlytics.instance.setCustomKey('is_logged_in', authStore.isLoggedIn);
+  if (authStore.isLoggedIn && authStore.user.details != null) {
+    FirebaseCrashlytics.instance.setUserIdentifier(authStore.user.details!.id);
+  }
 
   runApp(
-    DevicePreview(
-      enabled: false,
-      builder: (context) {
-        return MultiProvider(
-          providers: [
-            Provider<AuthStore>(create: (_) => authStore),
-            Provider<SettingsStore>(create: (_) => settingsStore),
-            Provider<TwitchApi>(create: (_) => twitchApiService),
-            Provider<BTTVApi>(create: (_) => bttvApiService),
-            Provider<FFZApi>(create: (_) => ffzApiService),
-            Provider<SevenTVApi>(create: (_) => sevenTVApiService),
-          ],
-          child: MyApp(firstRun: firstRun),
-        );
-      },
+    MultiProvider(
+      providers: [
+        Provider<AuthStore>.value(value: authStore),
+        Provider<SettingsStore>.value(value: settingsStore),
+        Provider<TwitchApi>.value(value: twitchApiService),
+        Provider<BTTVApi>.value(value: bttvApiService),
+        Provider<FFZApi>.value(value: ffzApiService),
+        Provider<SevenTVApi>.value(value: sevenTVApiService),
+        Provider<TwitchGqlApi>.value(value: twitchGqlApiService),
+        Provider<GlobalAssetsStore>.value(value: globalAssetsStore),
+      ],
+      child: MyApp(firstRun: firstRun),
     ),
   );
 }
@@ -96,156 +204,146 @@ void main() async {
 // Navigator key for sleep timer. Allows navigation popping without context.
 final navigatorKey = GlobalKey<NavigatorState>();
 
-const gray = Color.fromRGBO(18, 18, 18, 1.0);
-const lightGray = Color.fromRGBO(28, 28, 28, 1.0);
-const purple = Color(0xff9146ff);
-
-const inputTheme = InputDecorationTheme(
-  filled: true,
-  contentPadding: EdgeInsets.all(10.0),
-  border: OutlineInputBorder(
-    borderRadius: BorderRadius.all(Radius.circular(10.0)),
-    borderSide: BorderSide(style: BorderStyle.none),
-  ),
-  enabledBorder: OutlineInputBorder(
-    borderRadius: BorderRadius.all(Radius.circular(10.0)),
-    borderSide: BorderSide(style: BorderStyle.none),
-  ),
-  disabledBorder: OutlineInputBorder(
-    borderRadius: BorderRadius.all(Radius.circular(10.0)),
-    borderSide: BorderSide(style: BorderStyle.none),
-  ),
-);
-
-const tooltipTheme = TooltipThemeData(
-  padding: EdgeInsets.all(10.0),
-  margin: EdgeInsets.symmetric(horizontal: 5.0),
-  decoration: BoxDecoration(
-    color: lightGray,
-    borderRadius: BorderRadius.all(Radius.circular(10.0)),
-  ),
-  textStyle: TextStyle(color: Colors.white),
-);
-
-const snackBarTheme = SnackBarThemeData(
-  backgroundColor: lightGray,
-  contentTextStyle: TextStyle(color: Colors.white),
-  shape: RoundedRectangleBorder(
-    borderRadius: BorderRadius.all(Radius.circular(10.0)),
-  ),
-);
-
-final lightTheme = ThemeData(
-  canvasColor: Colors.white,
-  splashFactory: Platform.isIOS ? NoSplash.splashFactory : null,
-  fontFamily: 'Inter',
-  appBarTheme: const AppBarTheme(
-    color: Colors.white,
-    elevation: 0.0,
-    titleTextStyle: TextStyle(
-      fontFamily: 'Inter',
-      fontSize: 24,
-      fontWeight: FontWeight.bold,
-      color: Colors.black,
-    ),
-    iconTheme: IconThemeData(color: Colors.black),
-  ),
-  colorScheme: ColorScheme.fromSwatch(
-    primarySwatch: Colors.deepPurple,
-    accentColor: purple,
-  ),
-  tabBarTheme: const TabBarTheme(
-    labelColor: Colors.black,
-    unselectedLabelColor: Colors.grey,
-  ),
-  inputDecorationTheme: inputTheme,
-  tooltipTheme: tooltipTheme,
-  snackBarTheme: snackBarTheme,
-);
-
-final darkTheme = ThemeData(
-  canvasColor: gray,
-  brightness: Brightness.dark,
-  splashFactory: Platform.isIOS ? NoSplash.splashFactory : null,
-  fontFamily: 'Inter',
-  appBarTheme: const AppBarTheme(
-    color: gray,
-    elevation: 0.0,
-    titleTextStyle: TextStyle(
-      fontFamily: 'Inter',
-      fontSize: 24,
-      fontWeight: FontWeight.bold,
-    ),
-  ),
-  bottomNavigationBarTheme:
-      const BottomNavigationBarThemeData(backgroundColor: gray),
-  colorScheme: ColorScheme.fromSwatch(
-    brightness: Brightness.dark,
-    primarySwatch: Colors.deepPurple,
-    accentColor: purple,
-  ),
-  dialogBackgroundColor: gray,
-  inputDecorationTheme: inputTheme,
-  tooltipTheme: tooltipTheme,
-  snackBarTheme: snackBarTheme,
-);
-
-final oledTheme = ThemeData(
-  canvasColor: Colors.black,
-  splashFactory: Platform.isIOS ? NoSplash.splashFactory : null,
-  fontFamily: 'Inter',
-  appBarTheme: const AppBarTheme(
-    color: Colors.black,
-    elevation: 0.0,
-    titleTextStyle: TextStyle(
-      fontFamily: 'Inter',
-      fontSize: 24,
-      fontWeight: FontWeight.bold,
-    ),
-  ),
-  colorScheme: ColorScheme.fromSwatch(
-    brightness: Brightness.dark,
-    primarySwatch: Colors.deepPurple,
-    accentColor: purple,
-  ),
-  dialogBackgroundColor: Colors.black,
-  inputDecorationTheme: inputTheme,
-  tooltipTheme: tooltipTheme,
-  snackBarTheme: snackBarTheme,
-);
-
-class MyApp extends StatelessWidget {
+class MyApp extends StatefulWidget {
   final bool firstRun;
 
-  const MyApp({
-    Key? key,
-    this.firstRun = false,
-  }) : super(key: key);
+  const MyApp({super.key, this.firstRun = false});
+
+  @override
+  State<MyApp> createState() => _MyAppState();
+}
+
+class _MyAppState extends State<MyApp> {
+  final AppLinks _appLinks = AppLinks();
+  StreamSubscription<Uri>? _linkSubscription;
+
+  @override
+  void initState() {
+    super.initState();
+
+    AdvancedInAppReview()
+        .setMinDaysBeforeRemind(7)
+        .setMinDaysAfterInstall(1)
+        .setMinLaunchTimes(5)
+        .setMinSecondsBeforeShowDialog(3)
+        .monitor();
+
+    _initDeepLinks();
+  }
 
   @override
   Widget build(BuildContext context) {
     return Observer(
       builder: (context) {
         final settingsStore = context.read<SettingsStore>();
+        final themes = FrostyThemes(
+          colorSchemeSeed: Color(settingsStore.accentColor),
+        );
 
         return MaterialApp(
-          useInheritedMediaQuery: true,
-          locale: DevicePreview.locale(context),
           title: 'Frosty',
-          theme: lightTheme,
-          darkTheme: settingsStore.themeType == ThemeType.dark ||
-                  settingsStore.themeType == ThemeType.system
-              ? darkTheme
-              : oledTheme,
+          theme: themes.light,
+          darkTheme: themes.dark,
           themeMode: settingsStore.themeType == ThemeType.system
               ? ThemeMode.system
               : settingsStore.themeType == ThemeType.light
-                  ? ThemeMode.light
-                  : ThemeMode.dark,
-          home: firstRun ? const OnboardingIntro() : const Home(),
+              ? ThemeMode.light
+              : ThemeMode.dark,
+          navigatorObservers: [
+            FirebaseAnalyticsObserver(
+              analytics: FirebaseAnalytics.instance,
+            ),
+          ],
+          home: widget.firstRun ? const OnboardingIntro() : const Home(),
           navigatorKey: navigatorKey,
         );
       },
     );
   }
+
+  Future<void> _initDeepLinks() async {
+    try {
+      // Handle links when app is already open
+      _linkSubscription = _appLinks.uriLinkStream.listen((uri) {
+        handleDeepLink(uri);
+      });
+
+      // Handle the initial link if app was opened from a link.
+      // Add timeout to prevent indefinite blocking on certain Android lifecycle states.
+      final initialLink = await _appLinks.getInitialLink().timeout(
+        const Duration(seconds: 3),
+        onTimeout: () => null,
+      );
+      if (initialLink != null) {
+        handleDeepLink(initialLink);
+      }
+    } catch (e) {
+      debugPrint('Failed to initialize deep links: $e');
+    }
+  }
+
+  Future<void> handleDeepLink(Uri uri) async {
+    final failureSnackbar = SnackBar(
+      content: AlertMessage(
+        message: 'Unable to navigate to \'$uri\'',
+        centered: false,
+        trailingIcon: Icons.open_in_browser_rounded,
+        // Fallback, allow user to open URL outside app
+        onTrailingIconPressed: () async {
+          await launchUrl(
+            uri,
+            mode: LaunchMode.inAppWebView, // Force browser
+          );
+        },
+      ),
+    );
+
+    // Handle channel links
+    if (uri.pathSegments.isNotEmpty) {
+      final channelName = uri.pathSegments.first;
+
+      try {
+        final twitchApi = context.read<TwitchApi>();
+
+        final user = await twitchApi.getUser(userLogin: channelName);
+
+        final route = MaterialPageRoute(
+          settings: const RouteSettings(name: VideoChat.routeName),
+          builder: (context) => VideoChat(
+            userId: user.id,
+            userName: user.displayName,
+            userLogin: user.login,
+          ),
+        );
+
+        if (navigatorKey.currentState == null) return;
+
+        WidgetsBinding.instance.addPostFrameCallback(
+          (_) => navigatorKey.currentState?.push(route),
+        );
+      } catch (e) {
+        // If we get here, there was most likely an error with the Twitch API call and/or this isn't really a channel link
+        debugPrint('Failed to open link $uri due to error: $e');
+
+        if (navigatorKey.currentContext == null) return;
+        ScaffoldMessenger.of(
+          navigatorKey.currentContext!,
+        ).showSnackBar(failureSnackbar);
+      }
+    }
+    // TODO: Here we can implement handlers for other types of links
+    else {
+      // If we get here, it's a link format that we're unable to handle
+      if (navigatorKey.currentContext == null) return;
+      ScaffoldMessenger.of(
+        navigatorKey.currentContext!,
+      ).showSnackBar(failureSnackbar);
+    }
+  }
+
+  @override
+  void dispose() {
+    _linkSubscription?.cancel();
+    super.dispose();
+  }
 }
diff --git a/lib/models/badges.dart b/lib/models/badges.dart
index 70faf87c..7936f8b3 100644
--- a/lib/models/badges.dart
+++ b/lib/models/badges.dart
@@ -35,12 +35,7 @@ class BadgeInfoFFZ {
   final String color;
   final BadgeUrlsFFZ urls;
 
-  const BadgeInfoFFZ(
-    this.id,
-    this.title,
-    this.color,
-    this.urls,
-  );
+  const BadgeInfoFFZ(this.id, this.title, this.color, this.urls);
 
   factory BadgeInfoFFZ.fromJson(Map<String, dynamic> json) =>
       _$BadgeInfoFFZFromJson(json);
@@ -55,11 +50,7 @@ class BadgeUrlsFFZ {
   @JsonKey(name: '4')
   final String url4x;
 
-  const BadgeUrlsFFZ(
-    this.url1x,
-    this.url2x,
-    this.url4x,
-  );
+  const BadgeUrlsFFZ(this.url1x, this.url2x, this.url4x);
 
   factory BadgeUrlsFFZ.fromJson(Map<String, dynamic> json) =>
       _$BadgeUrlsFFZFromJson(json);
@@ -71,11 +62,7 @@ class BadgeInfo7TV {
   final List<List<String>> urls;
   final List<String> users;
 
-  BadgeInfo7TV(
-    this.tooltip,
-    this.urls,
-    this.users,
-  );
+  BadgeInfo7TV(this.tooltip, this.urls, this.users);
 
   factory BadgeInfo7TV.fromJson(Map<String, dynamic> json) =>
       _$BadgeInfo7TVFromJson(json);
@@ -86,10 +73,7 @@ class BadgeInfoBTTV {
   final String providerId;
   final BadgeDetailsBTTV badge;
 
-  BadgeInfoBTTV(
-    this.providerId,
-    this.badge,
-  );
+  BadgeInfoBTTV(this.providerId, this.badge);
 
   factory BadgeInfoBTTV.fromJson(Map<String, dynamic> json) =>
       _$BadgeInfoBTTVFromJson(json);
@@ -100,10 +84,7 @@ class BadgeDetailsBTTV {
   final String description;
   final String svg;
 
-  BadgeDetailsBTTV(
-    this.description,
-    this.svg,
-  );
+  BadgeDetailsBTTV(this.description, this.svg);
 
   factory BadgeDetailsBTTV.fromJson(Map<String, dynamic> json) =>
       _$BadgeDetailsBTTVFromJson(json);
@@ -123,34 +104,48 @@ class ChatBadge {
   });
 
   factory ChatBadge.fromTwitch(BadgeInfoTwitch badge) => ChatBadge(
-        name: badge.title,
-        url: badge.imageUrl4x,
-        type: BadgeType.twitch,
-      );
+    name: badge.title,
+    url: badge.imageUrl4x,
+    type: BadgeType.twitch,
+  );
 
   factory ChatBadge.fromBTTV(BadgeInfoBTTV badge) => ChatBadge(
-        name: badge.badge.description,
-        url: badge.badge.svg,
-        type: BadgeType.bttv,
-      );
+    name: badge.badge.description,
+    url: badge.badge.svg,
+    type: BadgeType.bttv,
+  );
 
   factory ChatBadge.fromFFZ(BadgeInfoFFZ badge) => ChatBadge(
-        name: badge.title,
-        url: badge.urls.url4x,
-        color: badge.color,
-        type: BadgeType.ffz,
-      );
+    name: badge.title,
+    url: badge.urls.url4x,
+    color: badge.color,
+    type: BadgeType.ffz,
+  );
 
   factory ChatBadge.from7TV(BadgeInfo7TV badge) => ChatBadge(
-        name: badge.tooltip,
-        url: badge.urls[2][1],
-        type: BadgeType.sevenTV,
-      );
+    name: badge.tooltip,
+    url: badge.urls[2][1],
+    type: BadgeType.sevenTV,
+  );
 }
 
 enum BadgeType {
   twitch,
   bttv,
   ffz,
-  sevenTV,
+  sevenTV;
+
+  @override
+  String toString() {
+    switch (this) {
+      case BadgeType.twitch:
+        return 'Twitch badge';
+      case BadgeType.bttv:
+        return 'BetterTTV badge';
+      case BadgeType.ffz:
+        return 'FrankerFaceZ badge';
+      case BadgeType.sevenTV:
+        return '7TV badge';
+    }
+  }
 }
diff --git a/lib/models/badges.g.dart b/lib/models/badges.g.dart
index 275db7cf..5d5d1b79 100644
--- a/lib/models/badges.g.dart
+++ b/lib/models/badges.g.dart
@@ -17,25 +17,22 @@ BadgeInfoTwitch _$BadgeInfoTwitchFromJson(Map<String, dynamic> json) =>
     );
 
 BadgeInfoFFZ _$BadgeInfoFFZFromJson(Map<String, dynamic> json) => BadgeInfoFFZ(
-      json['id'] as int,
-      json['title'] as String,
-      json['color'] as String,
-      BadgeUrlsFFZ.fromJson(json['urls'] as Map<String, dynamic>),
-    );
+  (json['id'] as num).toInt(),
+  json['title'] as String,
+  json['color'] as String,
+  BadgeUrlsFFZ.fromJson(json['urls'] as Map<String, dynamic>),
+);
 
-BadgeUrlsFFZ _$BadgeUrlsFFZFromJson(Map<String, dynamic> json) => BadgeUrlsFFZ(
-      json['1'] as String,
-      json['2'] as String,
-      json['4'] as String,
-    );
+BadgeUrlsFFZ _$BadgeUrlsFFZFromJson(Map<String, dynamic> json) =>
+    BadgeUrlsFFZ(json['1'] as String, json['2'] as String, json['4'] as String);
 
 BadgeInfo7TV _$BadgeInfo7TVFromJson(Map<String, dynamic> json) => BadgeInfo7TV(
-      json['tooltip'] as String,
-      (json['urls'] as List<dynamic>)
-          .map((e) => (e as List<dynamic>).map((e) => e as String).toList())
-          .toList(),
-      (json['users'] as List<dynamic>).map((e) => e as String).toList(),
-    );
+  json['tooltip'] as String,
+  (json['urls'] as List<dynamic>)
+      .map((e) => (e as List<dynamic>).map((e) => e as String).toList())
+      .toList(),
+  (json['users'] as List<dynamic>).map((e) => e as String).toList(),
+);
 
 BadgeInfoBTTV _$BadgeInfoBTTVFromJson(Map<String, dynamic> json) =>
     BadgeInfoBTTV(
@@ -44,7 +41,4 @@ BadgeInfoBTTV _$BadgeInfoBTTVFromJson(Map<String, dynamic> json) =>
     );
 
 BadgeDetailsBTTV _$BadgeDetailsBTTVFromJson(Map<String, dynamic> json) =>
-    BadgeDetailsBTTV(
-      json['description'] as String,
-      json['svg'] as String,
-    );
+    BadgeDetailsBTTV(json['description'] as String, json['svg'] as String);
diff --git a/lib/models/category.dart b/lib/models/category.dart
index 05dc473a..4132d2c0 100644
--- a/lib/models/category.dart
+++ b/lib/models/category.dart
@@ -8,11 +8,7 @@ class CategoryTwitch {
   final String id;
   final String name;
 
-  const CategoryTwitch(
-    this.boxArtUrl,
-    this.id,
-    this.name,
-  );
+  const CategoryTwitch(this.boxArtUrl, this.id, this.name);
 
   factory CategoryTwitch.fromJson(Map<String, dynamic> json) =>
       _$CategoryTwitchFromJson(json);
@@ -23,10 +19,7 @@ class CategoriesTwitch {
   final List<CategoryTwitch> data;
   final Map<String, String>? pagination;
 
-  const CategoriesTwitch(
-    this.data,
-    this.pagination,
-  );
+  const CategoriesTwitch(this.data, this.pagination);
 
   factory CategoriesTwitch.fromJson(Map<String, dynamic> json) =>
       _$CategoriesTwitchFromJson(json);
diff --git a/lib/models/channel.dart b/lib/models/channel.dart
index be13fa41..fae8512b 100644
--- a/lib/models/channel.dart
+++ b/lib/models/channel.dart
@@ -8,11 +8,19 @@ class Channel {
   final String broadcasterId;
   final String broadcasterLogin;
   final String broadcasterName;
+  final String broadcasterLanguage;
+  final String title;
+  final String gameId;
+  final String gameName;
 
   const Channel({
     required this.broadcasterId,
     required this.broadcasterLogin,
     required this.broadcasterName,
+    required this.broadcasterLanguage,
+    required this.title,
+    required this.gameId,
+    required this.gameName,
   });
 
   factory Channel.fromJson(Map<String, dynamic> json) =>
diff --git a/lib/models/channel.g.dart b/lib/models/channel.g.dart
index fa31252f..bbb41d04 100644
--- a/lib/models/channel.g.dart
+++ b/lib/models/channel.g.dart
@@ -7,15 +7,19 @@ part of 'channel.dart';
 // **************************************************************************
 
 Channel _$ChannelFromJson(Map<String, dynamic> json) => Channel(
-      broadcasterId: json['broadcaster_id'] as String,
-      broadcasterLogin: json['broadcaster_login'] as String,
-      broadcasterName: json['broadcaster_name'] as String,
-    );
+  broadcasterId: json['broadcaster_id'] as String,
+  broadcasterLogin: json['broadcaster_login'] as String,
+  broadcasterName: json['broadcaster_name'] as String,
+  broadcasterLanguage: json['broadcaster_language'] as String,
+  title: json['title'] as String,
+  gameId: json['game_id'] as String,
+  gameName: json['game_name'] as String,
+);
 
 ChannelQuery _$ChannelQueryFromJson(Map<String, dynamic> json) => ChannelQuery(
-      broadcasterLogin: json['broadcaster_login'] as String,
-      displayName: json['display_name'] as String,
-      id: json['id'] as String,
-      isLive: json['is_live'] as bool,
-      startedAt: json['started_at'] as String,
-    );
+  broadcasterLogin: json['broadcaster_login'] as String,
+  displayName: json['display_name'] as String,
+  id: json['id'] as String,
+  isLive: json['is_live'] as bool,
+  startedAt: json['started_at'] as String,
+);
diff --git a/lib/models/chatters.dart b/lib/models/chatters.dart
index c059807e..8129e30e 100644
--- a/lib/models/chatters.dart
+++ b/lib/models/chatters.dart
@@ -7,10 +7,7 @@ class ChatUsers {
   final int chatterCount;
   final Chatters chatters;
 
-  ChatUsers(
-    this.chatterCount,
-    this.chatters,
-  );
+  ChatUsers(this.chatterCount, this.chatters);
 
   factory ChatUsers.fromJson(Map<String, dynamic> json) =>
       _$ChatUsersFromJson(json);
diff --git a/lib/models/chatters.g.dart b/lib/models/chatters.g.dart
index ef6f7562..13349ccd 100644
--- a/lib/models/chatters.g.dart
+++ b/lib/models/chatters.g.dart
@@ -7,16 +7,16 @@ part of 'chatters.dart';
 // **************************************************************************
 
 ChatUsers _$ChatUsersFromJson(Map<String, dynamic> json) => ChatUsers(
-      json['chatter_count'] as int,
-      Chatters.fromJson(json['chatters'] as Map<String, dynamic>),
-    );
+  (json['chatter_count'] as num).toInt(),
+  Chatters.fromJson(json['chatters'] as Map<String, dynamic>),
+);
 
 Chatters _$ChattersFromJson(Map<String, dynamic> json) => Chatters(
-      (json['broadcaster'] as List<dynamic>).map((e) => e as String).toList(),
-      (json['vips'] as List<dynamic>).map((e) => e as String).toList(),
-      (json['moderators'] as List<dynamic>).map((e) => e as String).toList(),
-      (json['staff'] as List<dynamic>).map((e) => e as String).toList(),
-      (json['admins'] as List<dynamic>).map((e) => e as String).toList(),
-      (json['global_mods'] as List<dynamic>).map((e) => e as String).toList(),
-      (json['viewers'] as List<dynamic>).map((e) => e as String).toList(),
-    );
+  (json['broadcaster'] as List<dynamic>).map((e) => e as String).toList(),
+  (json['vips'] as List<dynamic>).map((e) => e as String).toList(),
+  (json['moderators'] as List<dynamic>).map((e) => e as String).toList(),
+  (json['staff'] as List<dynamic>).map((e) => e as String).toList(),
+  (json['admins'] as List<dynamic>).map((e) => e as String).toList(),
+  (json['global_mods'] as List<dynamic>).map((e) => e as String).toList(),
+  (json['viewers'] as List<dynamic>).map((e) => e as String).toList(),
+);
diff --git a/lib/models/emotes.dart b/lib/models/emotes.dart
index 07118cd6..b4b07599 100644
--- a/lib/models/emotes.dart
+++ b/lib/models/emotes.dart
@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:frosty/constants.dart';
 import 'package:json_annotation/json_annotation.dart';
 
@@ -11,12 +12,7 @@ class EmoteTwitch {
   final String? emoteType;
   final String? ownerId;
 
-  const EmoteTwitch(
-    this.id,
-    this.name,
-    this.emoteType,
-    this.ownerId,
-  );
+  const EmoteTwitch(this.id, this.name, this.emoteType, this.ownerId);
 
   factory EmoteTwitch.fromJson(Map<String, dynamic> json) =>
       _$EmoteTwitchFromJson(json);
@@ -28,10 +24,7 @@ class EmoteBTTV {
   final String id;
   final String code;
 
-  const EmoteBTTV(
-    this.id,
-    this.code,
-  );
+  const EmoteBTTV(this.id, this.code);
 
   factory EmoteBTTV.fromJson(Map<String, dynamic> json) =>
       _$EmoteBTTVFromJson(json);
@@ -42,10 +35,7 @@ class EmoteBTTVChannel {
   final List<EmoteBTTV> channelEmotes;
   final List<EmoteBTTV> sharedEmotes;
 
-  const EmoteBTTVChannel(
-    this.channelEmotes,
-    this.sharedEmotes,
-  );
+  const EmoteBTTVChannel(this.channelEmotes, this.sharedEmotes);
 
   factory EmoteBTTVChannel.fromJson(Map<String, dynamic> json) =>
       _$EmoteBTTVChannelFromJson(json);
@@ -58,11 +48,7 @@ class RoomFFZ {
   final ImagesFFZ? vipBadge;
   final ImagesFFZ? modUrls;
 
-  const RoomFFZ(
-    this.set,
-    this.vipBadge,
-    this.modUrls,
-  );
+  const RoomFFZ(this.set, this.vipBadge, this.modUrls);
 
   factory RoomFFZ.fromJson(Map<String, dynamic> json) =>
       _$RoomFFZFromJson(json);
@@ -77,28 +63,39 @@ class ImagesFFZ {
   @JsonKey(name: '4')
   final String? url4x;
 
-  const ImagesFFZ(
-    this.url1x,
-    this.url2x,
-    this.url4x,
-  );
+  const ImagesFFZ(this.url1x, this.url2x, this.url4x);
 
   factory ImagesFFZ.fromJson(Map<String, dynamic> json) =>
       _$ImagesFFZFromJson(json);
 }
 
+@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
+class OwnerFFZ {
+  final String displayName;
+  final String name;
+
+  const OwnerFFZ({required this.displayName, required this.name});
+
+  factory OwnerFFZ.fromJson(Map<String, dynamic> json) =>
+      _$OwnerFFZFromJson(json);
+}
+
 @JsonSerializable(createToJson: false)
 class EmoteFFZ {
   final String name;
   final int height;
   final int width;
+  final OwnerFFZ owner;
   final ImagesFFZ urls;
+  final ImagesFFZ? animated;
 
   const EmoteFFZ(
     this.name,
     this.height,
     this.width,
+    this.owner,
     this.urls,
+    this.animated,
   );
 
   factory EmoteFFZ.fromJson(Map<String, dynamic> json) =>
@@ -107,99 +104,155 @@ class EmoteFFZ {
 
 @JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
 class Emote7TV {
+  final String id;
   final String name;
-  final List<String> visibilitySimple;
-  final List<int> width;
-  final List<int> height;
-  final List<List<String>> urls;
+  final Emote7TVData data;
 
-  const Emote7TV(
-    this.name,
-    this.visibilitySimple,
-    this.width,
-    this.height,
-    this.urls,
-  );
+  const Emote7TV(this.id, this.name, this.data);
 
   factory Emote7TV.fromJson(Map<String, dynamic> json) =>
       _$Emote7TVFromJson(json);
 }
 
+@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
+class Owner7TV {
+  final String username;
+  final String displayName;
+
+  const Owner7TV({required this.username, required this.displayName});
+
+  factory Owner7TV.fromJson(Map<String, dynamic> json) =>
+      _$Owner7TVFromJson(json);
+}
+
+@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
+class Emote7TVData {
+  final String id;
+  final String name;
+  final int flags;
+  final Owner7TV? owner;
+  final Emote7TVHost host;
+
+  const Emote7TVData(this.id, this.name, this.flags, this.owner, this.host);
+
+  factory Emote7TVData.fromJson(Map<String, dynamic> json) =>
+      _$Emote7TVDataFromJson(json);
+}
+
+@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
+class Emote7TVHost {
+  final String url;
+  final List<Emote7TVFile> files;
+
+  Emote7TVHost(this.url, this.files);
+
+  factory Emote7TVHost.fromJson(Map<String, dynamic> json) =>
+      _$Emote7TVHostFromJson(json);
+}
+
+@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
+class Emote7TVFile {
+  final String name;
+  final int width;
+  final int height;
+  final String format;
+
+  Emote7TVFile(this.name, this.width, this.height, this.format);
+
+  factory Emote7TVFile.fromJson(Map<String, dynamic> json) =>
+      _$Emote7TVFileFromJson(json);
+}
+
 /// The common emote class.
 @JsonSerializable()
 class Emote {
   final String name;
+  final String? realName;
   final int? width;
   final int? height;
   final bool zeroWidth;
   final String url;
   final EmoteType type;
+  final String? ownerDisplayName;
+  final String? ownerUsername;
   final String? ownerId;
 
   const Emote({
     required this.name,
+    this.realName,
     this.width,
     this.height,
     required this.zeroWidth,
     required this.url,
     required this.type,
+    this.ownerDisplayName,
+    this.ownerUsername,
     this.ownerId,
   });
 
   factory Emote.fromTwitch(EmoteTwitch emote, EmoteType type) => Emote(
-        name: emote.name,
-        zeroWidth: false,
-        url:
-            'https://static-cdn.jtvnw.net/emoticons/v2/${emote.id}/default/dark/3.0',
-        type: type,
-        ownerId: emote.ownerId,
-      );
+    name: emote.name,
+    zeroWidth: false,
+    url:
+        'https://static-cdn.jtvnw.net/emoticons/v2/${emote.id}/default/dark/3.0',
+    type: type,
+    ownerId: emote.ownerId,
+  );
 
   factory Emote.fromBTTV(EmoteBTTV emote, EmoteType type) => Emote(
-        name: emote.code,
-        zeroWidth: zeroWidthEmotes.contains(emote.code),
-        url: 'https://cdn.betterttv.net/emote/${emote.id}/3x',
-        type: type,
-      );
+    name: emote.code,
+    zeroWidth: zeroWidthEmotes.contains(emote.code),
+    url: 'https://cdn.betterttv.net/emote/${emote.id}/3x',
+    type: type,
+  );
 
   factory Emote.fromFFZ(EmoteFFZ emote, EmoteType type) => Emote(
-        name: emote.name,
-        zeroWidth: false,
-        width: emote.width,
-        height: emote.height,
-        url: emote.urls.url4x ?? emote.urls.url2x ?? emote.urls.url1x,
-        type: type,
-      );
+    name: emote.name,
+    zeroWidth: false,
+    width: emote.width,
+    height: emote.height,
+    url:
+        emote.animated?.url4x ??
+        emote.animated?.url2x ??
+        emote.animated?.url1x ??
+        emote.urls.url4x ??
+        emote.urls.url2x ??
+        emote.urls.url1x,
+    type: type,
+    ownerDisplayName: emote.owner.displayName,
+    ownerUsername: emote.owner.name,
+  );
 
-  factory Emote.from7TV(Emote7TV emote, EmoteType type) => Emote(
-        name: emote.name,
-        width: emote.width.first,
-        height: emote.height.first,
-        zeroWidth: emote.visibilitySimple.contains('ZERO_WIDTH'),
-        url: emote.urls[3][1],
-        type: type,
-      );
+  factory Emote.from7TV(Emote7TV emote, EmoteType type) {
+    final emoteData = emote.data;
+
+    final url = emoteData.host.url;
+
+    // TODO: Remove if/when Flutter natively supports AVIF.
+    final file = emoteData.host.files.lastWhereOrNull(
+      (file) => file.format != 'AVIF',
+    );
+
+    // Check if the flag has 1 at the 8th bit.
+    final isZeroWidth = (emoteData.flags & 256) == 256;
+
+    return Emote(
+      name: emote.name,
+      realName: emote.name != emoteData.name ? emoteData.name : null,
+      width: emoteData.host.files.firstOrNull?.width,
+      height: emoteData.host.files.firstOrNull?.height,
+      zeroWidth: isZeroWidth,
+      url: file != null ? 'https:$url/${file.name}' : '',
+      type: type,
+      ownerDisplayName: emoteData.owner?.displayName,
+      ownerUsername: emoteData.owner?.username,
+    );
+  }
 
   factory Emote.fromJson(Map<String, dynamic> json) => _$EmoteFromJson(json);
   Map<String, dynamic> toJson() => _$EmoteToJson(this);
 }
 
-const emoteType = [
-  'Twitch (Bits Tier)',
-  'Twitch (Follower)',
-  'Twitch (Subscriber)',
-  'Twitch (Global)',
-  'Twitch (Unlocked)',
-  'Twitch (Channel)',
-  'FFZ (Global)',
-  'FFZ (Channel)',
-  'BTTV (Global)',
-  'BTTV (Channel)',
-  'BTTV (Shared)',
-  '7TV (Global)',
-  '7TV (Channel)',
-];
-
 enum EmoteType {
   twitchBits,
   twitchFollower,
@@ -213,5 +266,37 @@ enum EmoteType {
   bttvChannel,
   bttvShared,
   sevenTVGlobal,
-  sevenTVChannel,
+  sevenTVChannel;
+
+  @override
+  String toString() {
+    switch (this) {
+      case EmoteType.twitchBits:
+        return 'Twitch bits emote';
+      case EmoteType.twitchFollower:
+        return 'Twitch follower emote';
+      case EmoteType.twitchSub:
+        return 'Twitch sub emote';
+      case EmoteType.twitchGlobal:
+        return 'Twitch global emote';
+      case EmoteType.twitchUnlocked:
+        return 'Twitch unlocked emote';
+      case EmoteType.twitchChannel:
+        return 'Twitch channel emote';
+      case EmoteType.ffzGlobal:
+        return 'FrankerFaceZ global emote';
+      case EmoteType.ffzChannel:
+        return 'FrankerFaceZ channel emote';
+      case EmoteType.bttvGlobal:
+        return 'BetterTTV global emote';
+      case EmoteType.bttvChannel:
+        return 'BetterTTV channel emote';
+      case EmoteType.bttvShared:
+        return 'BetterTTV shared emote';
+      case EmoteType.sevenTVGlobal:
+        return '7TV global emote';
+      case EmoteType.sevenTVChannel:
+        return '7TV channel emote';
+    }
+  }
 }
diff --git a/lib/models/emotes.g.dart b/lib/models/emotes.g.dart
index 33f7349b..6ffb0c2a 100644
--- a/lib/models/emotes.g.dart
+++ b/lib/models/emotes.g.dart
@@ -7,16 +7,14 @@ part of 'emotes.dart';
 // **************************************************************************
 
 EmoteTwitch _$EmoteTwitchFromJson(Map<String, dynamic> json) => EmoteTwitch(
-      json['id'] as String,
-      json['name'] as String,
-      json['emote_type'] as String?,
-      json['owner_id'] as String?,
-    );
+  json['id'] as String,
+  json['name'] as String,
+  json['emote_type'] as String?,
+  json['owner_id'] as String?,
+);
 
-EmoteBTTV _$EmoteBTTVFromJson(Map<String, dynamic> json) => EmoteBTTV(
-      json['id'] as String,
-      json['code'] as String,
-    );
+EmoteBTTV _$EmoteBTTVFromJson(Map<String, dynamic> json) =>
+    EmoteBTTV(json['id'] as String, json['code'] as String);
 
 EmoteBTTVChannel _$EmoteBTTVChannelFromJson(Map<String, dynamic> json) =>
     EmoteBTTVChannel(
@@ -29,59 +27,94 @@ EmoteBTTVChannel _$EmoteBTTVChannelFromJson(Map<String, dynamic> json) =>
     );
 
 RoomFFZ _$RoomFFZFromJson(Map<String, dynamic> json) => RoomFFZ(
-      json['set'] as int,
-      json['vip_badge'] == null
-          ? null
-          : ImagesFFZ.fromJson(json['vip_badge'] as Map<String, dynamic>),
-      json['mod_urls'] == null
-          ? null
-          : ImagesFFZ.fromJson(json['mod_urls'] as Map<String, dynamic>),
-    );
+  (json['set'] as num).toInt(),
+  json['vip_badge'] == null
+      ? null
+      : ImagesFFZ.fromJson(json['vip_badge'] as Map<String, dynamic>),
+  json['mod_urls'] == null
+      ? null
+      : ImagesFFZ.fromJson(json['mod_urls'] as Map<String, dynamic>),
+);
 
-ImagesFFZ _$ImagesFFZFromJson(Map<String, dynamic> json) => ImagesFFZ(
-      json['1'] as String,
-      json['2'] as String?,
-      json['4'] as String?,
-    );
+ImagesFFZ _$ImagesFFZFromJson(Map<String, dynamic> json) =>
+    ImagesFFZ(json['1'] as String, json['2'] as String?, json['4'] as String?);
+
+OwnerFFZ _$OwnerFFZFromJson(Map<String, dynamic> json) => OwnerFFZ(
+  displayName: json['display_name'] as String,
+  name: json['name'] as String,
+);
 
 EmoteFFZ _$EmoteFFZFromJson(Map<String, dynamic> json) => EmoteFFZ(
-      json['name'] as String,
-      json['height'] as int,
-      json['width'] as int,
-      ImagesFFZ.fromJson(json['urls'] as Map<String, dynamic>),
-    );
+  json['name'] as String,
+  (json['height'] as num).toInt(),
+  (json['width'] as num).toInt(),
+  OwnerFFZ.fromJson(json['owner'] as Map<String, dynamic>),
+  ImagesFFZ.fromJson(json['urls'] as Map<String, dynamic>),
+  json['animated'] == null
+      ? null
+      : ImagesFFZ.fromJson(json['animated'] as Map<String, dynamic>),
+);
 
 Emote7TV _$Emote7TVFromJson(Map<String, dynamic> json) => Emote7TV(
-      json['name'] as String,
-      (json['visibility_simple'] as List<dynamic>)
-          .map((e) => e as String)
-          .toList(),
-      (json['width'] as List<dynamic>).map((e) => e as int).toList(),
-      (json['height'] as List<dynamic>).map((e) => e as int).toList(),
-      (json['urls'] as List<dynamic>)
-          .map((e) => (e as List<dynamic>).map((e) => e as String).toList())
-          .toList(),
-    );
+  json['id'] as String,
+  json['name'] as String,
+  Emote7TVData.fromJson(json['data'] as Map<String, dynamic>),
+);
+
+Owner7TV _$Owner7TVFromJson(Map<String, dynamic> json) => Owner7TV(
+  username: json['username'] as String,
+  displayName: json['display_name'] as String,
+);
+
+Emote7TVData _$Emote7TVDataFromJson(Map<String, dynamic> json) => Emote7TVData(
+  json['id'] as String,
+  json['name'] as String,
+  (json['flags'] as num).toInt(),
+  json['owner'] == null
+      ? null
+      : Owner7TV.fromJson(json['owner'] as Map<String, dynamic>),
+  Emote7TVHost.fromJson(json['host'] as Map<String, dynamic>),
+);
+
+Emote7TVHost _$Emote7TVHostFromJson(Map<String, dynamic> json) => Emote7TVHost(
+  json['url'] as String,
+  (json['files'] as List<dynamic>)
+      .map((e) => Emote7TVFile.fromJson(e as Map<String, dynamic>))
+      .toList(),
+);
+
+Emote7TVFile _$Emote7TVFileFromJson(Map<String, dynamic> json) => Emote7TVFile(
+  json['name'] as String,
+  (json['width'] as num).toInt(),
+  (json['height'] as num).toInt(),
+  json['format'] as String,
+);
 
 Emote _$EmoteFromJson(Map<String, dynamic> json) => Emote(
-      name: json['name'] as String,
-      width: json['width'] as int?,
-      height: json['height'] as int?,
-      zeroWidth: json['zeroWidth'] as bool,
-      url: json['url'] as String,
-      type: $enumDecode(_$EmoteTypeEnumMap, json['type']),
-      ownerId: json['ownerId'] as String?,
-    );
+  name: json['name'] as String,
+  realName: json['realName'] as String?,
+  width: (json['width'] as num?)?.toInt(),
+  height: (json['height'] as num?)?.toInt(),
+  zeroWidth: json['zeroWidth'] as bool,
+  url: json['url'] as String,
+  type: $enumDecode(_$EmoteTypeEnumMap, json['type']),
+  ownerDisplayName: json['ownerDisplayName'] as String?,
+  ownerUsername: json['ownerUsername'] as String?,
+  ownerId: json['ownerId'] as String?,
+);
 
 Map<String, dynamic> _$EmoteToJson(Emote instance) => <String, dynamic>{
-      'name': instance.name,
-      'width': instance.width,
-      'height': instance.height,
-      'zeroWidth': instance.zeroWidth,
-      'url': instance.url,
-      'type': _$EmoteTypeEnumMap[instance.type]!,
-      'ownerId': instance.ownerId,
-    };
+  'name': instance.name,
+  'realName': instance.realName,
+  'width': instance.width,
+  'height': instance.height,
+  'zeroWidth': instance.zeroWidth,
+  'url': instance.url,
+  'type': _$EmoteTypeEnumMap[instance.type]!,
+  'ownerDisplayName': instance.ownerDisplayName,
+  'ownerUsername': instance.ownerUsername,
+  'ownerId': instance.ownerId,
+};
 
 const _$EmoteTypeEnumMap = {
   EmoteType.twitchBits: 'twitchBits',
diff --git a/lib/models/events.dart b/lib/models/events.dart
new file mode 100644
index 00000000..949e3e55
--- /dev/null
+++ b/lib/models/events.dart
@@ -0,0 +1,61 @@
+import 'package:frosty/models/emotes.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+part 'events.g.dart';
+
+@JsonSerializable()
+class SevenTVEvent {
+  final int op;
+  @JsonKey(includeIfNull: false)
+  final int? t;
+  final SevenTVEventData d;
+
+  const SevenTVEvent({required this.op, this.t, required this.d});
+
+  factory SevenTVEvent.fromJson(Map<String, dynamic> json) =>
+      _$SevenTVEventFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SevenTVEventToJson(this);
+}
+
+@JsonSerializable()
+class SevenTVEventData {
+  final String? type;
+  final Map<String, String>? condition;
+  @JsonKey(includeToJson: false)
+  final SevenTVEventEmoteSetBody? body;
+
+  const SevenTVEventData({required this.type, this.condition, this.body});
+
+  factory SevenTVEventData.fromJson(Map<String, dynamic> json) =>
+      _$SevenTVEventDataFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SevenTVEventDataToJson(this);
+}
+
+@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
+class SevenTVEventUpdatedEmote {
+  final Emote7TV? value;
+  final Emote7TV? oldValue;
+
+  const SevenTVEventUpdatedEmote({this.value, this.oldValue});
+
+  factory SevenTVEventUpdatedEmote.fromJson(Map<String, dynamic> json) =>
+      _$SevenTVEventUpdatedEmoteFromJson(json);
+}
+
+@JsonSerializable(createToJson: false)
+class SevenTVEventEmoteSetBody {
+  final Owner7TV actor;
+  final List<SevenTVEventUpdatedEmote>? pushed;
+  final List<SevenTVEventUpdatedEmote>? pulled;
+
+  const SevenTVEventEmoteSetBody({
+    required this.actor,
+    this.pushed,
+    this.pulled,
+  });
+
+  factory SevenTVEventEmoteSetBody.fromJson(Map<String, dynamic> json) =>
+      _$SevenTVEventEmoteSetBodyFromJson(json);
+}
diff --git a/lib/models/events.g.dart b/lib/models/events.g.dart
new file mode 100644
index 00000000..33ffff35
--- /dev/null
+++ b/lib/models/events.g.dart
@@ -0,0 +1,55 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'events.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SevenTVEvent _$SevenTVEventFromJson(Map<String, dynamic> json) => SevenTVEvent(
+  op: (json['op'] as num).toInt(),
+  t: (json['t'] as num?)?.toInt(),
+  d: SevenTVEventData.fromJson(json['d'] as Map<String, dynamic>),
+);
+
+Map<String, dynamic> _$SevenTVEventToJson(SevenTVEvent instance) =>
+    <String, dynamic>{'op': instance.op, 't': ?instance.t, 'd': instance.d};
+
+SevenTVEventData _$SevenTVEventDataFromJson(Map<String, dynamic> json) =>
+    SevenTVEventData(
+      type: json['type'] as String?,
+      condition: (json['condition'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, e as String),
+      ),
+      body: json['body'] == null
+          ? null
+          : SevenTVEventEmoteSetBody.fromJson(
+              json['body'] as Map<String, dynamic>,
+            ),
+    );
+
+Map<String, dynamic> _$SevenTVEventDataToJson(SevenTVEventData instance) =>
+    <String, dynamic>{'type': instance.type, 'condition': instance.condition};
+
+SevenTVEventUpdatedEmote _$SevenTVEventUpdatedEmoteFromJson(
+  Map<String, dynamic> json,
+) => SevenTVEventUpdatedEmote(
+  value: json['value'] == null
+      ? null
+      : Emote7TV.fromJson(json['value'] as Map<String, dynamic>),
+  oldValue: json['old_value'] == null
+      ? null
+      : Emote7TV.fromJson(json['old_value'] as Map<String, dynamic>),
+);
+
+SevenTVEventEmoteSetBody _$SevenTVEventEmoteSetBodyFromJson(
+  Map<String, dynamic> json,
+) => SevenTVEventEmoteSetBody(
+  actor: Owner7TV.fromJson(json['actor'] as Map<String, dynamic>),
+  pushed: (json['pushed'] as List<dynamic>?)
+      ?.map((e) => SevenTVEventUpdatedEmote.fromJson(e as Map<String, dynamic>))
+      .toList(),
+  pulled: (json['pulled'] as List<dynamic>?)
+      ?.map((e) => SevenTVEventUpdatedEmote.fromJson(e as Map<String, dynamic>))
+      .toList(),
+);
diff --git a/lib/models/followed_channel.dart b/lib/models/followed_channel.dart
new file mode 100644
index 00000000..14d299e9
--- /dev/null
+++ b/lib/models/followed_channel.dart
@@ -0,0 +1,39 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'followed_channel.g.dart';
+
+// Object for followed Twitch channels.
+@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
+class FollowedChannel {
+  final String broadcasterId;
+  final String broadcasterLogin;
+  final String broadcasterName;
+  final DateTime followedAt;
+
+  const FollowedChannel({
+    required this.broadcasterId,
+    required this.broadcasterLogin,
+    required this.broadcasterName,
+    required this.followedAt,
+  });
+
+  factory FollowedChannel.fromJson(Map<String, dynamic> json) =>
+      _$FollowedChannelFromJson(json);
+}
+
+// Response object for followed channels API call.
+@JsonSerializable(createToJson: false, fieldRename: FieldRename.snake)
+class FollowedChannels {
+  final List<FollowedChannel> data;
+  final Map<String, String> pagination;
+  final int total;
+
+  const FollowedChannels({
+    required this.data,
+    required this.pagination,
+    required this.total,
+  });
+
+  factory FollowedChannels.fromJson(Map<String, dynamic> json) =>
+      _$FollowedChannelsFromJson(json);
+}
diff --git a/lib/models/followed_channel.g.dart b/lib/models/followed_channel.g.dart
new file mode 100644
index 00000000..d17b7dff
--- /dev/null
+++ b/lib/models/followed_channel.g.dart
@@ -0,0 +1,24 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'followed_channel.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+FollowedChannel _$FollowedChannelFromJson(Map<String, dynamic> json) =>
+    FollowedChannel(
+      broadcasterId: json['broadcaster_id'] as String,
+      broadcasterLogin: json['broadcaster_login'] as String,
+      broadcasterName: json['broadcaster_name'] as String,
+      followedAt: DateTime.parse(json['followed_at'] as String),
+    );
+
+FollowedChannels _$FollowedChannelsFromJson(Map<String, dynamic> json) =>
+    FollowedChannels(
+      data: (json['data'] as List<dynamic>)
+          .map((e) => FollowedChannel.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      pagination: Map<String, String>.from(json['pagination'] as Map),
+      total: (json['total'] as num).toInt(),
+    );
diff --git a/lib/models/irc.dart b/lib/models/irc.dart
index b75c102d..ba00cb52 100644
--- a/lib/models/irc.dart
+++ b/lib/models/irc.dart
@@ -1,16 +1,33 @@
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:frosty/cache_manager.dart';
 import 'package:frosty/constants.dart';
 import 'package:frosty/models/badges.dart';
 import 'package:frosty/models/emotes.dart';
+import 'package:frosty/models/user.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_assets_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
-import 'package:frosty/widgets/cached_image.dart';
+import 'package:frosty/utils.dart' as utils;
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
+import 'package:frosty/widgets/frosty_photo_view_dialog.dart';
 import 'package:intl/intl.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+// Constants for IRC message rendering
+const String _ircActionPrefix = '\x01';
+const String _ircActionSuffix = '\x01';
+const int _ircActionPrefixLength = 8;
+const String _invalidUnicodeChar = '\u{E0000}';
+const String _twitchEmoteBaseUrl = 'https://static-cdn.jtvnw.net/emoticons/v2';
+const String _twitchIrcServer = 'tmi.twitch.tv';
+const String _emoteModeSuffix = '/default/dark/3.0';
+const double _emojiSizeOffset = 5.0;
+
 /// The object representation of a Twitch IRC message.
 class IRCMessage {
   final String raw;
@@ -22,6 +39,8 @@ class IRCMessage {
   List<String>? split;
   bool? action;
   bool? mention;
+  final VoidCallback? actionCallback;
+  final String? actionLabel;
 
   IRCMessage({
     required this.raw,
@@ -33,8 +52,15 @@ class IRCMessage {
     this.split,
     this.action,
     this.mention,
+    this.actionCallback,
+    this.actionLabel,
   });
 
+  /// The channel this message actually originated from. In Twitch shared
+  /// chat, `source-room-id` names the participant channel a message was
+  /// sent in; otherwise it's just this connection's own room.
+  String? get sourceChannelId => tags['source-room-id'] ?? tags['room-id'];
+
   /// Applies the given CLEARCHAT message to the provided messages and buffer.
   static void clearChat({
     required List<IRCMessage> messages,
@@ -46,7 +72,8 @@ class IRCMessage {
       messages.clear();
       bufferedMessages.clear();
       messages.add(
-          IRCMessage.createNotice(message: 'Chat was cleared by a moderator'));
+        IRCMessage.createNotice(message: 'Chat was cleared by a moderator'),
+      );
       return;
     }
 
@@ -105,80 +132,164 @@ class IRCMessage {
     }
   }
 
-  /// Returns an [InlineSpan] list that corresponds to the badges, username, words, and emotes of the given [IRCMessage].
-  List<InlineSpan> generateSpan({
-    required TextStyle? style,
-    required ChatAssetsStore assetsStore,
-    required double badgeScale,
-    required double emoteScale,
-    required bool isLightTheme,
-    required bool launchExternal,
-    required void Function()? onTapName,
-    bool showMessage = true,
-    bool useReadableColors = false,
-    TimestampType timestamp = TimestampType.disabled,
-  }) {
-    final emoteToObject = assetsStore.emoteToObject;
+  /// Adds timestamp to the span if enabled
+  void _addTimestamp(
+    List<InlineSpan> span,
+    TextStyle? style,
+    TimestampType timestamp,
+  ) {
+    if (timestamp == TimestampType.disabled) return;
+
+    final time =
+        tags['tmi-sent-ts'] ?? DateTime.now().millisecondsSinceEpoch.toString();
+    final parsedTime = DateTime.fromMillisecondsSinceEpoch(int.parse(time));
+
+    final timeText = timestamp == TimestampType.twentyFour
+        ? '${DateFormat.Hm().format(parsedTime)} '
+        : '${DateFormat('h:mm').format(parsedTime)} ';
+
+    span.add(
+      TextSpan(
+        text: timeText,
+        style: style?.copyWith(
+          color: style.color?.withValues(alpha: 0.5),
+          fontFeatures: [FontFeature.tabularFigures()],
+        ),
+      ),
+    );
+  }
+
+  /// Adds historical and channel source badges to the span
+  void _addHistoricalAndChannelBadges(
+    BuildContext context,
+    List<InlineSpan> span,
+    double badgeSize,
+    Map<String, UserTwitch>? channelIdToUserTwitch,
+    String? currentChannelId,
+  ) {
+    final isHistorical = tags['historical'] == '1';
+    if (isHistorical) {
+      span.add(
+        WidgetSpan(
+          alignment: PlaceholderAlignment.middle,
+          child: Tooltip(
+            message: 'Historical message',
+            preferBelow: false,
+            triggerMode: TooltipTriggerMode.tap,
+            child: Icon(
+              Icons.history_rounded,
+              size: badgeSize,
+              color:
+                  Theme.of(context).iconTheme.color?.withValues(alpha: 0.5) ??
+                  Theme.of(context).colorScheme.onSurfaceVariant.withValues(
+                    alpha: 0.5,
+                  ),
+            ),
+          ),
+        ),
+      );
+      span.add(const TextSpan(text: ' '));
+    }
+
+    final sourceChannelUser = channelIdToUserTwitch?[sourceChannelId];
+    if (sourceChannelUser != null) {
+      final isCurrentChannel = sourceChannelId == currentChannelId;
+
+      span.add(
+        WidgetSpan(
+          alignment: PlaceholderAlignment.middle,
+          child: Tooltip(
+            triggerMode: TooltipTriggerMode.tap,
+            preferBelow: false,
+            message: isCurrentChannel
+                ? 'Sent from ${sourceChannelUser.displayName} (current channel)'
+                : 'Sent from ${sourceChannelUser.displayName}',
+            child: CachedNetworkImage(
+              cacheManager: CustomCacheManager.instance,
+              imageUrl: sourceChannelUser.profileImageUrl,
+              imageBuilder: (context, imageProvider) => Container(
+                width: badgeSize,
+                height: badgeSize,
+                decoration: BoxDecoration(
+                  shape: BoxShape.circle,
+                  border: isCurrentChannel
+                      ? Border.all(
+                          color: Theme.of(context).colorScheme.primary,
+                          width: 1.5,
+                        )
+                      : null,
+                ),
+                child: Container(
+                  margin: isCurrentChannel ? const EdgeInsets.all(1.5) : null,
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    image: DecorationImage(
+                      image: imageProvider,
+                      fit: BoxFit.cover,
+                    ),
+                  ),
+                ),
+              ),
+              placeholder: (context, url) => Container(
+                width: badgeSize,
+                height: badgeSize,
+                decoration: BoxDecoration(
+                  shape: BoxShape.circle,
+                  border: isCurrentChannel
+                      ? Border.all(
+                          color: Theme.of(context).colorScheme.primary,
+                          width: 1.5,
+                        )
+                      : null,
+                ),
+              ),
+            ),
+          ),
+        ),
+      );
+      span.add(const TextSpan(text: ' '));
+    }
+  }
+
+  /// Adds all user badges (Twitch, FFZ, BTTV, 7TV) to the span
+  bool _addUserBadges(
+    BuildContext context,
+    List<InlineSpan> span,
+    ChatAssetsStore assetsStore,
+    double badgeSize,
+    bool launchExternal,
+    bool isHistorical,
+  ) {
+    var skipBot = false;
     final twitchBadgeToObject = assetsStore.twitchBadgesToObject;
     final ffzUserToBadges = assetsStore.userToFFZBadges;
     final sevenTVUserToBadges = assetsStore.userTo7TVBadges;
     final bttvUserToBadge = assetsStore.userToBTTVBadges;
     final ffzRoomInfo = assetsStore.ffzRoomInfo;
-    final badgeSize = defaultBadgeSize * badgeScale;
-    final emoteSize = defaultEmoteSize * emoteScale;
-
-    // The span list that will be used to render the chat message
-    final span = <InlineSpan>[];
-
-    if (timestamp != TimestampType.disabled) {
-      final time = tags['tmi-sent-ts'] ??
-          DateTime.now().millisecondsSinceEpoch.toString();
-      final parsedTime = DateTime.fromMillisecondsSinceEpoch(int.parse(time));
-
-      if (timestamp == TimestampType.twentyFour) {
-        span.add(
-          TextSpan(
-            text: '${DateFormat.Hm().format(parsedTime)} ',
-            style: style?.copyWith(color: style.color?.withOpacity(0.5)),
-          ),
-        );
-      }
-
-      if (timestamp == TimestampType.twelve) {
-        span.add(
-          TextSpan(
-            text: '${DateFormat('h:mm').format(parsedTime)} ',
-            style: style?.copyWith(color: style.color?.withOpacity(0.5)),
-          ),
-        );
-      }
-    }
-
-    // Indicator to skip adding the bot badges later when adding the rest of FFZ badges.
-    var skipBot = false;
 
     final ffzUserBadges = ffzUserToBadges[tags['user-id']];
     final twitchBadges = tags['badges']?.split(',');
-    // Pasrse and add the Twitch badges to the span if they exist.
+
+    // Add Twitch badges
     if (twitchBadges != null) {
       for (final badge in twitchBadges) {
         final badgeInfo = twitchBadgeToObject[badge];
         if (badgeInfo != null) {
           var badgeUrl = badgeInfo.url;
 
-          // Add custom FFZ mod badge if it exists.
+          // Handle custom FFZ mod badge
           if (badgeInfo.name == 'Moderator' &&
               (ffzUserBadges != null || ffzRoomInfo?.modUrls != null)) {
-            // Check if mod is bot.
-            final botBadge = ffzUserBadges
-                ?.firstWhereOrNull((element) => element.name == 'Bot');
+            final botBadge = ffzUserBadges?.firstWhereOrNull(
+              (element) => element.name == 'Bot',
+            );
 
-            // Check if user has bot badge or room has custom FFZ mod badges
             if (botBadge != null) {
               badgeUrl = botBadge.url;
               skipBot = true;
             } else if (ffzRoomInfo?.modUrls != null) {
-              badgeUrl = ffzRoomInfo!.modUrls?.url4x ??
+              badgeUrl =
+                  ffzRoomInfo!.modUrls?.url4x ??
                   ffzRoomInfo.modUrls?.url2x ??
                   ffzRoomInfo.modUrls!.url1x;
             }
@@ -191,18 +302,21 @@ class IRCMessage {
 
             span.add(
               _createBadgeSpan(
+                context,
                 badge: newBadge,
                 size: badgeSize,
                 backgroundColor: const Color(0xFF00AD03),
+                launchExternal: launchExternal,
               ),
             );
             span.add(const TextSpan(text: ' '));
             continue;
           }
 
-          // Add custom FFZ vip badge if it exists
+          // Handle custom FFZ VIP badge
           if (badgeInfo.name == 'VIP' && ffzRoomInfo?.vipBadge != null) {
-            badgeUrl = ffzRoomInfo!.vipBadge?.url4x ??
+            badgeUrl =
+                ffzRoomInfo!.vipBadge?.url4x ??
                 ffzRoomInfo.vipBadge?.url2x ??
                 ffzRoomInfo.vipBadge!.url1x;
           }
@@ -215,8 +329,10 @@ class IRCMessage {
 
           span.add(
             _createBadgeSpan(
+              context,
               badge: newBadge,
               size: badgeSize,
+              launchExternal: launchExternal,
             ),
           );
           span.add(const TextSpan(text: ' '));
@@ -224,29 +340,34 @@ class IRCMessage {
       }
     }
 
-    // Add FFZ badges to span
+    // Add FFZ badges
     if (ffzUserBadges != null) {
       for (final badge in ffzUserBadges) {
         final color = Color(int.parse(badge.color!.replaceFirst('#', '0xFF')));
 
         if (badge.name == 'Bot') {
           if (!skipBot) {
+            final indexToInsert = isHistorical ? 2 : 0;
             span.insert(
-              0,
+              indexToInsert,
               _createBadgeSpan(
+                context,
                 badge: badge,
                 size: badgeSize,
                 backgroundColor: color,
+                launchExternal: launchExternal,
               ),
             );
-            span.add(const TextSpan(text: ' '));
+            span.insert(indexToInsert + 1, const TextSpan(text: ' '));
           }
         } else {
           span.add(
             _createBadgeSpan(
+              context,
               badge: badge,
               size: badgeSize,
               backgroundColor: color,
+              launchExternal: launchExternal,
             ),
           );
           span.add(const TextSpan(text: ' '));
@@ -254,238 +375,360 @@ class IRCMessage {
       }
     }
 
-    // Add BTTV badges to span
+    // Add BTTV badges
     final userBTTVBadge = bttvUserToBadge[tags['user-id']];
     if (userBTTVBadge != null) {
       span.add(
         _createBadgeSpan(
+          context,
           badge: userBTTVBadge,
           size: badgeSize,
           isSvg: true,
+          launchExternal: launchExternal,
         ),
       );
       span.add(const TextSpan(text: ' '));
     }
 
-    // Add 7TV badges to end of badges span
+    // Add 7TV badges
     final user7TVBadges = sevenTVUserToBadges[tags['user-id']];
     if (user7TVBadges != null) {
       for (final badge in user7TVBadges) {
         span.add(
           _createBadgeSpan(
+            context,
             badge: badge,
             size: badgeSize,
+            launchExternal: launchExternal,
           ),
         );
         span.add(const TextSpan(text: ' '));
       }
     }
 
+    return skipBot;
+  }
+
+  /// Adds the username to the span with proper color and styling
+  void _addUsername(
+    List<InlineSpan> span,
+    BuildContext context,
+    void Function()? onTapName,
+  ) {
     var color = Color(
-        int.parse((tags['color'] ?? '#868686').replaceFirst('#', '0xFF')));
+      int.parse((tags['color'] ?? '#868686').replaceFirst('#', '0xFF')),
+    );
 
-    if (useReadableColors) {
-      final hsl = HSLColor.fromColor(color);
-      if (isLightTheme == true) {
-        if (hsl.lightness >= 0.5) {
-          color = hsl
-              .withLightness(hsl.lightness + ((0 - hsl.lightness) * 0.5))
-              .toColor();
-        }
-      } else {
-        if (hsl.lightness <= 0.5) {
-          color = hsl
-              .withLightness(hsl.lightness + ((1 - hsl.lightness) * 0.5))
-              .toColor();
-        }
-      }
-    }
+    // Adjust color for theme contrast using the common utility
+    color = utils.adjustChatNameColor(context, color);
 
-    // Add the display name (username) to the span and apply the onLongPressName callback.
     final displayName = tags['display-name']!;
     span.add(
       TextSpan(
-        text: regexEnglish.hasMatch(displayName)
-            ? displayName
-            : '$displayName ($user)',
-        style: TextStyle(
-          color: color,
-          fontWeight: FontWeight.bold,
-        ),
+        text: user != null
+            ? utils.getReadableName(displayName, user!)
+            : displayName,
+        style: TextStyle(color: color, fontWeight: FontWeight.bold),
         recognizer: TapGestureRecognizer()..onTap = onTapName,
       ),
     );
 
-    // Add the colon separator between the username and their message to the span.
+    // Add the colon separator between the username and their message
     if (action == false) span.add(const TextSpan(text: ':'));
+  }
 
-    // Italicize the text if it was called with an IRC Action (e.g., "/me").
-    final textStyle =
-        action == true ? const TextStyle(fontStyle: FontStyle.italic) : style;
-
+  /// Adds message content with emotes, emojis and text processing
+  void _addMessageContent(
+    BuildContext context,
+    List<InlineSpan> span,
+    Map<String, Emote> emoteToObject,
+    double emoteSize,
+    double emoteScale,
+    bool showMessage,
+    bool launchExternal,
+    TextStyle? textStyle,
+    void Function(String)? onTapPingedUser,
+    void Function()? onTapDeletedMessage, {
+    Color? linkColor,
+  }) {
     if (!showMessage) {
-      span.add(const TextSpan(text: ' <message deleted>'));
-    } else {
-      // Check if the message is a reply. If it is, remove the reply username (first word) from the message.
-      final words = tags.containsKey('reply-parent-display-name')
-          ? split?.sublist(1)
-          : split;
-
-      // Add the message and any emotes to the span.
-      if (words != null) {
-        // Keep a local span which will be reversed and added to the final span.
-        final localSpan = <InlineSpan>[];
-
-        // Iterate through the words in reverse-order.
-        // Index starts at the last word in the message.
-        var index = words.length - 1;
-
-        // Terminate after the first word in the message reached.
-        while (index != -1) {
-          // Check if current word is a valid emote.
-          final word = words[index];
-          final emote = emoteToObject[word] ?? localEmotes?[word];
-
-          if (emote != null) {
-            // If the emote is zero-width and not the first word, process the stack.
-            if (emote.zeroWidth && index != 0) {
-              final emoteStack = <Emote>[];
-
-              // Handle stacking consecutive zero-width emotes.
-              Emote? nextEmote = emote;
-              while (nextEmote != null && nextEmote.zeroWidth && index != 0) {
-                emoteStack.add(nextEmote);
-                index--;
-                nextEmote =
-                    emoteToObject[words[index]] ?? localEmotes?[words[index]];
-              }
-
-              // If there's one more emote thats NOT zero-width, add it to the base of the stack.
-              if (nextEmote != null) emoteStack.add(nextEmote);
-
-              // Check if the next word is an emoji to be added to the stack.
-              final nextWordIsEmoji = regexEmoji.hasMatch(words[index]);
-
-              // Create the stack of emotes with the base emoji if there is one.
-              // Will be used as the children of the Stack widget.
-              final children = [
-                if (nextWordIsEmoji)
-                  Text(
-                    words[index],
-                    style: textStyle?.copyWith(fontSize: emoteSize - 5),
-                  ),
-                ...emoteStack.reversed.map(
-                  (emote) => FrostyCachedNetworkImage(
-                    imageUrl: emote.url,
-                    height: emote.height != null
-                        ? emote.height! * emoteScale
-                        : emoteSize,
-                    width: emote.width != null
-                        ? emote.width! * emoteScale
-                        : emoteSize,
-                    useFade: false,
-                  ),
+      span.add(
+        TextSpan(
+          text: ' <message deleted>',
+          style: onTapDeletedMessage != null
+              ? textStyle?.copyWith(
+                  color: Theme.of(context).colorScheme.primary,
+                  fontWeight: FontWeight.w500,
                 )
-              ];
+              : null,
+          recognizer: onTapDeletedMessage != null
+              ? (TapGestureRecognizer()..onTap = onTapDeletedMessage)
+              : null,
+        ),
+      );
+      return;
+    }
 
-              // Create the message for the tooltip
-              final message = emoteStack.reversed.map(
-                  (emote) => '${emote.name} - ${emoteType[emote.type.index]}');
-              localSpan.add(
-                WidgetSpan(
-                  alignment: PlaceholderAlignment.middle,
-                  child: Tooltip(
-                    triggerMode: TooltipTriggerMode.tap,
-                    showDuration: const Duration(seconds: 3),
-                    richMessage: WidgetSpan(
-                      child: Column(
-                        children: [
-                          Stack(
-                            alignment: AlignmentDirectional.center,
-                            children: [
-                              if (nextWordIsEmoji)
-                                Text(
-                                  words[index],
-                                  style: textStyle?.copyWith(fontSize: 75),
-                                ),
-                              ...emoteStack.reversed.map(
-                                (emote) => FrostyCachedNetworkImage(
-                                  imageUrl: emote.url,
-                                  height: 80,
-                                  useFade: false,
-                                ),
-                              )
-                            ],
-                          ),
-                          const SizedBox(height: 5.0),
-                          Column(
-                            children: [
-                              Text(
-                                nextWordIsEmoji
-                                    ? '${words[index]} - Emoji'
-                                    : '${emoteStack.last.name} - ${emoteType[emoteStack.last.type.index]}',
-                                style: const TextStyle(color: Colors.white),
-                              ),
-                              Text(
-                                nextWordIsEmoji
-                                    ? message.join(', ')
-                                    : message.skip(1).join(', '),
-                                style: const TextStyle(color: Colors.white),
-                              ),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
-                    preferBelow: false,
-                    child: Stack(
-                      alignment: AlignmentDirectional.center,
-                      children: children,
-                    ),
-                  ),
-                ),
-              );
+    // Check if the message is a reply. If it is, remove the reply username from the message.
+    final words = tags.containsKey('reply-parent-display-name')
+        ? split?.sublist(1)
+        : split;
 
-              // If the next word is neither an emote or emoji, add it as a text span.
-              if (nextEmote == null && !nextWordIsEmoji) {
-                localSpan.add(const TextSpan(text: ' '));
-                localSpan.add(_createTextSpan(
-                    text: words[index],
-                    style: textStyle,
-                    launchExternal: launchExternal));
-              }
-            } else {
-              localSpan.add(
-                _createEmoteSpan(
-                  emote: emote,
-                  height: emote.height != null
-                      ? emote.height! * emoteScale
-                      : emoteSize,
-                  width: emote.width != null ? emote.width! * emoteScale : null,
-                ),
-              );
-            }
+    if (words != null) {
+      // Keep a local span which will be reversed and added to the final span.
+      final localSpan = <InlineSpan>[];
+
+      // Iterate through the words in reverse-order.
+      var index = words.length - 1;
+
+      // Terminate after the first word in the message reached.
+      while (index != -1) {
+        final word = words[index];
+        final emote = emoteToObject[word] ?? localEmotes?[word];
+
+        if (emote != null) {
+          // If the emote is zero-width and not the first word, process the stack.
+          if (emote.zeroWidth && index != 0) {
+            index = _processZeroWidthEmoteStack(
+              context,
+              localSpan,
+              words,
+              index,
+              emote,
+              emoteToObject,
+              emoteSize,
+              emoteScale,
+              textStyle,
+              launchExternal,
+              linkColor: linkColor,
+            );
           } else {
-            if (regexEmoji.hasMatch(word)) {
-              localSpan.add(_createEmojiSpan(
-                  emoji: word,
-                  style: textStyle?.copyWith(fontSize: emoteSize - 5)));
-            } else {
-              localSpan.add(_createTextSpan(
-                  text: word,
-                  style: textStyle,
-                  launchExternal: launchExternal));
-            }
+            localSpan.add(
+              _createEmoteSpan(
+                context,
+                emote: emote,
+                height: emote.height != null
+                    ? emote.height! * emoteScale
+                    : emoteSize,
+                width: emote.width != null ? emote.width! * emoteScale : null,
+                launchExternal: launchExternal,
+              ),
+            );
+            localSpan.add(const TextSpan(text: ' '));
+            index--;
+          }
+        } else {
+          if (regexEmoji.hasMatch(word)) {
+            localSpan.add(
+              _createEmojiSpan(
+                emoji: word,
+                style: textStyle?.copyWith(
+                  fontSize: emoteSize - _emojiSizeOffset,
+                ),
+              ),
+            );
+          } else {
+            localSpan.add(
+              _createTextSpan(
+                text: word,
+                style: textStyle,
+                linkColor: linkColor,
+                launchExternal: launchExternal,
+                onTapPingedUser: onTapPingedUser,
+              ),
+            );
           }
-
           localSpan.add(const TextSpan(text: ' '));
           index--;
         }
-
-        // Add the the local span reversed to the final span.
-        span.addAll(localSpan.reversed);
       }
+
+      // Add the local span reversed to the final span.
+      span.addAll(localSpan.reversed);
     }
+  }
+
+  /// Handles zero-width emote stacking logic and returns updated index
+  int _processZeroWidthEmoteStack(
+    BuildContext context,
+    List<InlineSpan> localSpan,
+    List<String> words,
+    int startIndex,
+    Emote startEmote,
+    Map<String, Emote> emoteToObject,
+    double emoteSize,
+    double emoteScale,
+    TextStyle? textStyle,
+    bool launchExternal, {
+    Color? linkColor,
+  }) {
+    final emoteStack = <Emote>[];
+    var index = startIndex;
+
+    // Handle stacking consecutive zero-width emotes.
+    Emote? nextEmote = startEmote;
+    while (nextEmote != null && nextEmote.zeroWidth && index != 0) {
+      emoteStack.add(nextEmote);
+      index--;
+      nextEmote = emoteToObject[words[index]] ?? localEmotes?[words[index]];
+    }
+
+    // If there's one more emote that's NOT zero-width, add it to the base of the stack.
+    if (nextEmote != null) emoteStack.add(nextEmote);
+
+    // Check if the next word is an emoji to be added to the stack.
+    final nextWordIsEmoji = regexEmoji.hasMatch(words[index]);
+
+    // Create the stack of emotes with the base emoji if there is one.
+    final children = [
+      if (nextWordIsEmoji)
+        Text(
+          words[index],
+          style: textStyle?.copyWith(fontSize: emoteSize - _emojiSizeOffset),
+        ),
+      ...emoteStack.reversed.map(
+        (emote) => FrostyCachedNetworkImage(
+          imageUrl: emote.url,
+          height: emote.height != null ? emote.height! * emoteScale : emoteSize,
+          width: emote.width != null ? emote.width! * emoteScale : emoteSize,
+          useFade: false,
+        ),
+      ),
+    ];
+
+    // Create the message for the tooltip
+    final message = emoteStack.reversed.map((emote) => emote.name);
+    final emoji = words[index];
+
+    localSpan.add(
+      WidgetSpan(
+        alignment: PlaceholderAlignment.middle,
+        child: InkWell(
+          onTap: () => _showAssetDetailsBottomSheet(
+            context,
+            leading: Stack(
+              alignment: AlignmentDirectional.center,
+              children: [
+                if (nextWordIsEmoji)
+                  Text(emoji, style: textStyle?.copyWith(fontSize: 40)),
+                ...emoteStack.reversed.map(
+                  (emote) =>
+                      FrostyCachedNetworkImage(imageUrl: emote.url, width: 56),
+                ),
+              ],
+            ),
+            url: emoteStack.last.url,
+            title: nextWordIsEmoji
+                ? emoji
+                : '${emoteStack.last.name} (${emoteStack.last.type})',
+            subtitle: Text(
+              'with ${nextWordIsEmoji ? message.join(' + ') : message.skip(1).join(' + ')}',
+            ),
+            launchExternal: launchExternal,
+          ),
+          child: Stack(
+            alignment: AlignmentDirectional.center,
+            children: children,
+          ),
+        ),
+      ),
+    );
+
+    // If the next word is neither an emote nor emoji, add it as a text span.
+    if (nextEmote == null && !nextWordIsEmoji) {
+      localSpan.add(const TextSpan(text: ' '));
+      localSpan.add(
+        _createTextSpan(
+          text: words[index],
+          style: textStyle,
+          linkColor: linkColor,
+          launchExternal: launchExternal,
+        ),
+      );
+    }
+
+    // Add space after the zero-width emote stack (like all other elements)
+    localSpan.add(const TextSpan(text: ' '));
+
+    return index - 1;
+  }
+
+  /// Returns an [InlineSpan] list that corresponds to the badges, username, words, and emotes of the given [IRCMessage].
+  List<InlineSpan> generateSpan(
+    BuildContext context, {
+    TextStyle? style,
+    required ChatAssetsStore assetsStore,
+    required double badgeScale,
+    required double emoteScale,
+    required bool launchExternal,
+    void Function()? onTapName,
+    void Function(String)? onTapPingedUser,
+    void Function()? onTapDeletedMessage,
+    bool showMessage = true,
+    Map<String, UserTwitch>? channelIdToUserTwitch,
+    TimestampType timestamp = TimestampType.disabled,
+    bool forceTimestamp = false,
+    bool showHistoricalTimestamps = false,
+    String? currentChannelId,
+  }) {
+    final emoteToObject = assetsStore.emoteToObject;
+    final badgeSize = defaultBadgeSize * badgeScale;
+    final emoteSize = defaultEmoteSize * emoteScale;
+    final linkColor = Theme.of(context).colorScheme.primary;
+
+    // The span list that will be used to render the chat message
+    final span = <InlineSpan>[];
+
+    // When the user has timestamps disabled globally, fall back to the device's
+    // locale preference for historical messages (opt-in via setting) and for
+    // forced contexts like previews.
+    final isHistorical = tags['historical'] == '1';
+    final effectiveTimestamp =
+        (timestamp == TimestampType.disabled &&
+                ((isHistorical && showHistoricalTimestamps) || forceTimestamp))
+            ? (MediaQuery.alwaysUse24HourFormatOf(context)
+                ? TimestampType.twentyFour
+                : TimestampType.twelve)
+            : timestamp;
+
+    _addTimestamp(span, style, effectiveTimestamp);
+    _addHistoricalAndChannelBadges(
+      context,
+      span,
+      badgeSize,
+      channelIdToUserTwitch,
+      currentChannelId,
+    );
+
+    _addUserBadges(
+      context,
+      span,
+      assetsStore,
+      badgeSize,
+      launchExternal,
+      isHistorical,
+    );
+
+    _addUsername(span, context, onTapName);
+
+    // Italicize the text if it was called with an IRC Action (e.g., "/me").
+    final textStyle = action == true
+        ? const TextStyle(fontStyle: FontStyle.italic)
+        : style;
+
+    _addMessageContent(
+      context,
+      span,
+      emoteToObject,
+      emoteSize,
+      emoteScale,
+      showMessage,
+      launchExternal,
+      textStyle,
+      onTapPingedUser,
+      onTapDeletedMessage,
+      linkColor: linkColor,
+    );
 
     return span;
   }
@@ -496,16 +739,13 @@ class IRCMessage {
   }) {
     return WidgetSpan(
       alignment: PlaceholderAlignment.middle,
-      child: Text(
-        emoji,
-        style: style,
-      ),
+      child: Text(emoji, style: style),
     );
   }
 
   static Widget _createBadgeWidget({
     required ChatBadge badge,
-    required double size,
+    double? size,
     Color? backgroundColor,
     bool? isSvg,
   }) {
@@ -520,11 +760,7 @@ class IRCMessage {
         ),
       );
     } else if (isSvg == true) {
-      return SvgPicture.network(
-        badge.url,
-        height: size,
-        width: size,
-      );
+      return SvgPicture.network(badge.url, height: size, width: size);
     } else {
       return FrostyCachedNetworkImage(
         imageUrl: badge.url,
@@ -535,35 +771,31 @@ class IRCMessage {
     }
   }
 
-  static WidgetSpan _createBadgeSpan({
+  static WidgetSpan _createBadgeSpan(
+    BuildContext context, {
     required ChatBadge badge,
     required double size,
+    required bool launchExternal,
     Color? backgroundColor,
     bool? isSvg,
   }) {
     return WidgetSpan(
       alignment: PlaceholderAlignment.middle,
-      child: Tooltip(
-        triggerMode: TooltipTriggerMode.tap,
-        showDuration: const Duration(seconds: 3),
-        richMessage: WidgetSpan(
-          child: Column(
-            children: [
-              _createBadgeWidget(
-                badge: badge,
-                size: 80,
-                backgroundColor: backgroundColor,
-                isSvg: isSvg,
-              ),
-              const SizedBox(height: 5.0),
-              Text(
-                badge.name,
-                style: const TextStyle(color: Colors.white),
-              ),
-            ],
+      child: InkWell(
+        onTap: () => _showAssetDetailsBottomSheet(
+          context,
+          leading: _createBadgeWidget(
+            badge: badge,
+            backgroundColor: backgroundColor,
+            isSvg: isSvg,
+            size: 56,
           ),
+          url: badge.url,
+          title: badge.name,
+          subtitle: Text(badge.type.toString()),
+          launchExternal: launchExternal,
+          showCopyName: false,
         ),
-        preferBelow: false,
         child: _createBadgeWidget(
           badge: badge,
           size: size,
@@ -574,37 +806,21 @@ class IRCMessage {
     );
   }
 
-  static WidgetSpan _createEmoteSpan({
+  static WidgetSpan _createEmoteSpan(
+    BuildContext context, {
     required Emote emote,
     required double height,
     required double? width,
+    required bool launchExternal,
   }) {
     return WidgetSpan(
       alignment: PlaceholderAlignment.middle,
-      child: Tooltip(
-        triggerMode: TooltipTriggerMode.tap,
-        showDuration: const Duration(seconds: 3),
-        richMessage: WidgetSpan(
-          child: Column(
-            children: [
-              FrostyCachedNetworkImage(
-                imageUrl: emote.url,
-                height: 80,
-                useFade: false,
-              ),
-              const SizedBox(height: 5.0),
-              Text(
-                emote.name,
-                style: const TextStyle(color: Colors.white),
-              ),
-              Text(
-                emoteType[emote.type.index],
-                style: const TextStyle(color: Colors.white),
-              ),
-            ],
-          ),
+      child: InkWell(
+        onTap: () => showEmoteDetailsBottomSheet(
+          context,
+          emote: emote,
+          launchExternal: launchExternal,
         ),
-        preferBelow: false,
         child: FrostyCachedNetworkImage(
           imageUrl: emote.url,
           height: height,
@@ -616,26 +832,139 @@ class IRCMessage {
     );
   }
 
-  static TextSpan _createTextSpan(
-      {required String text, required bool launchExternal, TextStyle? style}) {
+  static TextSpan _createTextSpan({
+    required String text,
+    required bool launchExternal,
+    TextStyle? style,
+    Color? linkColor,
+    Function(String)? onTapPingedUser,
+  }) {
     if (text.startsWith('@')) {
       return TextSpan(
-          text: text, style: style?.copyWith(fontWeight: FontWeight.bold));
-    } else if (RegExp(r'https?:\/\/').hasMatch(text)) {
+        text: text,
+        style: style?.copyWith(fontWeight: FontWeight.bold),
+        recognizer: TapGestureRecognizer()
+          ..onTap = () {
+            if (onTapPingedUser != null) {
+              onTapPingedUser(text.substring(1).split(',')[0]);
+            }
+          },
+      );
+    } else if (regexLink.hasMatch(text)) {
       return TextSpan(
         text: text,
-        style: style?.copyWith(color: Colors.blue),
+        style: style?.copyWith(
+          color: linkColor,
+          decoration: TextDecoration.underline,
+          decorationColor: linkColor,
+        ),
         recognizer: TapGestureRecognizer()
-          ..onTap = () => launchUrl(Uri.parse(text),
-              mode: launchExternal
-                  ? LaunchMode.externalApplication
-                  : LaunchMode.inAppWebView),
+          ..onTap = () => launchUrl(
+            Uri.parse(text),
+            mode: launchExternal
+                ? LaunchMode.externalApplication
+                : LaunchMode.inAppBrowserView,
+          ),
       );
     } else {
       return TextSpan(text: text, style: style);
     }
   }
 
+  static void showEmoteDetailsBottomSheet(
+    BuildContext context, {
+    required Emote emote,
+    required bool launchExternal,
+  }) {
+    _showAssetDetailsBottomSheet(
+      context,
+      leading: FrostyCachedNetworkImage(imageUrl: emote.url, width: 56),
+      url: emote.url,
+      title: emote.realName != null
+          ? '${emote.name} (${emote.realName})'
+          : emote.name,
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(emote.type.toString()),
+          if (emote.ownerDisplayName != null && emote.ownerUsername != null)
+            Text(
+              'by ${utils.getReadableName(emote.ownerDisplayName!, emote.ownerUsername!)}',
+            ),
+        ],
+      ),
+      launchExternal: launchExternal,
+    );
+  }
+
+  static void _showAssetDetailsBottomSheet(
+    BuildContext context, {
+    required Widget leading,
+    required String url,
+    required String title,
+    required Widget subtitle,
+    required bool launchExternal,
+    bool showCopyName = true,
+  }) {
+    showModalBottomSheetWithProperFocus(
+      context: context,
+      builder: (context) => ListView(
+        shrinkWrap: true,
+        primary: false,
+        children: [
+          ListTile(
+            leading: InkWell(
+              onTap: () => showDialog(
+                context: context,
+                builder: (context) => FrostyPhotoViewDialog(imageUrl: url),
+              ),
+              child: leading,
+            ),
+            title: Text(
+              title,
+              style: const TextStyle(fontWeight: FontWeight.w600),
+            ),
+            subtitle: subtitle,
+          ),
+          const Divider(indent: 16, endIndent: 16),
+          if (showCopyName)
+            ListTile(
+              leading: const Icon(Icons.copy_rounded),
+              title: const Text('Copy name'),
+              onTap: () {
+                Clipboard.setData(ClipboardData(text: title.split(' (')[0]));
+
+                Navigator.pop(context);
+              },
+            ),
+          ListTile(
+            leading: const Icon(Icons.copy_rounded),
+            title: const Text('Copy image URL'),
+            onTap: () {
+              Clipboard.setData(ClipboardData(text: url));
+
+              Navigator.pop(context);
+            },
+          ),
+          ListTile(
+            leading: const Icon(Icons.launch_rounded),
+            title: const Text('Open in browser'),
+            onTap: () {
+              launchUrl(
+                Uri.parse(url),
+                mode: launchExternal
+                    ? LaunchMode.externalApplication
+                    : LaunchMode.inAppBrowserView,
+              );
+
+              Navigator.pop(context);
+            },
+          ),
+        ],
+      ),
+    );
+  }
+
   /// Parses an IRC string and returns its corresponding [IRCMessage] object.
   factory IRCMessage.fromString(String whole, {String? userLogin}) {
     // We have three parts:
@@ -649,21 +978,31 @@ class IRCMessage {
     // Obtain the index to break off the tags.
     final tagAndIrcMessageDivider = whole.indexOf(' ');
 
-    // Get the tags substring and escape characters.
-    // IRC messages escape spaces with \s.
-    final tags =
-        whole.substring(1, tagAndIrcMessageDivider).replaceAll('\\s', ' ');
+    // Without a separating space there are no tags to slice and no message body
+    // to parse — bail out rather than throw on the substring/index calls below.
+    if (tagAndIrcMessageDivider == -1) {
+      return IRCMessage(raw: whole, command: Command.none, tags: const {});
+    }
 
-    // Next, parse and map the tags.
+    // Parse the IRCv3 tags into a map. The tags section is everything between
+    // the leading '@' and the first space. We split on the *raw* string: a
+    // literal ';' is always a separator because escaped semicolons inside a
+    // value are encoded as `\:` (unescaped per-value below).
     final mappedTags = <String, String>{};
+    final rawTags = whole.substring(1, tagAndIrcMessageDivider);
 
-    // Loop through each tag and store their key value pairs into the map.
-    for (final tag in tags.split(';')) {
-      // Skip if the tag has no value.
-      if (tag.endsWith('=')) continue;
+    for (final tag in rawTags.split(';')) {
+      // Split on the first '=' only — IRCv3 tag values may contain '='.
+      final equalsIndex = tag.indexOf('=');
 
-      final tagSplit = tag.split('=');
-      mappedTags[tagSplit[0]] = tagSplit[1];
+      // Skip valueless tags. Per the IRCv3 spec a missing value (bare `key`)
+      // and an empty value (`key=`) are equivalent — live Twitch sends the
+      // latter, the recent-messages API the former.
+      if (equalsIndex == -1 || equalsIndex == tag.length - 1) continue;
+
+      mappedTags[tag.substring(0, equalsIndex)] = _unescapeTagValue(
+        tag.substring(equalsIndex + 1),
+      );
     }
 
     // Now we'll parse the message itself.
@@ -677,20 +1016,41 @@ class IRCMessage {
     // Index 3 and beyond is the :message (word by word) that is sent by the user or empty depending on the command
     final splitMessage = ircMessage.split(' ');
 
+    // A well-formed message is at least `<prefix> <COMMAND>`. A malformed or
+    // truncated line (e.g. from the recent-messages history API) can split into
+    // a single token, which would otherwise throw a RangeError on the
+    // splitMessage[0]/[1] accesses below.
+    if (splitMessage.length < 2) {
+      return IRCMessage(raw: whole, command: Command.none, tags: mappedTags);
+    }
+
     // If the username exists, set it.
-    // tmi.twitch.tv means the message was sent by Twitch rather than a user, so will be irrelevant.
-    final String? user = splitMessage[0] == 'tmi.twitch.tv'
-        ? null
-        : splitMessage[0].substring(0, splitMessage[0].indexOf('!'));
+    // tmi.twitch.tv means the message was sent by Twitch rather than a user, so it is irrelevant.
+    final prefix = splitMessage[0];
+    final String? user;
+    if (prefix == _twitchIrcServer) {
+      user = mappedTags['login'];
+    } else {
+      // Normal prefixes are `nick!user@host`. Fall back to the login tag (or
+      // null) if the expected `!` is absent so an unexpected prefix shape can
+      // never throw a RangeError and take down the whole message.
+      final bangIndex = prefix.indexOf('!');
+      user = bangIndex == -1
+          ? mappedTags['login']
+          : prefix.substring(0, bangIndex);
+    }
 
     // If there is an associated message, set it.
-    //
-    // Also remove any "INVALID/UNDEFINED" Unicode characters.
-    // Rendering this character on iOS shows a question mark inside a square.
-    // This character is used by some clients to bypass restrictions on repeating message.
-    var message = splitMessage.length > 3
-        ? splitMessage.sublist(3).join(' ').substring(1)
-        : null;
+    String? message;
+    if (splitMessage.length > 3) {
+      final combinedMessage = splitMessage.sublist(3).join(' ');
+
+      if (combinedMessage.startsWith(':')) {
+        message = combinedMessage.substring(1);
+      } else {
+        message = combinedMessage;
+      }
+    }
 
     // Now process any Twitch emotes contained in the message tags.
     // The map containing emotes from the user's tags to their URL.
@@ -698,22 +1058,26 @@ class IRCMessage {
     final localEmotes = <String, Emote>{};
 
     final emoteTags = mappedTags['emotes'];
-    if (emoteTags != null) {
+    if (emoteTags != null && message != null) {
       // Emotes and their indices are separated by '/' so split them there.
       final emotes = emoteTags.split('/');
 
       for (final emoteIdAndPosition in emotes) {
         final indexBetweenIdAndPositions = emoteIdAndPosition.indexOf(':');
-        final emoteId =
-            emoteIdAndPosition.substring(0, indexBetweenIdAndPositions);
+        final emoteId = emoteIdAndPosition.substring(
+          0,
+          indexBetweenIdAndPositions,
+        );
 
-        // Parse the range in order to extract the associated word.
-        // If there are more than one indices, use the first one.
-        // Else, use the one provided indices.
+        // Parse the range to extract the associated word.
+        // If there is more than one index, use the first.
+        // Otherwise, use the provided index.
         final String range;
         if (emoteIdAndPosition.contains(',')) {
           range = emoteIdAndPosition.substring(
-              indexBetweenIdAndPositions + 1, emoteIdAndPosition.indexOf(','));
+            indexBetweenIdAndPositions + 1,
+            emoteIdAndPosition.indexOf(','),
+          );
         } else {
           range = emoteIdAndPosition.substring(indexBetweenIdAndPositions + 1);
         }
@@ -723,14 +1087,13 @@ class IRCMessage {
         final startIndex = int.parse(indexSplit[0]);
         final endIndex = int.parse(indexSplit[1]);
 
-        final emoteWord = message!.substring(startIndex, endIndex + 1);
+        final emoteWord = message.substring(startIndex, endIndex + 1);
 
         // Store the emote word and its associated URL for later use.
         localEmotes[emoteWord] = Emote(
           name: emoteWord,
           zeroWidth: false,
-          url:
-              'https://static-cdn.jtvnw.net/emoticons/v2/$emoteId/default/dark/3.0',
+          url: '$_twitchEmoteBaseUrl/$emoteId$_emoteModeSuffix',
           type: EmoteType.twitchSub,
         );
       }
@@ -741,9 +1104,10 @@ class IRCMessage {
     List<String>? split;
     if (message != null) {
       // Check if IRC actions like "/me" were called.
-      if (message.startsWith('\x01') && message.endsWith('\x01')) {
+      if (message.startsWith(_ircActionPrefix) &&
+          message.endsWith(_ircActionSuffix)) {
         action = true;
-        message = message.substring(8, message.length - 1);
+        message = message.substring(_ircActionPrefixLength, message.length - 1);
       }
 
       // Check if the message mentions the logged-in user
@@ -754,7 +1118,10 @@ class IRCMessage {
       // Escape the message
       message = message
           .split(' ')
-          .map((word) => word.replaceAll('\u{E0000}', '').trim())
+          // Also remove any "INVALID/UNDEFINED" Unicode characters.
+          // Rendering this character on iOS shows a question mark inside a square.
+          // This character is used by some clients to bypass restrictions on repeating message.
+          .map((word) => word.replaceAll(_invalidUnicodeChar, '').trim())
           .where((element) => element != '')
           .join(' ');
 
@@ -780,7 +1147,8 @@ class IRCMessage {
 
       if (wordBuffer.isNotEmpty) {
         split.addAll(
-            wordBuffer.toString().split(' ').where((element) => element != ''));
+          wordBuffer.toString().split(' ').where((element) => element != ''),
+        );
       }
       if (emojiBuffer.isNotEmpty) split.add(emojiBuffer.toString());
     }
@@ -831,12 +1199,64 @@ class IRCMessage {
     );
   }
 
-  factory IRCMessage.createNotice({required String message}) => IRCMessage(
-        raw: '',
-        tags: {},
-        command: Command.notice,
-        message: message,
-      );
+  /// Unescapes an IRCv3 message-tag value.
+  ///
+  /// The spec defines these sequences: `\:` → `;`, `\s` → space, `\\` → `\`,
+  /// `\r` → CR, `\n` → LF. Any other `\x` collapses to `x`, and a lone trailing
+  /// backslash is dropped. Done in a single pass so sequences can't be
+  /// double-unescaped (e.g. `\\s` correctly yields `\s`, not a space).
+  static String _unescapeTagValue(String value) {
+    // Fast path: the vast majority of tag values contain no escape sequences.
+    if (!value.contains('\\')) return value;
+
+    final buffer = StringBuffer();
+    for (var i = 0; i < value.length; i++) {
+      if (value[i] != '\\') {
+        buffer.write(value[i]);
+        continue;
+      }
+
+      // A trailing backslash with nothing after it is dropped.
+      if (i + 1 == value.length) break;
+
+      switch (value[i + 1]) {
+        case ':':
+          buffer.write(';');
+          break;
+        case 's':
+          buffer.write(' ');
+          break;
+        case '\\':
+          buffer.write('\\');
+          break;
+        case 'r':
+          buffer.write('\r');
+          break;
+        case 'n':
+          buffer.write('\n');
+          break;
+        default:
+          buffer.write(value[i + 1]);
+      }
+      i++; // Skip the escaped character we just consumed.
+    }
+    return buffer.toString();
+  }
+
+  factory IRCMessage.createNotice({
+    required String message,
+    VoidCallback? actionCallback,
+    String? actionLabel,
+  }) => IRCMessage(
+    raw: '',
+    tags: {
+      'tmi-sent-ts': '${DateTime.now().millisecondsSinceEpoch}',
+    },
+    command: Command.notice,
+    message: message,
+    actionCallback: actionCallback,
+    actionLabel: actionLabel,
+  );
 }
 
 /// The object representation of the IRC ROOMSTATE message.
@@ -857,12 +1277,12 @@ class ROOMSTATE {
 
   /// Create a new copy with the parameters from the provided [IRCMessage]
   ROOMSTATE fromIRCMessage(IRCMessage ircMessage) => ROOMSTATE(
-        emoteOnly: ircMessage.tags['emote-only'] ?? emoteOnly,
-        followersOnly: ircMessage.tags['followers-only'] ?? followersOnly,
-        r9k: ircMessage.tags['r9k'] ?? r9k,
-        slowMode: ircMessage.tags['slow'] ?? slowMode,
-        subMode: ircMessage.tags['subs-only'] ?? subMode,
-      );
+    emoteOnly: ircMessage.tags['emote-only'] ?? emoteOnly,
+    followersOnly: ircMessage.tags['followers-only'] ?? followersOnly,
+    r9k: ircMessage.tags['r9k'] ?? r9k,
+    slowMode: ircMessage.tags['slow'] ?? slowMode,
+    subMode: ircMessage.tags['subs-only'] ?? subMode,
+  );
 }
 
 class USERSTATE {
@@ -881,12 +1301,13 @@ class USERSTATE {
   });
 
   USERSTATE fromIRCMessage(IRCMessage ircMessage) => USERSTATE(
-        raw: ircMessage.raw,
-        color: ircMessage.tags['color'] ?? color,
-        displayName: ircMessage.tags['display-name'] ?? displayName,
-        mod: ircMessage.tags['mod'] == '0' ? false : true,
-        subscriber: ircMessage.tags['subscriber'] == '0' ? false : true,
-      );
+    raw: ircMessage.raw,
+    color: ircMessage.tags['color'] ?? color,
+    displayName: ircMessage.tags['display-name'] ?? displayName,
+    // Missing tags must be false — the old `!= '0'` default treated absence as mod.
+    mod: ircMessage.tags['mod'] == '1',
+    subscriber: ircMessage.tags['subscriber'] == '1',
+  );
 }
 
 /// The possible types of Twitch IRC commands.
diff --git a/lib/models/playback_access_token.dart b/lib/models/playback_access_token.dart
new file mode 100644
index 00000000..8ca16364
--- /dev/null
+++ b/lib/models/playback_access_token.dart
@@ -0,0 +1,65 @@
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+
+class PlaybackAccessToken {
+  final String value;
+  final String signature;
+
+  /// Whether Twitch will suppress ads for this session (Turbo, sub, etc.).
+  /// Defaults to false when the token payload can't be parsed.
+  final bool hideAds;
+
+  /// Quality group names (e.g. "1080p60") that exist for this stream but are
+  /// restricted to subscribers, so they won't appear in the HLS playlist.
+  final List<String> restrictedQualities;
+
+  const PlaybackAccessToken({
+    required this.value,
+    required this.signature,
+    this.hideAds = false,
+    this.restrictedQualities = const [],
+  });
+
+  /// Names in restricted_bitrates that aren't real video qualities
+  /// (matches streamlink's filter).
+  static final _nonQualityNameRe = RegExp(r'^((.+_)?archives|live|chunked)');
+
+  factory PlaybackAccessToken.fromGqlResponse(Map<String, dynamic> json) {
+    final data =
+        (json['data'] as Map<String, dynamic>?)?['streamPlaybackAccessToken']
+            as Map<String, dynamic>?;
+    if (data == null) {
+      throw const FormatException(
+        'streamPlaybackAccessToken missing from GQL response',
+      );
+    }
+
+    final value = data['value'] as String;
+    var hideAds = false;
+    var restricted = const <String>[];
+    try {
+      final payload = jsonDecode(value) as Map<String, dynamic>;
+      hideAds = payload['hide_ads'] as bool? ?? false;
+      final bitrates =
+          (payload['chansub'] as Map<String, dynamic>?)?['restricted_bitrates']
+              as List<dynamic>?;
+      if (bitrates != null) {
+        restricted = bitrates
+            .whereType<String>()
+            .where((name) => !_nonQualityNameRe.hasMatch(name))
+            .toList();
+      }
+    } catch (e) {
+      // Token payload format is Twitch-internal — never fail playback over it.
+      debugPrint('PlaybackAccessToken: failed to parse token payload: $e');
+    }
+
+    return PlaybackAccessToken(
+      value: value,
+      signature: data['signature'] as String,
+      hideAds: hideAds,
+      restrictedQualities: restricted,
+    );
+  }
+}
diff --git a/lib/models/shared_chat_session.dart b/lib/models/shared_chat_session.dart
new file mode 100644
index 00000000..fc5c90b5
--- /dev/null
+++ b/lib/models/shared_chat_session.dart
@@ -0,0 +1,33 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'shared_chat_session.g.dart';
+
+@JsonSerializable(fieldRename: FieldRename.snake, createToJson: false)
+class SharedChatSession {
+  final String sessionId;
+  final String hostBroadcasterId;
+  final List<Participant> participants;
+  final String createdAt;
+  final String updatedAt;
+
+  SharedChatSession({
+    required this.sessionId,
+    required this.hostBroadcasterId,
+    required this.participants,
+    required this.createdAt,
+    required this.updatedAt,
+  });
+
+  factory SharedChatSession.fromJson(Map<String, dynamic> json) =>
+      _$SharedChatSessionFromJson(json);
+}
+
+@JsonSerializable(fieldRename: FieldRename.snake, createToJson: false)
+class Participant {
+  final String broadcasterId;
+
+  Participant({required this.broadcasterId});
+
+  factory Participant.fromJson(Map<String, dynamic> json) =>
+      _$ParticipantFromJson(json);
+}
diff --git a/lib/models/shared_chat_session.g.dart b/lib/models/shared_chat_session.g.dart
new file mode 100644
index 00000000..8148c377
--- /dev/null
+++ b/lib/models/shared_chat_session.g.dart
@@ -0,0 +1,21 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'shared_chat_session.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+SharedChatSession _$SharedChatSessionFromJson(Map<String, dynamic> json) =>
+    SharedChatSession(
+      sessionId: json['session_id'] as String,
+      hostBroadcasterId: json['host_broadcaster_id'] as String,
+      participants: (json['participants'] as List<dynamic>)
+          .map((e) => Participant.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      createdAt: json['created_at'] as String,
+      updatedAt: json['updated_at'] as String,
+    );
+
+Participant _$ParticipantFromJson(Map<String, dynamic> json) =>
+    Participant(broadcasterId: json['broadcaster_id'] as String);
diff --git a/lib/models/stream.dart b/lib/models/stream.dart
index 05edf653..34a35c60 100644
--- a/lib/models/stream.dart
+++ b/lib/models/stream.dart
@@ -15,6 +15,14 @@ class StreamTwitch {
   final String startedAt;
   final String thumbnailUrl;
 
+  /// ISO 639-1 broadcast language from Helix (`de`, `en`, …). Empty when unknown.
+  @JsonKey(defaultValue: '')
+  final String language;
+
+  /// Freeform tags from Helix (e.g. `Deutsch`, `English`).
+  @JsonKey(defaultValue: <String>[])
+  final List<String> tags;
+
   const StreamTwitch(
     this.userId,
     this.userLogin,
@@ -24,8 +32,10 @@ class StreamTwitch {
     this.title,
     this.viewerCount,
     this.startedAt,
-    this.thumbnailUrl,
-  );
+    this.thumbnailUrl, [
+    this.language = '',
+    this.tags = const [],
+  ]);
 
   factory StreamTwitch.fromJson(Map<String, dynamic> json) =>
       _$StreamTwitchFromJson(json);
@@ -36,11 +46,22 @@ class StreamsTwitch {
   final List<StreamTwitch> data;
   final Map<String, String> pagination;
 
-  const StreamsTwitch(
-    this.data,
-    this.pagination,
-  );
+  const StreamsTwitch(this.data, this.pagination);
 
-  factory StreamsTwitch.fromJson(Map<String, dynamic> json) =>
-      _$StreamsTwitchFromJson(json);
+  factory StreamsTwitch.fromJson(Map<String, dynamic> json) {
+    final rawPagination = json['pagination'];
+    final pagination = <String, String>{};
+    if (rawPagination is Map) {
+      final cursor = rawPagination['cursor'];
+      if (cursor is String && cursor.isNotEmpty) {
+        pagination['cursor'] = cursor;
+      }
+    }
+    return StreamsTwitch(
+      (json['data'] as List<dynamic>)
+          .map((e) => StreamTwitch.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      pagination,
+    );
+  }
 }
diff --git a/lib/models/stream.g.dart b/lib/models/stream.g.dart
index 9c2ae65e..95f9bff3 100644
--- a/lib/models/stream.g.dart
+++ b/lib/models/stream.g.dart
@@ -7,16 +7,18 @@ part of 'stream.dart';
 // **************************************************************************
 
 StreamTwitch _$StreamTwitchFromJson(Map<String, dynamic> json) => StreamTwitch(
-      json['user_id'] as String,
-      json['user_login'] as String,
-      json['user_name'] as String,
-      json['game_id'] as String,
-      json['game_name'] as String,
-      json['title'] as String,
-      json['viewer_count'] as int,
-      json['started_at'] as String,
-      json['thumbnail_url'] as String,
-    );
+  json['user_id'] as String,
+  json['user_login'] as String,
+  json['user_name'] as String,
+  json['game_id'] as String,
+  json['game_name'] as String,
+  json['title'] as String,
+  (json['viewer_count'] as num).toInt(),
+  json['started_at'] as String,
+  json['thumbnail_url'] as String,
+  json['language'] as String? ?? '',
+  (json['tags'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
+);
 
 StreamsTwitch _$StreamsTwitchFromJson(Map<String, dynamic> json) =>
     StreamsTwitch(
diff --git a/lib/models/stream_languages.dart b/lib/models/stream_languages.dart
new file mode 100644
index 00000000..455ccc60
--- /dev/null
+++ b/lib/models/stream_languages.dart
@@ -0,0 +1,50 @@
+/// ISO 639-1 codes offered in Settings for stream language filtering.
+///
+/// Stored lowercase (Helix). GQL `Language` enums are the uppercase form.
+class StreamLanguages {
+  StreamLanguages._();
+
+  static const all = <({String code, String label})>[
+    (code: 'de', label: 'Deutsch'),
+    (code: 'en', label: 'English'),
+    (code: 'es', label: 'Español'),
+    (code: 'fr', label: 'Français'),
+    (code: 'it', label: 'Italiano'),
+    (code: 'pt', label: 'Português'),
+    (code: 'pl', label: 'Polski'),
+    (code: 'ru', label: 'Русский'),
+    (code: 'tr', label: 'Türkçe'),
+    (code: 'nl', label: 'Nederlands'),
+    (code: 'sv', label: 'Svenska'),
+    (code: 'no', label: 'Norsk'),
+    (code: 'da', label: 'Dansk'),
+    (code: 'fi', label: 'Suomi'),
+    (code: 'cs', label: 'Čeština'),
+    (code: 'hu', label: 'Magyar'),
+    (code: 'ro', label: 'Română'),
+    (code: 'uk', label: 'Українська'),
+    (code: 'ja', label: '日本語'),
+    (code: 'ko', label: '한국어'),
+    (code: 'zh', label: '中文'),
+    (code: 'ar', label: 'العربية'),
+    (code: 'th', label: 'ไทย'),
+    (code: 'vi', label: 'Tiếng Việt'),
+    (code: 'id', label: 'Bahasa Indonesia'),
+    (code: 'hi', label: 'हिन्दी'),
+    (code: 'other', label: 'Other'),
+  ];
+
+  static String labelFor(String code) {
+    for (final entry in all) {
+      if (entry.code == code) return entry.label;
+    }
+    return code;
+  }
+
+  /// Helix / settings codes → GQL `Language` enum values.
+  static List<String> toGqlEnums(Iterable<String> codes) => codes
+      .map((c) => c.trim().toLowerCase())
+      .where((c) => c.isNotEmpty)
+      .map((c) => c.toUpperCase())
+      .toList();
+}
diff --git a/lib/models/user.dart b/lib/models/user.dart
index 59030217..d97e0fb7 100644
--- a/lib/models/user.dart
+++ b/lib/models/user.dart
@@ -10,12 +10,7 @@ class UserTwitch {
   final String displayName;
   final String profileImageUrl;
 
-  const UserTwitch(
-    this.id,
-    this.login,
-    this.displayName,
-    this.profileImageUrl,
-  );
+  const UserTwitch(this.id, this.login, this.displayName, this.profileImageUrl);
 
   factory UserTwitch.fromJson(Map<String, dynamic> json) =>
       _$UserTwitchFromJson(json);
@@ -27,11 +22,7 @@ class UserBlockedTwitch {
   final String userLogin;
   final String displayName;
 
-  const UserBlockedTwitch(
-    this.userId,
-    this.userLogin,
-    this.displayName,
-  );
+  const UserBlockedTwitch(this.userId, this.userLogin, this.displayName);
 
   factory UserBlockedTwitch.fromJson(Map<String, dynamic> json) =>
       _$UserBlockedTwitchFromJson(json);
diff --git a/lib/models/user.g.dart b/lib/models/user.g.dart
index ffeae6d0..e46b0b83 100644
--- a/lib/models/user.g.dart
+++ b/lib/models/user.g.dart
@@ -7,11 +7,11 @@ part of 'user.dart';
 // **************************************************************************
 
 UserTwitch _$UserTwitchFromJson(Map<String, dynamic> json) => UserTwitch(
-      json['id'] as String,
-      json['login'] as String,
-      json['display_name'] as String,
-      json['profile_image_url'] as String,
-    );
+  json['id'] as String,
+  json['login'] as String,
+  json['display_name'] as String,
+  json['profile_image_url'] as String,
+);
 
 UserBlockedTwitch _$UserBlockedTwitchFromJson(Map<String, dynamic> json) =>
     UserBlockedTwitch(
diff --git a/lib/screens/channel/channel.dart b/lib/screens/channel/channel.dart
index 335d643f..1013812b 100644
--- a/lib/screens/channel/channel.dart
+++ b/lib/screens/channel/channel.dart
@@ -1,347 +1,822 @@
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:frosty/apis/bttv_api.dart';
-import 'package:frosty/apis/ffz_api.dart';
-import 'package:frosty/apis/seventv_api.dart';
-import 'package:frosty/apis/twitch_api.dart';
-import 'package:frosty/constants.dart';
-import 'package:frosty/main.dart';
-import 'package:frosty/screens/channel/chat/chat.dart';
-import 'package:frosty/screens/channel/chat/details/chat_details_store.dart';
-import 'package:frosty/screens/channel/chat/stores/chat_assets_store.dart';
-import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
-import 'package:frosty/screens/channel/video/video.dart';
-import 'package:frosty/screens/channel/video/video_bar.dart';
-import 'package:frosty/screens/channel/video/video_overlay.dart';
-import 'package:frosty/screens/channel/video/video_store.dart';
-import 'package:frosty/screens/settings/stores/auth_store.dart';
-import 'package:frosty/screens/settings/stores/settings_store.dart';
-import 'package:frosty/widgets/app_bar.dart';
-import 'package:frosty/widgets/notification.dart';
-import 'package:provider/provider.dart';
-import 'package:simple_pip_mode/actions/pip_actions_layout.dart';
-import 'package:simple_pip_mode/pip_widget.dart';
-
-/// Creates a widget that shows the video stream (if live) and chat of the given user.
-class VideoChat extends StatefulWidget {
-  final String userId;
-  final String userName;
-  final String userLogin;
-
-  const VideoChat({
-    Key? key,
-    required this.userId,
-    required this.userName,
-    required this.userLogin,
-  }) : super(key: key);
-
-  @override
-  State<VideoChat> createState() => _VideoChatState();
-}
-
-class _VideoChatState extends State<VideoChat> {
-  final _videoKey = GlobalKey();
-  final _chatKey = GlobalKey();
-
-  late final ChatStore _chatStore = ChatStore(
-    channelName: widget.userLogin,
-    channelId: widget.userId,
-    displayName: widget.userName,
-    auth: context.read<AuthStore>(),
-    settings: context.read<SettingsStore>(),
-    chatDetailsStore: ChatDetailsStore(
-      twitchApi: context.read<TwitchApi>(),
-      channelName: widget.userLogin,
-    ),
-    assetsStore: ChatAssetsStore(
-      twitchApi: context.read<TwitchApi>(),
-      ffzApi: context.read<FFZApi>(),
-      bttvApi: context.read<BTTVApi>(),
-      sevenTVApi: context.read<SevenTVApi>(),
-    ),
-  );
-
-  late final VideoStore _videoStore = VideoStore(
-    userLogin: widget.userLogin,
-    twitchApi: context.read<TwitchApi>(),
-    authStore: context.read<AuthStore>(),
-    settingsStore: context.read<SettingsStore>(),
-  );
-
-  @override
-  Widget build(BuildContext context) {
-    final orientation = MediaQuery.of(context).orientation;
-
-    final settingsStore = _chatStore.settings;
-
-    final appBar = FrostyAppBar(
-      title: Text(
-        regexEnglish.hasMatch(_chatStore.displayName)
-            ? _chatStore.displayName
-            : '${_chatStore.displayName} (${_chatStore.channelName})',
-      ),
-    );
-
-    final player = GestureDetector(
-      onLongPress: _videoStore.handleToggleOverlay,
-      child: Video(
-        key: _videoKey,
-        videoStore: _videoStore,
-      ),
-    );
-
-    final overlay = GestureDetector(
-      onLongPress: _videoStore.handleToggleOverlay,
-      onDoubleTap: orientation == Orientation.landscape
-          ? () => settingsStore.fullScreen = !settingsStore.fullScreen
-          : null,
-      onTap: () {
-        if (_chatStore.assetsStore.showEmoteMenu) {
-          _chatStore.assetsStore.showEmoteMenu = false;
-        } else {
-          if (_chatStore.textFieldFocusNode.hasFocus) {
-            _chatStore.textFieldFocusNode.unfocus();
-          } else {
-            _videoStore.handleVideoTap();
-          }
-        }
-      },
-      child: Observer(
-        builder: (_) {
-          final videoOverlay = VideoOverlay(
-            videoStore: _videoStore,
-            chatStore: _chatStore,
-          );
-
-          if (_videoStore.paused || _videoStore.streamInfo == null) {
-            return videoOverlay;
-          }
-
-          return AnimatedOpacity(
-            opacity: _videoStore.overlayVisible ? 1.0 : 0.0,
-            curve: Curves.ease,
-            duration: const Duration(milliseconds: 200),
-            child: Container(
-              decoration: BoxDecoration(
-                color: Colors.black.withOpacity(settingsStore.overlayOpacity),
-              ),
-              child: IgnorePointer(
-                ignoring: !_videoStore.overlayVisible,
-                child: videoOverlay,
-              ),
-            ),
-          );
-        },
-      ),
-    );
-
-    final video = Observer(
-      builder: (context) {
-        if (!_videoStore.settingsStore.showOverlay) return player;
-
-        return Stack(
-          children: [
-            player,
-            overlay,
-          ],
-        );
-      },
-    );
-
-    final chat = Observer(
-      builder: (context) {
-        final videoBarVisible = _videoStore.streamInfo != null &&
-            _chatStore.settings.showVideo &&
-            (_videoStore.paused || _videoStore.overlayVisible);
-
-        return Stack(
-          children: [
-            Chat(
-              key: _chatKey,
-              chatStore: _chatStore,
-            ),
-            if (orientation == Orientation.portrait)
-              AnimatedOpacity(
-                opacity: videoBarVisible ? 1 : 0,
-                curve: Curves.ease,
-                duration: const Duration(milliseconds: 200),
-                child: IgnorePointer(
-                  ignoring: !videoBarVisible,
-                  child: ColoredBox(
-                    color: Theme.of(context).canvasColor,
-                    child: Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        if (_videoStore.streamInfo != null)
-                          VideoBar(
-                            streamInfo: _videoStore.streamInfo!,
-                            tappableCategory: false,
-                          ),
-                        const Divider(height: 1, thickness: 1),
-                      ],
-                    ),
-                  ),
-                ),
-              ),
-            AnimatedSwitcher(
-              duration: const Duration(milliseconds: 200),
-              switchInCurve: Curves.easeOut,
-              switchOutCurve: Curves.easeIn,
-              child: _chatStore.notification != null
-                  ? Align(
-                      alignment: _chatStore.settings.chatNotificationsOnBottom
-                          ? Alignment.bottomCenter
-                          : Alignment.topCenter,
-                      child: FrostyNotification(
-                        message: _chatStore.notification!,
-                        showPasteButton:
-                            _chatStore.notification!.contains('copied'),
-                        onButtonPressed: () async {
-                          // Paste clipboard text into the text controller.
-                          final data =
-                              await Clipboard.getData(Clipboard.kTextPlain);
-
-                          if (data != null) {
-                            _chatStore.textController.text = data.text!;
-                          }
-
-                          _chatStore.updateNotification('');
-                        },
-                      ),
-                    )
-                  : null,
-            ),
-          ],
-        );
-      },
-    );
-
-    final videoChat = Scaffold(
-      body: Observer(
-        builder: (context) {
-          if (orientation == Orientation.landscape &&
-              !settingsStore.landscapeForceVerticalChat) {
-            SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
-
-            final landscapeChat = AnimatedContainer(
-              curve: Curves.ease,
-              duration: const Duration(milliseconds: 200),
-              width: _chatStore.expandChat
-                  ? MediaQuery.of(context).size.width / 2
-                  : MediaQuery.of(context).size.width *
-                      _chatStore.settings.chatWidth,
-              color: _chatStore.settings.fullScreen
-                  ? Colors.black.withOpacity(
-                      _chatStore.settings.fullScreenChatOverlayOpacity)
-                  : Theme.of(context).scaffoldBackgroundColor,
-              child: chat,
-            );
-
-            final overlayChat = Visibility(
-              visible: settingsStore.fullScreenChatOverlay,
-              maintainState: true,
-              child: Theme(
-                data: darkTheme,
-                child: DefaultTextStyle(
-                  style: DefaultTextStyle.of(context)
-                      .style
-                      .copyWith(color: Colors.white),
-                  child: landscapeChat,
-                ),
-              ),
-            );
-
-            return ColoredBox(
-              color: settingsStore.showVideo
-                  ? Colors.black
-                  : Theme.of(context).scaffoldBackgroundColor,
-              child: SafeArea(
-                bottom: false,
-                left: (settingsStore.landscapeCutout ==
-                            LandscapeCutoutType.both ||
-                        settingsStore.landscapeCutout ==
-                            LandscapeCutoutType.left)
-                    ? false
-                    : true,
-                right: (settingsStore.landscapeCutout ==
-                            LandscapeCutoutType.both ||
-                        settingsStore.landscapeCutout ==
-                            LandscapeCutoutType.right)
-                    ? false
-                    : true,
-                child: settingsStore.showVideo
-                    ? settingsStore.fullScreen
-                        ? Stack(
-                            children: [
-                              player,
-                              if (settingsStore.showOverlay)
-                                Row(
-                                  children: settingsStore.landscapeChatLeftSide
-                                      ? [overlayChat, Expanded(child: overlay)]
-                                      : [Expanded(child: overlay), overlayChat],
-                                )
-                            ],
-                          )
-                        : Row(
-                            children: settingsStore.landscapeChatLeftSide
-                                ? [landscapeChat, Expanded(child: video)]
-                                : [Expanded(child: video), landscapeChat],
-                          )
-                    : Column(
-                        children: [appBar, Expanded(child: chat)],
-                      ),
-              ),
-            );
-          }
-
-          SystemChrome.setEnabledSystemUIMode(
-            SystemUiMode.manual,
-            overlays: SystemUiOverlay.values,
-          );
-          return SafeArea(
-            child: Column(
-              children: [
-                if (!settingsStore.showVideo)
-                  appBar
-                else
-                  AspectRatio(aspectRatio: 16 / 9, child: video),
-                Expanded(child: chat),
-              ],
-            ),
-          );
-        },
-      ),
-    );
-
-    // If on Android, use PiPSwitcher to enable PiP functionality.
-    if (Platform.isAndroid) {
-      return PipWidget(
-        pipLayout: PipActionsLayout.media_only_pause,
-        onPipAction: (_) => _videoStore.handlePausePlay(),
-        pipChild: player,
-        child: videoChat,
-      );
-    }
-
-    return videoChat;
-  }
-
-  @override
-  void dispose() {
-    _chatStore.dispose();
-
-    _videoStore.dispose();
-
-    SystemChrome.setEnabledSystemUIMode(
-      SystemUiMode.manual,
-      overlays: SystemUiOverlay.values,
-    );
-
-    SystemChrome.setPreferredOrientations([]);
-
-    super.dispose();
-  }
-}
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_tabs_store.dart';
+import 'package:frosty/screens/channel/chat/widgets/chat_tabs.dart';
+import 'package:frosty/screens/channel/video/channel_info_header.dart';
+import 'package:frosty/screens/channel/video/native_video.dart';
+import 'package:frosty/screens/channel/video/native_video_store.dart';
+import 'package:frosty/screens/channel/video/stream_info_bar.dart';
+import 'package:frosty/screens/channel/video/video.dart';
+import 'package:frosty/screens/channel/video/video_overlay.dart';
+import 'package:frosty/screens/channel/video/video_player_interface.dart';
+import 'package:frosty/screens/channel/video/video_store.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/theme.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/draggable_divider.dart';
+import 'package:frosty/widgets/frosty_notification.dart';
+import 'package:simple_pip_mode/actions/pip_actions_layout.dart';
+import 'package:simple_pip_mode/pip_widget.dart';
+
+/// Creates a widget that shows the video stream (if live) and chat of the given user.
+class VideoChat extends StatefulWidget {
+  static const routeName = 'VideoChat';
+
+  final String userId;
+  final String userName;
+  final String userLogin;
+
+  const VideoChat({
+    super.key,
+    required this.userId,
+    required this.userName,
+    required this.userLogin,
+  });
+
+  @override
+  State<VideoChat> createState() => _VideoChatState();
+}
+
+class _VideoChatState extends State<VideoChat>
+    with SingleTickerProviderStateMixin, WidgetsBindingObserver {
+  final _videoKey = GlobalKey();
+  final _chatKey = GlobalKey();
+
+  // PiP drag state — ValueNotifier avoids full widget rebuilds during drag.
+  final _pipDragDistance = ValueNotifier<double>(0);
+  bool _isPipDragging = false;
+  bool _isInPipTriggerZone = false;
+
+  // Divider drag state for synchronizing animation
+  bool _isDividerDragging = false;
+
+  // Essential constants for good UX balance
+  static const double _pipTriggerDistance = 80;
+  static const double _pipMaxDragDistance = 150;
+
+  // Animation controller for smooth spring-back
+  late AnimationController _animationController;
+  late Animation<double> _springBackAnimation;
+
+  bool? _isImmersiveSystemUiEnabled;
+
+  late final ChatTabsStore _chatTabsStore = ChatTabsStore(
+    twitchApi: context.twitchApi,
+    bttvApi: context.bttvApi,
+    ffzApi: context.ffzApi,
+    sevenTVApi: context.sevenTVApi,
+    authStore: context.authStore,
+    settingsStore: context.settingsStore,
+    globalAssetsStore: context.globalAssetsStore,
+    primaryChannelId: widget.userId,
+    primaryChannelLogin: widget.userLogin,
+    primaryDisplayName: widget.userName,
+  );
+
+  late final VideoPlayerInterface _videoStore =
+      context.settingsStore.useNativePlayer
+          ? NativeVideoStore(
+              userLogin: widget.userLogin,
+              userId: widget.userId,
+              displayName: widget.userName,
+              twitchApi: context.twitchApi,
+              twitchGqlApi: context.twitchGqlApi,
+              authStore: context.authStore,
+              settingsStore: context.settingsStore,
+            )
+          : VideoStore(
+              userLogin: widget.userLogin,
+              userId: widget.userId,
+              twitchApi: context.twitchApi,
+              authStore: context.authStore,
+              settingsStore: context.settingsStore,
+            );
+
+  @override
+  void initState() {
+    super.initState();
+
+    // Initialize animation controller for smooth drag interactions
+    _animationController = AnimationController(
+      duration: const Duration(milliseconds: 250),
+      vsync: this,
+    );
+
+    // Spring-back animation with smooth easing
+    _springBackAnimation = Tween<double>(begin: 0, end: 0).animate(
+      CurvedAnimation(parent: _animationController, curve: Curves.easeOut),
+    );
+
+    // Drive the ValueNotifier from the spring-back animation so the
+    // AnimatedBuilder rebuilds without a full setState.
+    _animationController.addListener(() {
+      _pipDragDistance.value = _springBackAnimation.value;
+    });
+
+    // Register as observer for app lifecycle events
+    WidgetsBinding.instance.addObserver(this);
+  }
+
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+
+    if (state == AppLifecycleState.resumed) {
+      _videoStore.handleAppResume();
+    }
+  }
+
+  void _handlePipDragStart(DragStartDetails details) {
+    if (_videoStore.isInPipMode || _videoStore.paused || _videoStore.loading) {
+      return;
+    }
+
+    _animationController.stop();
+    _pipDragDistance.value = 0;
+    _isInPipTriggerZone = false;
+    setState(() {
+      _isPipDragging = true;
+    });
+  }
+
+  void _handlePipDragUpdate(DragUpdateDetails details) {
+    if (!_isPipDragging ||
+        _videoStore.isInPipMode ||
+        _videoStore.paused ||
+        _videoStore.loading) {
+      return;
+    }
+
+    // Update the ValueNotifier directly — only the ListenableBuilder rebuilds,
+    // not the entire channel scaffold.
+    _pipDragDistance.value =
+        (_pipDragDistance.value + details.delta.dy).clamp(0, _pipMaxDragDistance);
+
+    final wasInTriggerZone = _isInPipTriggerZone;
+    _isInPipTriggerZone = _pipDragDistance.value >= _pipTriggerDistance;
+
+    if (!wasInTriggerZone && _isInPipTriggerZone) {
+      HapticFeedback.mediumImpact();
+    } else if (wasInTriggerZone && !_isInPipTriggerZone) {
+      HapticFeedback.lightImpact();
+    }
+  }
+
+  void _handlePipDragEnd(DragEndDetails details) {
+    if (!_isPipDragging ||
+        _videoStore.isInPipMode ||
+        _videoStore.paused ||
+        _videoStore.loading) {
+      return;
+    }
+
+    final velocity = details.velocity.pixelsPerSecond.dy;
+    final shouldTriggerPip =
+        _pipDragDistance.value >= _pipTriggerDistance || velocity > 600;
+
+    if (shouldTriggerPip) {
+      HapticFeedback.mediumImpact();
+      _videoStore.requestPictureInPicture();
+      _resetDragState();
+    } else {
+      _animateSpringBack();
+    }
+  }
+
+  void _handlePipDragCancel() {
+    if (!_isPipDragging) return;
+    _animateSpringBack();
+  }
+
+  void _resetDragState() {
+    _pipDragDistance.value = 0;
+    _isInPipTriggerZone = false;
+    setState(() {
+      _isPipDragging = false;
+    });
+  }
+
+  void _animateSpringBack() {
+    _springBackAnimation =
+        Tween<double>(begin: _pipDragDistance.value, end: 0).animate(
+          CurvedAnimation(parent: _animationController, curve: Curves.easeOut),
+        );
+
+    _animationController.reset();
+    _animationController.forward().then((_) {
+      _resetDragState();
+    });
+  }
+
+  void _scheduleSystemUiModeSync({required bool immersive}) {
+    if (_isImmersiveSystemUiEnabled == immersive) return;
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted || _isImmersiveSystemUiEnabled == immersive) return;
+
+      _isImmersiveSystemUiEnabled = immersive;
+
+      if (immersive) {
+        SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+      } else {
+        SystemChrome.setEnabledSystemUIMode(
+          SystemUiMode.manual,
+          overlays: SystemUiOverlay.values,
+        );
+      }
+    });
+  }
+
+  /// Wraps a video widget with PiP swipe-down gesture handling.
+  ///
+  /// Provides visual feedback (translate + scale), haptic feedback,
+  /// and an instructional overlay during the drag gesture.
+  Widget _buildPipGestureWrapper({required Widget child, double? aspectRatio}) {
+    final wrappedChild = aspectRatio != null
+        ? AspectRatio(aspectRatio: aspectRatio, child: child)
+        : child;
+
+    // Listen to the ValueNotifier (drag) and AnimationController (spring-back)
+    // so only this subtree rebuilds during the gesture — not the full scaffold.
+    return ListenableBuilder(
+      listenable: _pipDragDistance,
+      child: wrappedChild,
+      builder: (context, animatedChild) {
+        final currentDragDistance = _pipDragDistance.value;
+
+        final scaleFactor =
+            1.0 - (currentDragDistance / _pipMaxDragDistance * 0.1);
+
+        return Transform.translate(
+          offset: Offset(0, currentDragDistance),
+          child: Transform.scale(
+            scale: scaleFactor.clamp(0.9, 1.0),
+            child: Stack(
+              children: [
+                GestureDetector(
+                  onPanStart: _handlePipDragStart,
+                  onPanUpdate: _handlePipDragUpdate,
+                  onPanEnd: _handlePipDragEnd,
+                  onPanCancel: _handlePipDragCancel,
+                  child: animatedChild,
+                ),
+                if (!_videoStore.isInPipMode)
+                  Positioned.fill(
+                    child: IgnorePointer(
+                      ignoring:
+                          !(_isPipDragging && currentDragDistance > 0),
+                      child: AnimatedOpacity(
+                        opacity:
+                            (_isPipDragging && currentDragDistance > 0)
+                                ? 1.0
+                                : 0.0,
+                        duration: const Duration(milliseconds: 150),
+                        curve: Curves.easeOut,
+                        child: Container(
+                          color: Colors.black.withValues(alpha: 0.4),
+                          child: const Center(
+                            child: Text(
+                              'Swipe down to enter picture-in-picture',
+                              textAlign: TextAlign.center,
+                              style: TextStyle(
+                                color: Colors.white,
+                                fontSize: 16,
+                                fontWeight: FontWeight.w500,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        );
+      },
+    );
+  }
+
+  /// Convenience getter for the currently active chat store.
+  ChatStore get _chatStore => _chatTabsStore.activeChatStore;
+
+  @override
+  Widget build(BuildContext context) {
+    final settingsStore = _chatTabsStore.settingsStore;
+
+    final player = GestureDetector(
+      onLongPress: _videoStore.handleToggleOverlay,
+      child: _videoStore is NativeVideoStore
+          ? NativeVideo(
+              // GlobalKey so the native platform view is *reparented* (not
+              // rebuilt) across the portrait↔landscape layout swap — without
+              // it, rotating destroys and recreates the player, forcing a
+              // reload. Mirrors the WebView Video below.
+              key: _videoKey,
+              nativeVideoStore: _videoStore,
+            )
+          : Video(
+              key: _videoKey,
+              videoStore: _videoStore as VideoStore,
+            ),
+    );
+
+    final overlay = GestureDetector(
+      onLongPress: _videoStore.handleToggleOverlay,
+      onDoubleTap: context.isLandscape
+          ? () => settingsStore.fullScreen = !settingsStore.fullScreen
+          : null,
+      onTap: () {
+        if (_chatStore.assetsStore.showEmoteMenu) {
+          _chatStore.assetsStore.showEmoteMenu = false;
+        } else {
+          if (_chatStore.textFieldFocusNode.hasFocus) {
+            _chatStore.unfocusInput();
+          } else {
+            _videoStore.handleVideoTap();
+          }
+        }
+      },
+      child: Observer(
+        builder: (_) {
+          final videoOverlay = VideoOverlay(
+            videoStore: _videoStore,
+            chatStore: _chatStore,
+            settingsStore: settingsStore,
+          );
+
+          if (_videoStore.paused ||
+              _videoStore.streamInfo == null ||
+              _videoStore.loading) {
+            return videoOverlay;
+          }
+
+          return AnimatedOpacity(
+            opacity: _videoStore.overlayVisible ? 1.0 : 0.0,
+            curve: Curves.ease,
+            duration: const Duration(milliseconds: 200),
+            child: ColoredBox(
+              color: Colors.transparent,
+              child: IgnorePointer(
+                ignoring: !_videoStore.overlayVisible,
+                child: videoOverlay,
+              ),
+            ),
+          );
+        },
+      ),
+    );
+
+    final video = Stack(
+      children: [
+        player,
+        Positioned.fill(
+          child: Observer(
+            builder: (_) => AnimatedOpacity(
+              opacity: _videoStore.loading ? 1.0 : 0.0,
+              // Appear instantly to cover native player placeholders during
+              // recovery; fade out smoothly when playback resumes.
+              duration: _videoStore.loading
+                  ? Duration.zero
+                  : const Duration(milliseconds: 300),
+              curve: Curves.easeOut,
+              // TickerMode stops the spinner's repeating animation while
+              // hidden — opacity 0 skips painting but would otherwise keep
+              // scheduling frames for the whole video session.
+              child: IgnorePointer(
+                child: TickerMode(
+                  enabled: _videoStore.loading,
+                  child: const ColoredBox(
+                    color: Colors.black,
+                    child: Center(
+                      child: SizedBox(
+                        width: 24,
+                        height: 24,
+                        child: CircularProgressIndicator(
+                          color: Colors.white38,
+                          strokeWidth: 2,
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+        Observer(
+          builder: (_) => _videoStore.settingsStore.showOverlay
+              ? overlay
+              : const SizedBox.shrink(),
+        ),
+      ],
+    );
+
+    final chat = Observer(
+      builder: (context) {
+        final bool chatOnly = !settingsStore.showVideo;
+
+        return Stack(
+          children: [
+            ChatTabs(
+              key: _chatKey,
+              chatTabsStore: _chatTabsStore,
+              // In chat-only mode, account for the blurred AppBar height
+              listPadding: chatOnly
+                  ? EdgeInsets.only(top: context.safePaddingTop)
+                  : null,
+            ),
+            Observer(
+              builder: (_) => AnimatedSwitcher(
+                duration: const Duration(milliseconds: 200),
+                switchInCurve: Curves.easeOut,
+                switchOutCurve: Curves.easeIn,
+                child: _chatStore.notification != null
+                    ? Align(
+                        alignment: Alignment.topCenter,
+                        child: Padding(
+                          padding: EdgeInsets.only(
+                            top: chatOnly ? context.safePaddingTop : 0,
+                          ),
+                          child: FrostyNotification(
+                            message: _chatStore.notification!,
+                            onDismissed: _chatStore.clearNotification,
+                          ),
+                        ),
+                      )
+                    : null,
+              ),
+            ),
+          ],
+        );
+      },
+    );
+
+    final videoChat = Observer(
+      builder: (context) {
+        _scheduleSystemUiModeSync(
+          immersive:
+              context.isLandscape && !settingsStore.landscapeForceVerticalChat,
+        );
+
+        // Build a blurred AppBar when in chat-only mode (no video)
+        PreferredSizeWidget? chatOnlyBlurredAppBar;
+        if (!settingsStore.showVideo) {
+          final streamInfo = _videoStore.streamInfo;
+
+          chatOnlyBlurredAppBar = AppBar(
+            centerTitle: false,
+            elevation: 0,
+            backgroundColor: Colors.transparent,
+            surfaceTintColor: Colors.transparent,
+            systemOverlayStyle: SystemUiOverlayStyle(
+              statusBarColor: Colors.transparent,
+              statusBarIconBrightness:
+                  context.theme.brightness == Brightness.dark
+                  ? Brightness.light
+                  : Brightness.dark,
+            ),
+            title: StreamInfoBar(
+              streamInfo: streamInfo,
+              offlineChannelInfo: _videoStore.offlineChannelInfo,
+              displayName: _chatStore.displayName,
+              isCompact: true,
+              isOffline: streamInfo == null,
+              isInSharedChatMode: _chatStore.isInSharedChatMode,
+              showTextShadows: false,
+            ),
+            flexibleSpace: BlurredContainer(
+              gradientDirection: GradientDirection.up,
+              child: const SizedBox.expand(),
+            ),
+          );
+        }
+
+        return Scaffold(
+          extendBody: true,
+          extendBodyBehindAppBar: true,
+          appBar: chatOnlyBlurredAppBar,
+          body: Observer(
+            builder: (context) {
+              if (context.isLandscape &&
+                  !settingsStore.landscapeForceVerticalChat) {
+                final landscapeChat = AnimatedContainer(
+                  curve: Curves.ease,
+                  duration: _isDividerDragging
+                      ? Duration.zero
+                      : const Duration(milliseconds: 200),
+                  width: _chatStore.expandChat
+                      ? context.screenWidth / 2
+                      : context.screenWidth * settingsStore.chatWidth,
+                  color: settingsStore.fullScreen
+                      ? Colors.black.withValues(
+                          alpha: settingsStore.fullScreenChatOverlayOpacity,
+                        )
+                      : context.scaffoldColor,
+                  child: chat,
+                );
+
+                final overlayChat = Visibility(
+                  visible: settingsStore.fullScreenChatOverlay,
+                  maintainState: true,
+                  child: Theme(
+                    data: FrostyThemes(
+                      colorSchemeSeed: Color(settingsStore.accentColor),
+                    ).dark,
+                    child: DefaultTextStyle(
+                      style: context.defaultTextStyle.copyWith(
+                        color: context.frostyColors.overlayOnSurface,
+                      ),
+                      child: landscapeChat,
+                    ),
+                  ),
+                );
+
+                return ColoredBox(
+                  color: settingsStore.showVideo
+                      ? Colors.black
+                      : context.scaffoldColor,
+                  child: settingsStore.showVideo
+                      ? settingsStore.fullScreen
+                            ? Stack(
+                                children: [
+                                  _buildPipGestureWrapper(child: player),
+                                  if (settingsStore.showOverlay)
+                                    LayoutBuilder(
+                                      builder: (context, constraints) {
+                                        final totalWidth = constraints.maxWidth;
+                                        final chatWidth = _chatStore.expandChat
+                                            ? 0.5
+                                            : settingsStore.chatWidth;
+
+                                        final draggableDivider = Observer(
+                                          builder: (_) => DraggableDivider(
+                                            currentWidth: chatWidth,
+                                            maxWidth: 0.6,
+                                            isResizableOnLeft: settingsStore
+                                                .landscapeChatLeftSide,
+                                            showHandle:
+                                                _videoStore.overlayVisible &&
+                                                settingsStore
+                                                    .fullScreenChatOverlay,
+                                            onDragStart: () {
+                                              setState(() {
+                                                _isDividerDragging = true;
+                                              });
+                                            },
+                                            onDrag: (newWidth) {
+                                              if (!_chatStore.expandChat) {
+                                                settingsStore.chatWidth =
+                                                    newWidth;
+                                              }
+                                            },
+                                            onDragEnd: () {
+                                              setState(() {
+                                                _isDividerDragging = false;
+                                              });
+                                            },
+                                          ),
+                                        );
+
+                                        return Stack(
+                                          children: [
+                                            Row(
+                                              children:
+                                                  settingsStore
+                                                      .landscapeChatLeftSide
+                                                  ? [
+                                                      overlayChat,
+                                                      Expanded(child: overlay),
+                                                    ]
+                                                  : [
+                                                      Expanded(child: overlay),
+                                                      overlayChat,
+                                                    ],
+                                            ),
+                                            if (settingsStore
+                                                .fullScreenChatOverlay)
+                                              Positioned(
+                                                top: 0,
+                                                bottom: 0,
+                                                left:
+                                                    settingsStore
+                                                        .landscapeChatLeftSide
+                                                    ? (totalWidth * chatWidth) -
+                                                          12
+                                                    : null,
+                                                right:
+                                                    !settingsStore
+                                                        .landscapeChatLeftSide
+                                                    ? (totalWidth * chatWidth) -
+                                                          12
+                                                    : null,
+                                                child: draggableDivider,
+                                              ),
+                                          ],
+                                        );
+                                      },
+                                    ),
+                                ],
+                              )
+                            : SafeArea(
+                                bottom: false,
+                                left:
+                                    settingsStore.landscapeCutout !=
+                                        LandscapeCutoutType.left &&
+                                    settingsStore.landscapeCutout !=
+                                        LandscapeCutoutType.both,
+                                right:
+                                    settingsStore.landscapeCutout !=
+                                        LandscapeCutoutType.right &&
+                                    settingsStore.landscapeCutout !=
+                                        LandscapeCutoutType.both,
+                                child: LayoutBuilder(
+                                  builder: (context, constraints) {
+                                    final availableWidth = constraints.maxWidth;
+                                    final chatWidth = _chatStore.expandChat
+                                        ? 0.5
+                                        : settingsStore.chatWidth;
+
+                                    // Create the landscape chat container with proper styling
+                                    final chatContainer = AnimatedContainer(
+                                      curve: Curves.ease,
+                                      duration: _isDividerDragging
+                                          ? Duration.zero
+                                          : const Duration(milliseconds: 200),
+                                      width: availableWidth * chatWidth,
+                                      color: settingsStore.fullScreen
+                                          ? Colors.black.withValues(
+                                              alpha: settingsStore
+                                                  .fullScreenChatOverlayOpacity,
+                                            )
+                                          : context.scaffoldColor,
+                                      child: chat,
+                                    );
+
+                                    final draggableDivider = Observer(
+                                      builder: (_) => DraggableDivider(
+                                        currentWidth: chatWidth,
+                                        maxWidth: 0.6,
+                                        isResizableOnLeft:
+                                            settingsStore.landscapeChatLeftSide,
+                                        showHandle: _videoStore.overlayVisible,
+                                        onDragStart: () {
+                                          setState(() {
+                                            _isDividerDragging = true;
+                                          });
+                                        },
+                                        onDrag: (newWidth) {
+                                          if (!_chatStore.expandChat) {
+                                            settingsStore.chatWidth = newWidth;
+                                          }
+                                        },
+                                        onDragEnd: () {
+                                          setState(() {
+                                            _isDividerDragging = false;
+                                          });
+                                        },
+                                      ),
+                                    );
+
+                                    return Stack(
+                                      children: [
+                                        Row(
+                                          children:
+                                              settingsStore
+                                                  .landscapeChatLeftSide
+                                              ? [
+                                                  chatContainer,
+                                                  Expanded(
+                                                    child:
+                                                        _buildPipGestureWrapper(
+                                                          child: video,
+                                                        ),
+                                                  ),
+                                                ]
+                                              : [
+                                                  Expanded(
+                                                    child:
+                                                        _buildPipGestureWrapper(
+                                                          child: video,
+                                                        ),
+                                                  ),
+                                                  chatContainer,
+                                                ],
+                                        ),
+                                        Positioned(
+                                          top: 0,
+                                          bottom: 0,
+                                          left:
+                                              settingsStore
+                                                  .landscapeChatLeftSide
+                                              ? (availableWidth * chatWidth) -
+                                                    12
+                                              : null,
+                                          right:
+                                              !settingsStore
+                                                  .landscapeChatLeftSide
+                                              ? (availableWidth * chatWidth) -
+                                                    12
+                                              : null,
+                                          child: draggableDivider,
+                                        ),
+                                      ],
+                                    );
+                                  },
+                                ),
+                              )
+                      : SafeArea(child: chat),
+                );
+              }
+              return SafeArea(
+                // Keep chat-only scrolling under the blurred app bar, but
+                // ensure video does not bleed into the system status bar.
+                top: settingsStore.showVideo,
+                bottom: false,
+                child: Stack(
+                  children: [
+                    Column(
+                      children: [
+                        if (settingsStore.showVideo) ...[
+                          AspectRatio(
+                            aspectRatio: 16 / 9,
+                            child: SizedBox(),
+                          ),
+                          ChannelInfoHeader(
+                            videoStore: _videoStore,
+                            authStore: context.authStore,
+                            userId: widget.userId,
+                            displayName: widget.userName,
+                            isInSharedChatMode:
+                                _chatStore.isInSharedChatMode,
+                          ),
+                        ],
+                        Expanded(child: chat),
+                      ],
+                    ),
+                    if (settingsStore.showVideo)
+                      Positioned(
+                        top: 0,
+                        left: 0,
+                        right: 0,
+                        child: _buildPipGestureWrapper(
+                          child: video,
+                          aspectRatio: 16 / 9,
+                        ),
+                      ),
+                  ],
+                ),
+              );
+            },
+          ),
+        );
+      },
+    );
+
+    // If on Android, use PiPSwitcher to enable PiP functionality.
+    if (Platform.isAndroid) {
+      // Both players need this — the WebView store used to be skipped by a
+      // NativeVideoPlayerInterface type check, so it never learned it was in
+      // PiP on Android.
+      void notifyPip(bool isInPip) => _videoStore.handleAndroidPipChanged(isInPip);
+
+      return PipWidget(
+        pipLayout: PipActionsLayout.mediaOnlyPause,
+        onPipAction: (_) => _videoStore.handlePausePlay(),
+        onPipEntered: () => notifyPip(true),
+        onPipExited: () => notifyPip(false),
+        pipChild: player,
+        child: videoChat,
+      );
+    }
+
+    return videoChat;
+  }
+
+  @override
+  void dispose() {
+    // Remove observer for app lifecycle events
+    WidgetsBinding.instance.removeObserver(this);
+
+    _chatTabsStore.dispose();
+
+    _videoStore.dispose();
+
+    _animationController.dispose();
+    _pipDragDistance.dispose();
+
+    SystemChrome.setEnabledSystemUIMode(
+      SystemUiMode.manual,
+      overlays: SystemUiOverlay.values,
+    );
+
+    SystemChrome.setPreferredOrientations([]);
+
+    super.dispose();
+  }
+}
diff --git a/lib/screens/channel/chat/chat.dart b/lib/screens/channel/chat/chat.dart
index f3816682..80ceda50 100644
--- a/lib/screens/channel/chat/chat.dart
+++ b/lib/screens/channel/chat/chat.dart
@@ -1,19 +1,42 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/screens/channel/chat/emote_menu/emote_menu_panel.dart';
 import 'package:frosty/screens/channel/chat/emote_menu/recent_emotes_panel.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_tabs_store.dart';
 import 'package:frosty/screens/channel/chat/widgets/chat_bottom_bar.dart';
 import 'package:frosty/screens/channel/chat/widgets/chat_message.dart';
-import 'package:frosty/widgets/button.dart';
-import 'package:frosty/widgets/page_view.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/widgets/frosty_page_view.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
+
+/// ~2x default to keep richer message widgets (emotes, badges, replies) built
+/// ahead of fast scroll-back without holding the entire history.
+const _chatCacheExtent = ScrollCacheExtent.pixels(500.0);
 
 class Chat extends StatelessWidget {
   final ChatStore chatStore;
+  final EdgeInsetsGeometry? listPadding;
 
-  const Chat({Key? key, required this.chatStore}) : super(key: key);
+  /// Callback to add a new chat tab.
+  /// Passes this to ChatBottomBar for the ChatDetails menu.
+  final VoidCallback onAddChat;
+
+  /// When set, the widget operates in merged mode: messages come from all tabs
+  /// and the active tab determines the send target.
+  final ChatTabsStore? chatTabsStore;
+
+  const Chat({
+    super.key,
+    required this.chatStore,
+    this.listPadding,
+    required this.onAddChat,
+    this.chatTabsStore,
+  });
+
+  bool get _isMerged => chatTabsStore != null;
 
   @override
   Widget build(BuildContext context) {
@@ -22,116 +45,320 @@ class Chat extends StatelessWidget {
         return Column(
           children: [
             Expanded(
-              child: GestureDetector(
-                onTap: () {
-                  if (chatStore.assetsStore.showEmoteMenu) {
-                    chatStore.assetsStore.showEmoteMenu = false;
-                  } else if (chatStore.textFieldFocusNode.hasFocus) {
-                    chatStore.textFieldFocusNode.unfocus();
-                  }
-                },
-                child: Stack(
-                  alignment: AlignmentDirectional.bottomCenter,
-                  children: [
-                    MediaQuery(
+              child: Stack(
+                alignment: AlignmentDirectional.bottomCenter,
+                children: [
+                  // Wrap only the message list with GestureDetector
+                  // so taps on ChatBottomBar don't trigger unfocus
+                  GestureDetector(
+                    behavior: HitTestBehavior.opaque,
+                    onTap: () {
+                      if (chatStore.assetsStore.showEmoteMenu) {
+                        chatStore.assetsStore.showEmoteMenu = false;
+                      } else if (chatStore.textFieldFocusNode.hasFocus) {
+                        chatStore.unfocusInput();
+                      }
+                    },
+                    child: MediaQuery(
                       data: MediaQuery.of(context).copyWith(
-                          textScaleFactor: chatStore.settings.messageScale),
+                        textScaler: chatStore.settings.messageScale.textScaler,
+                      ),
                       child: DefaultTextStyle(
-                        style: DefaultTextStyle.of(context)
-                            .style
-                            .copyWith(fontSize: chatStore.settings.fontSize),
-                        child: Observer(
+                        style: context.defaultTextStyle.copyWith(
+                          fontSize: chatStore.settings.fontSize,
+                        ),
+                        child: Builder(
                           builder: (context) {
-                            return ListView.builder(
-                              reverse: true,
-                              padding: EdgeInsets.zero,
-                              addAutomaticKeepAlives: false,
-                              controller: chatStore.scrollController,
-                              itemCount: chatStore.renderMessages.length,
-                              itemBuilder: (context, index) => ChatMessage(
-                                ircMessage: chatStore.renderMessages.reversed
-                                    .toList()[index],
-                                chatStore: chatStore,
+                            // Don't add bottom padding in horizontal landscape
+                            // (immersive mode with home indicator on side).
+                            // landscapeForceVerticalChat uses portrait layout
+                            // with normal system UI, so still needs padding.
+                            final isHorizontalLandscape =
+                                context.isLandscape &&
+                                !chatStore.settings.landscapeForceVerticalChat;
+                            final bottomPadding =
+                                chatStore.assetsStore.showEmoteMenu ||
+                                    isHorizontalLandscape
+                                ? 0.0
+                                : MediaQuery.of(context).padding.bottom;
+
+                            final scrollController = _isMerged
+                                ? chatTabsStore!.mergedScrollController
+                                : chatStore.scrollController;
+
+                            // Freeze the message list while a finger rests on a
+                            // message so a long-press target can't scroll out
+                            // from under it (which would dispose its recognizer
+                            // mid-press). The store resumes flowing as soon as
+                            // the pointer moves like a scroll, so scrolling is
+                            // never interrupted — only a stationary hold pauses.
+                            void onDown(PointerDownEvent e) => _isMerged
+                                ? chatTabsStore!.onMessageListPointerDown(
+                                    e.pointer,
+                                    e.position,
+                                  )
+                                : chatStore.onMessageListPointerDown(
+                                    e.pointer,
+                                    e.position,
+                                  );
+                            void onMove(PointerMoveEvent e) => _isMerged
+                                ? chatTabsStore!.onMessageListPointerMove(
+                                    e.pointer,
+                                    e.position,
+                                  )
+                                : chatStore.onMessageListPointerMove(
+                                    e.pointer,
+                                    e.position,
+                                  );
+                            void onUp(int pointer) => _isMerged
+                                ? chatTabsStore!.onMessageListPointerUp(pointer)
+                                : chatStore.onMessageListPointerUp(pointer);
+
+                            return Listener(
+                              onPointerDown: onDown,
+                              onPointerMove: onMove,
+                              onPointerUp: (e) => onUp(e.pointer),
+                              onPointerCancel: (e) => onUp(e.pointer),
+                              child: FrostyScrollbar(
+                                controller: scrollController,
+                                padding: EdgeInsets.only(
+                                  top: MediaQuery.of(context).padding.top,
+                                  bottom:
+                                      chatStore.bottomBarHeight + bottomPadding,
+                                ),
+                                child: Observer(
+                                  builder: (context) {
+                                    return _isMerged
+                                        ? _buildMergedList(
+                                            scrollController,
+                                            bottomPadding,
+                                          )
+                                        : _buildNormalList(
+                                            scrollController,
+                                            bottomPadding,
+                                          );
+                                  },
+                                ),
                               ),
                             );
                           },
                         ),
                       ),
                     ),
-                    Padding(
-                      padding: const EdgeInsets.all(5.0),
-                      child: Observer(
-                        builder: (_) => AnimatedSwitcher(
-                          duration: const Duration(milliseconds: 200),
-                          switchInCurve: Curves.easeOut,
-                          switchOutCurve: Curves.easeIn,
-                          child: chatStore.autoScroll
-                              ? null
-                              : Button(
-                                  padding: const EdgeInsets.symmetric(
-                                      horizontal: 15.0, vertical: 10.0),
-                                  onPressed: chatStore.resumeScroll,
-                                  icon: const Icon(
-                                      Icons.keyboard_double_arrow_down_rounded),
-                                  child: const Text('Resume scroll'),
-                                ),
-                        ),
-                      ),
+                  ),
+                  Positioned(
+                    left: 0,
+                    right: 0,
+                    bottom: 0,
+                    child: ChatBottomBar(
+                      chatStore: chatStore,
+                      onAddChat: onAddChat,
+                      channelDisplayName: _isMerged
+                          ? getReadableName(
+                              chatTabsStore!.activeTab.displayName,
+                              chatTabsStore!.activeTab.channelLogin,
+                            )
+                          : null,
                     ),
-                  ],
-                ),
+                  ),
+                  _buildResumeScrollButton(),
+                ],
               ),
             ),
-            if (chatStore.settings.showBottomBar)
-              ChatBottomBar(chatStore: chatStore),
-            WillPopScope(
-              onWillPop: Platform.isAndroid
-                  ? () async {
-                      // If pressing the back button on Android while the emote menu is open, close it instead of going back to the streams list.
-                      if (chatStore.assetsStore.showEmoteMenu) {
-                        chatStore.assetsStore.showEmoteMenu = false;
-                        return false;
-                      } else {
-                        return true;
-                      }
-                    }
-                  : null,
-              child: AnimatedContainer(
-                curve: Curves.ease,
+            _buildEmoteMenu(context),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildNormalList(
+    ScrollController scrollController,
+    double bottomPadding,
+  ) {
+    return ListView.builder(
+      reverse: true,
+      padding: (listPadding ?? EdgeInsets.zero).add(
+        EdgeInsets.only(bottom: chatStore.bottomBarHeight + bottomPadding),
+      ),
+      addAutomaticKeepAlives: false,
+      scrollCacheExtent: _chatCacheExtent,
+      controller: scrollController,
+      itemCount: chatStore.renderMessages.length,
+      itemBuilder: (context, index) {
+        final ircMessage = chatStore
+            .renderMessages[chatStore.renderMessages.length - 1 - index];
+        // Key by message identity so the list reconciles by message rather
+        // than by slot. This keeps each message's element (and its gesture
+        // recognizers) bound to the same message when new messages arrive
+        // mid-interaction, fixing long-press landing on the wrong message.
+        return ChatMessage(
+          key: ObjectKey(ircMessage),
+          ircMessage: ircMessage,
+          chatStore: chatStore,
+        );
+      },
+    );
+  }
+
+  Widget _buildMergedList(
+    ScrollController scrollController,
+    double bottomPadding,
+  ) {
+    final mergedMessages = chatTabsStore!.mergedMessages;
+    final channelIdToUserTwitch = chatTabsStore!.mergedChannelIdToUserTwitch;
+    final currentChannelId = chatTabsStore!.activeTab.channelId;
+
+    return ListView.builder(
+      reverse: true,
+      padding: (listPadding ?? EdgeInsets.zero).add(
+        EdgeInsets.only(bottom: chatStore.bottomBarHeight + bottomPadding),
+      ),
+      addAutomaticKeepAlives: false,
+      scrollCacheExtent: _chatCacheExtent,
+      controller: scrollController,
+      itemCount: mergedMessages.length,
+      itemBuilder: (context, index) {
+        final merged = mergedMessages[mergedMessages.length - 1 - index];
+        return ChatMessage(
+          key: ObjectKey(merged.ircMessage),
+          ircMessage: merged.ircMessage,
+          chatStore: merged.chatStore,
+          inputChatStore: chatStore,
+          onActivateSourceTab: () {
+            final tabs = chatTabsStore!.tabs;
+            final idx = tabs.indexWhere(
+              (t) => t.channelId == merged.chatStore.channelId,
+            );
+            if (idx != -1 && idx != chatTabsStore!.activeTabIndex) {
+              chatTabsStore!.setActiveTab(idx, silent: true);
+            }
+          },
+          overrideChannelIdToUserTwitch: channelIdToUserTwitch,
+          overrideCurrentChannelId: currentChannelId,
+        );
+      },
+    );
+  }
+
+  Widget _buildResumeScrollButton() {
+    return Builder(
+      builder: (context) {
+        final isHorizontalLandscape =
+            context.isLandscape &&
+            !chatStore.settings.landscapeForceVerticalChat;
+        return AnimatedPadding(
+          duration: const Duration(milliseconds: 200),
+          padding: EdgeInsets.only(
+            left: 4,
+            top: 4,
+            right: 4,
+            bottom:
+                chatStore.bottomBarHeight +
+                (chatStore.assetsStore.showEmoteMenu || isHorizontalLandscape
+                    ? 0
+                    : MediaQuery.of(context).padding.bottom),
+          ),
+          child: Observer(
+            builder: (_) {
+              final isAutoScrolling = _isMerged
+                  ? chatTabsStore!.mergedAutoScroll
+                  : chatStore.autoScroll;
+              final bufferCount = _isMerged
+                  ? chatTabsStore!.mergedBufferCount
+                  : chatStore.messageBuffer.length;
+              final onResume = _isMerged
+                  ? chatTabsStore!.resumeMergedScroll
+                  : chatStore.resumeScroll;
+
+              return AnimatedSwitcher(
                 duration: const Duration(milliseconds: 200),
-                height: chatStore.assetsStore.showEmoteMenu
-                    ? MediaQuery.of(context).size.height /
-                        (MediaQuery.of(context).orientation ==
-                                Orientation.portrait
-                            ? 3
-                            : 2)
-                    : 0,
-                child: AnimatedSwitcher(
-                  duration: const Duration(milliseconds: 100),
-                  switchInCurve: Curves.easeOut,
-                  switchOutCurve: Curves.easeIn,
-                  child: chatStore.assetsStore.showEmoteMenu
-                      ? FrostyPageView(
-                          headers: const [
+                switchInCurve: Curves.easeOut,
+                switchOutCurve: Curves.easeIn,
+                child: isAutoScrolling
+                    ? null
+                    : ElevatedButton.icon(
+                        onPressed: onResume,
+                        icon: const Icon(Icons.arrow_downward_rounded),
+                        label: Text(
+                          bufferCount > 0
+                              ? '$bufferCount new ${bufferCount == 1 ? 'message' : 'messages'}'
+                              : 'Resume scroll',
+                          style: const TextStyle(
+                            fontFeatures: [FontFeature.tabularFigures()],
+                          ),
+                        ),
+                      ),
+              );
+            },
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildEmoteMenu(BuildContext context) {
+    final menuHeight = context.screenHeight / (context.isPortrait ? 3 : 2);
+    return AnimatedContainer(
+      curve: Curves.ease,
+      duration: const Duration(milliseconds: 200),
+      height: chatStore.assetsStore.showEmoteMenu ? menuHeight : 0,
+      child: AnimatedSwitcher(
+        duration: const Duration(milliseconds: 100),
+        switchInCurve: Curves.easeOut,
+        switchOutCurve: Curves.easeIn,
+        child: chatStore.assetsStore.showEmoteMenu
+            ? ClipRect(
+                // Lay the content out at its full target height regardless of
+                // the animated container's current height, then clip — the
+                // Column would otherwise overflow (RenderFlex error) as the
+                // height tweens toward zero and can no longer fit the Divider.
+                child: OverflowBox(
+                  minHeight: 0,
+                  maxHeight: menuHeight,
+                  alignment: Alignment.topCenter,
+                  child: Column(
+                    children: [
+                      const Divider(),
+                      Expanded(
+                        child: FrostyPageView(
+                          headers: [
                             'Recent',
-                            'Twitch',
-                            '7TV',
-                            'BTTV',
-                            'FFZ',
+                            if (chatStore.settings.showTwitchEmotes) 'Twitch',
+                            if (chatStore.settings.show7TVEmotes) '7TV',
+                            if (chatStore.settings.showBTTVEmotes) 'BTTV',
+                            if (chatStore.settings.showFFZEmotes) 'FFZ',
                           ],
+                          tabActions: {
+                            if (chatStore.assetsStore.recentEmotes.isNotEmpty)
+                              0: IconButton(
+                                onPressed: () {
+                                  chatStore.assetsStore.recentEmotes.clear();
+                                  chatStore.updateNotification(
+                                    'Recent emotes cleared',
+                                  );
+                                },
+                                icon: const Icon(Icons.delete_outline_rounded),
+                                tooltip: 'Clear recent emotes',
+                                iconSize: 20,
+                              ),
+                          },
                           children: [
-                            RecentEmotesPanel(
-                              chatStore: chatStore,
-                            ),
-                            EmoteMenuPanel(
-                              chatStore: chatStore,
-                              twitchEmotes: chatStore
-                                  .assetsStore.userEmoteSectionToEmotes,
-                            ),
+                            RecentEmotesPanel(chatStore: chatStore),
+                            if (chatStore.settings.showTwitchEmotes)
+                              EmoteMenuPanel(
+                                chatStore: chatStore,
+                                twitchEmotes: chatStore
+                                    .assetsStore
+                                    .userEmoteSectionToEmotes,
+                              ),
                             ...[
-                              chatStore.assetsStore.sevenTVEmotes,
-                              chatStore.assetsStore.bttvEmotes,
-                              chatStore.assetsStore.ffzEmotes
+                              if (chatStore.settings.show7TVEmotes)
+                                chatStore.assetsStore.sevenTVEmotes,
+                              if (chatStore.settings.showBTTVEmotes)
+                                chatStore.assetsStore.bttvEmotes,
+                              if (chatStore.settings.showFFZEmotes)
+                                chatStore.assetsStore.ffzEmotes,
                             ].map(
                               (emotes) => EmoteMenuPanel(
                                 chatStore: chatStore,
@@ -139,14 +366,14 @@ class Chat extends StatelessWidget {
                               ),
                             ),
                           ],
-                        )
-                      : null,
+                        ),
+                      ),
+                    ],
+                  ),
                 ),
-              ),
-            ),
-          ],
-        );
-      },
+              )
+            : null,
+      ),
     );
   }
 }
diff --git a/lib/screens/channel/chat/details/chat_details.dart b/lib/screens/channel/chat/details/chat_details.dart
index 544a9705..987e15bf 100644
--- a/lib/screens/channel/chat/details/chat_details.dart
+++ b/lib/screens/channel/chat/details/chat_details.dart
@@ -1,218 +1,621 @@
-import 'dart:ui';
+import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/constants.dart';
 import 'package:frosty/main.dart';
+import 'package:frosty/models/irc.dart';
 import 'package:frosty/screens/channel/chat/details/chat_details_store.dart';
 import 'package:frosty/screens/channel/chat/details/chat_modes.dart';
 import 'package:frosty/screens/channel/chat/details/chat_users_list.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
 import 'package:frosty/screens/settings/settings.dart';
-import 'package:frosty/widgets/bottom_sheet.dart';
-import 'package:frosty/widgets/button.dart';
-import 'package:frosty/widgets/dialog.dart';
-import 'package:frosty/widgets/list_tile.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/animated_scroll_border.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
+import 'package:frosty/widgets/section_header.dart';
+import 'package:intl/intl.dart';
 
-class ChatDetails extends StatelessWidget {
+class ChatDetails extends StatefulWidget {
   final ChatDetailsStore chatDetailsStore;
   final ChatStore chatStore;
   final String userLogin;
 
+  /// Callback to add a new chat tab.
+  /// Shows an "Add chat" option in the menu.
+  final VoidCallback onAddChat;
+
   const ChatDetails({
-    Key? key,
+    super.key,
     required this.chatDetailsStore,
     required this.chatStore,
     required this.userLogin,
-  }) : super(key: key);
+    required this.onAddChat,
+  });
 
-  Future<void> _showSleepTimerDialog(BuildContext context) {
-    return showDialog(
+  @override
+  State<ChatDetails> createState() => _ChatDetailsState();
+}
+
+class _ChatDetailsState extends State<ChatDetails> {
+  late final _scrollController = ScrollController();
+
+  bool _isRefreshingAssets = false;
+  bool _showRefreshSuccess = false;
+
+  String formatDuration(Duration duration) {
+    if (duration.inMinutes < 60) {
+      return '${duration.inMinutes} ${Intl.plural(duration.inMinutes, one: 'minute', other: 'minutes')}';
+    }
+
+    return '${duration.inHours} ${Intl.plural(duration.inHours, one: 'hour', other: 'hours')}';
+  }
+
+  String formatTimeLeft(Duration duration) {
+    final hours = duration.inHours;
+    final minutes = duration.inMinutes.remainder(60);
+    final seconds = duration.inSeconds.remainder(60);
+
+    if (hours > 0) {
+      return '${hours}h ${minutes}m';
+    } else if (minutes > 0) {
+      return '${minutes}m ${seconds}s';
+    } else {
+      return '${seconds}s';
+    }
+  }
+
+  Future<void> _showSleepTimer(BuildContext context) {
+    const durations = [
+      Duration(minutes: 5),
+      Duration(minutes: 10),
+      Duration(minutes: 15),
+      Duration(minutes: 30),
+      Duration(hours: 1),
+      Duration(hours: 2),
+      Duration(hours: 3),
+      Duration(hours: 4),
+      Duration(hours: 5),
+      Duration(hours: 6),
+      Duration(hours: 7),
+      Duration(hours: 8),
+      Duration(hours: 9),
+      Duration(hours: 10),
+      Duration(hours: 11),
+      Duration(hours: 12),
+    ];
+
+    return showModalBottomSheetWithProperFocus(
       context: context,
-      builder: (context) => FrostyDialog(
-        title: 'Sleep Timer',
-        content: Observer(
-          builder: (context) => Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Opacity(
-                opacity: chatStore.sleepTimer != null &&
-                        chatStore.sleepTimer!.isActive
-                    ? 1.0
-                    : 0.5,
-                child: Row(
-                  children: [
-                    const Icon(Icons.timer_rounded),
-                    Text(
-                      ' ${chatStore.timeRemaining.toString().split('.')[0]}',
-                      style: const TextStyle(
-                          fontWeight: FontWeight.w600,
-                          fontFeatures: [FontFeature.tabularFigures()]),
-                    ),
-                    const Spacer(),
-                    IconButton(
-                      tooltip: 'Cancel sleep timer',
-                      onPressed: chatStore.cancelSleepTimer,
-                      icon: const Icon(Icons.cancel_rounded),
-                    ),
-                  ],
-                ),
-              ),
-              Row(
-                children: [
-                  DropdownButton(
-                    value: chatStore.sleepHours,
-                    items: List.generate(24, (index) => index)
-                        .map((e) => DropdownMenuItem(
-                            value: e, child: Text(e.toString())))
-                        .toList(),
-                    onChanged: (int? hours) => chatStore.sleepHours = hours!,
-                    menuMaxHeight: 200,
-                  ),
-                  const SizedBox(width: 10.0),
-                  const Text('Hours'),
-                ],
-              ),
-              Row(
-                children: [
-                  DropdownButton(
-                    value: chatStore.sleepMinutes,
-                    items: List.generate(60, (index) => index)
-                        .map((e) => DropdownMenuItem(
-                            value: e, child: Text(e.toString())))
-                        .toList(),
-                    onChanged: (int? minutes) =>
-                        chatStore.sleepMinutes = minutes!,
-                    menuMaxHeight: 200,
-                  ),
-                  const SizedBox(width: 10.0),
-                  const Text('Minutes'),
-                ],
-              ),
-            ],
+      builder: (context) => Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          const SectionHeader(
+            'Sleep timer',
+            padding: EdgeInsets.fromLTRB(16, 0, 16, 4),
+            isFirst: true,
           ),
-        ),
-        actions: [
-          Observer(
-            builder: (context) => Button(
-              onPressed:
-                  chatStore.sleepHours == 0 && chatStore.sleepMinutes == 0
-                      ? null
-                      : () => chatStore.updateSleepTimer(
-                            onTimerFinished: () => navigatorKey.currentState
-                                ?.popUntil((route) => route.isFirst),
+          AnimatedScrollBorder(scrollController: _scrollController),
+          Expanded(
+            child: ListView(
+              controller: _scrollController,
+              children: [
+                if (widget.chatStore.sleepTimer?.isActive == true)
+                  Observer(
+                    builder: (context) {
+                      return ListTile(
+                        leading: const Icon(Icons.close_rounded),
+                        title: Text.rich(
+                          TextSpan(
+                            text: 'Cancel   ',
+                            children: [
+                              TextSpan(
+                                text: formatTimeLeft(
+                                  widget.chatStore.timeRemaining,
+                                ),
+                                style: TextStyle(
+                                  color: Theme.of(context)
+                                      .textTheme
+                                      .bodyMedium
+                                      ?.color
+                                      ?.withValues(alpha: 0.6),
+                                  fontFeatures: [FontFeature.tabularFigures()],
+                                ),
+                              ),
+                            ],
                           ),
-              child: const Text('Set timer'),
+                        ),
+                        onTap: () {
+                          widget.chatStore.cancelSleepTimer();
+
+                          Navigator.of(context).pop();
+                        },
+                      );
+                    },
+                  ),
+                ...durations.map(
+                  (duration) => ListTile(
+                    leading: const Icon(Icons.hourglass_top_rounded),
+                    title: Text(formatDuration(duration)),
+                    onTap: () {
+                      widget.chatStore.updateSleepTimer(
+                        duration: duration,
+                        onTimerFinished: () => navigatorKey.currentState
+                            ?.popUntil((route) => route.isFirst),
+                      );
+
+                      Navigator.of(context).pop();
+                    },
+                  ),
+                ),
+              ],
             ),
           ),
-          Button(
-            onPressed: Navigator.of(context).pop,
-            color: Colors.grey,
-            child: const Text('Close'),
-          ),
         ],
       ),
     );
   }
 
-  Future<void> _showClearDialog(BuildContext context) {
-    return showDialog(
+  /// Converts a hex color string to a color name if it matches one of our predefined chat colors.
+  /// Returns null if no match is found.
+  String? _hexToColorName(String hexColor) {
+    // Remove # if present
+    final cleanHex = hexColor.startsWith('#')
+        ? hexColor.substring(1)
+        : hexColor;
+
+    // Convert to uppercase for comparison
+    final upperHex = cleanHex.toUpperCase();
+
+    // Find matching color name
+    for (final entry in chatColorValues.entries) {
+      final colorValue = entry.value.toARGB32().toRadixString(16).toUpperCase();
+      // Remove alpha channel (first 2 characters) for comparison
+      if (colorValue.length >= 6) {
+        final colorHex = colorValue.substring(2);
+        if (colorHex == upperHex) {
+          return entry.key;
+        }
+      }
+    }
+
+    return null;
+  }
+
+  Future<void> _showChatColorPicker(BuildContext context) async {
+    final selectedColor = await _getCurrentUserColor();
+    if (!context.mounted) return;
+
+    showModalBottomSheetWithProperFocus(
       context: context,
-      builder: (context) => FrostyDialog(
-        title: 'Clear Recent Emotes',
-        message: 'Are you sure you want to clear your recent emotes?',
-        actions: [
-          Button(
-            onPressed: Navigator.of(context).pop,
-            child: const Text('Yes'),
-          ),
-          Button(
-            onPressed: Navigator.of(context).pop,
-            color: Colors.grey,
-            child: const Text('Cancel'),
-          ),
-        ],
+      builder: (context) => SizedBox(
+        height: MediaQuery.of(context).size.height * 0.5,
+        child: _ChatColorPickerModal(
+          initialColor: selectedColor,
+          scrollController: _scrollController,
+          onColorSelected: _handleColorUpdate,
+          chatStore: widget.chatStore,
+        ),
       ),
     );
   }
 
+  Future<String?> _getCurrentUserColor() async {
+    try {
+      final currentColorHex = await widget.chatStore.twitchApi.getUserChatColor(
+        userId: widget.chatStore.auth.user.details!.id,
+      );
+
+      if (currentColorHex.isNotEmpty) {
+        return _hexToColorName(currentColorHex);
+      }
+    } catch (e) {
+      // Ignore errors when fetching current color
+    }
+    return null;
+  }
+
+  Future<void> _handleColorUpdate(BuildContext context, String color) async {
+    final success = await widget.chatStore.twitchApi.updateUserChatColor(
+      userId: widget.chatStore.auth.user.details!.id,
+      color: color,
+    );
+
+    if (!context.mounted) return;
+    Navigator.of(context).pop();
+
+    final message = success
+        ? 'Chat color updated successfully!'
+        : 'Failed to update chat color. Please try again.';
+    _showMessage(context, message);
+  }
+
+  void _showMessage(BuildContext context, String message) {
+    ScaffoldMessenger.of(
+      context,
+    ).showSnackBar(SnackBar(content: Text(message)));
+  }
+
+  bool _hasActiveModes() {
+    final roomState = widget.chatDetailsStore.roomState;
+    return roomState.subMode != '0' ||
+        roomState.followersOnly != '-1' ||
+        roomState.emoteOnly != '0' ||
+        roomState.slowMode != '0' ||
+        roomState.r9k != '0';
+  }
+
+  Widget _buildRefreshTrailingWidget() {
+    return AnimatedSwitcher(
+      duration: const Duration(milliseconds: 200),
+      child: _isRefreshingAssets
+          ? const SizedBox(
+              width: 20,
+              height: 20,
+              child: CircularProgressIndicator.adaptive(strokeWidth: 2),
+            )
+          : _showRefreshSuccess
+          ? Icon(
+              Icons.check_rounded,
+              color: Theme.of(context).colorScheme.primary,
+              key: const ValueKey('success'),
+            )
+          : const SizedBox.shrink(),
+    );
+  }
+
+  Future<void> _handleRefreshAssets() async {
+    setState(() => _isRefreshingAssets = true);
+
+    try {
+      await widget.chatStore.getAssets();
+      if (mounted) {
+        HapticFeedback.lightImpact();
+        setState(() {
+          _isRefreshingAssets = false;
+          _showRefreshSuccess = true;
+        });
+
+        // Hide success after 2 seconds
+        Timer(const Duration(seconds: 2), () {
+          if (mounted) {
+            setState(() => _showRefreshSuccess = false);
+          }
+        });
+      }
+    } catch (e) {
+      if (mounted) {
+        setState(() => _isRefreshingAssets = false);
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    final children = [
-      ListTile(
-        title: ChatModes(roomState: chatDetailsStore.roomState),
-      ),
-      FrostyListTile(
-        leading: const Icon(Icons.people_outline),
-        title: 'Chatters',
-        onTap: () => showModalBottomSheet(
-          backgroundColor: Colors.transparent,
-          isScrollControlled: true,
-          context: context,
-          builder: (context) => FrostyBottomSheet(
-            child: SizedBox(
-              height: MediaQuery.of(context).size.height * 0.8,
-              child: GestureDetector(
+    return Observer(
+      builder: (context) {
+        final hasActiveModes = _hasActiveModes();
+
+        final children = [
+          if (hasActiveModes)
+            ListTile(
+              title: SizedBox(
+                height: 48,
+                child: ListView(
+                  scrollDirection: Axis.horizontal,
+                  children: [
+                    Observer(
+                      builder: (context) => ChatModes(
+                        roomState: widget.chatDetailsStore.roomState,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          Observer(
+            builder: (context) {
+              final showVideo = widget.chatStore.settings.showVideo;
+              final label = showVideo ? 'Chat only' : 'Show video';
+              return ListTile(
+                leading: Icon(
+                  showVideo ? Icons.chat_rounded : Icons.tv_rounded,
+                ),
+                title: Text(label),
+                onTap: () {
+                  widget.chatStore.settings.showVideo = !showVideo;
+                  Navigator.of(context).pop();
+                },
+              );
+            },
+          ),
+          ListTile(
+            leading: const Icon(Icons.sync_rounded),
+            title: const Text('Refresh emotes and badges'),
+            trailing: _buildRefreshTrailingWidget(),
+            enabled: !_isRefreshingAssets,
+            onTap: _isRefreshingAssets ? null : _handleRefreshAssets,
+          ),
+          ListTile(
+            leading: const Icon(Icons.wifi_off_rounded),
+            title: const Text('Reconnect'),
+            onTap: () {
+              Navigator.of(context).pop();
+              widget.chatStore.updateNotification('Reconnecting to chat...');
+              widget.chatStore.connectToChat();
+            },
+          ),
+          if (widget.chatStore.auth.isLoggedIn)
+            ListTile(
+              leading: const Icon(Icons.palette_rounded),
+              title: const Text('Username color'),
+              trailing: const Icon(Icons.chevron_right),
+              onTap: () => _showChatColorPicker(context),
+            ),
+          ListTile(
+            leading: const Icon(Icons.people_rounded),
+            title: const Text('Chatters'),
+            trailing: const Icon(Icons.chevron_right),
+            onTap: () => showModalBottomSheetWithProperFocus(
+              isScrollControlled: true,
+              context: context,
+              builder: (context) => GestureDetector(
                 onTap: FocusScope.of(context).unfocus,
                 child: ChattersList(
-                  chatDetailsStore: chatDetailsStore,
-                  chatStore: chatStore,
-                  userLogin: userLogin,
+                  chatDetailsStore: widget.chatDetailsStore,
+                  chatStore: widget.chatStore,
+                  userLogin: widget.userLogin,
                 ),
               ),
             ),
           ),
+          ListTile(
+            leading: const Icon(Icons.add_comment_rounded),
+            title: const Text('Add chat'),
+            trailing: const Icon(Icons.chevron_right),
+            onTap: widget.onAddChat,
+          ),
+          Observer(
+            builder: (context) {
+              final hasTimer = widget.chatStore.timeRemaining.inSeconds > 0;
+              final label = hasTimer
+                  ? formatTimeLeft(widget.chatStore.timeRemaining)
+                  : 'Sleep timer';
+              return ListTile(
+                leading: Icon(
+                  hasTimer ? Icons.timer_rounded : Icons.timer_rounded,
+                  color: hasTimer
+                      ? Theme.of(context).colorScheme.primary
+                      : null,
+                ),
+                title: Text(
+                  label,
+                  style: hasTimer
+                      ? TextStyle(
+                          fontFeatures: const [FontFeature.tabularFigures()],
+                          color: Theme.of(context).colorScheme.primary,
+                        )
+                      : null,
+                ),
+                trailing: hasTimer
+                    ? Icon(
+                        Icons.chevron_right,
+                        color: Theme.of(context).colorScheme.primary,
+                      )
+                    : const Icon(Icons.chevron_right),
+                onTap: () => _showSleepTimer(context),
+              );
+            },
+          ),
+          ListTile(
+            leading: const Icon(Icons.settings_rounded),
+            title: const Text('Settings'),
+            trailing: const Icon(Icons.chevron_right),
+            onTap: () => Navigator.push(
+              context,
+              MaterialPageRoute(
+                settings: const RouteSettings(name: Settings.routeName),
+                builder: (context) =>
+                    Settings(settingsStore: widget.chatStore.settings),
+              ),
+            ),
+          ),
+        ];
+
+        return ListView(shrinkWrap: true, primary: false, children: children);
+      },
+    );
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+}
+
+class _ChatColorPickerModal extends StatefulWidget {
+  const _ChatColorPickerModal({
+    required this.initialColor,
+    required this.scrollController,
+    required this.onColorSelected,
+    required this.chatStore,
+  });
+
+  final String? initialColor;
+  final ScrollController scrollController;
+  final Future<void> Function(BuildContext context, String color)
+  onColorSelected;
+  final ChatStore chatStore;
+
+  @override
+  State<_ChatColorPickerModal> createState() => _ChatColorPickerModalState();
+}
+
+class _ChatColorPickerModalState extends State<_ChatColorPickerModal> {
+  String? selectedColor;
+
+  @override
+  void initState() {
+    super.initState();
+    selectedColor = widget.initialColor;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        _buildHeader(),
+        _buildPreview(),
+        AnimatedScrollBorder(scrollController: widget.scrollController),
+        _buildColorList(),
+        _buildBottomBar(),
+      ],
+    );
+  }
+
+  Widget _buildHeader() {
+    return const SectionHeader('Username color', isFirst: true);
+  }
+
+  Widget _buildPreview() {
+    if (selectedColor == null) return const SizedBox.shrink();
+
+    // Create a realistic preview using the current user's chat state and badges
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+      child: _buildRealisticChatPreview(),
+    );
+  }
+
+  Widget _buildRealisticChatPreview() {
+    final userDetails = widget.chatStore.auth.user.details!;
+    final userState = widget.chatStore.userState;
+
+    // Create a mock IRC message with the user's current state
+    final mockTags = <String, String>{
+      'display-name': userDetails.displayName,
+      'color':
+          '#${chatColorValues[selectedColor!]!.toARGB32().toRadixString(16).substring(2)}',
+      'user-id': userDetails.id,
+      'mod': userState.mod ? '1' : '0',
+      'subscriber': userState.subscriber ? '1' : '0',
+      'id': 'preview-message',
+      'tmi-sent-ts': DateTime.now().millisecondsSinceEpoch.toString(),
+    };
+
+    // Copy any badges from the current user state
+    if (userState.raw != null) {
+      final userStateMessage = IRCMessage.fromString(userState.raw!);
+      if (userStateMessage.tags['badges'] != null) {
+        mockTags['badges'] = userStateMessage.tags['badges']!;
+      }
+      if (userStateMessage.tags['badge-info'] != null) {
+        mockTags['badge-info'] = userStateMessage.tags['badge-info']!;
+      }
+    }
+
+    final mockMessage = IRCMessage(
+      raw: '',
+      command: Command.privateMessage,
+      tags: mockTags,
+      user: userDetails.login,
+      message: 'How it will look in chat',
+      split: ['How', 'it', 'will', 'look', 'in', 'chat'],
+      action: false,
+      mention: false,
+    );
+
+    return Text.rich(
+      TextSpan(
+        children: mockMessage.generateSpan(
+          context,
+          assetsStore: widget.chatStore.assetsStore,
+          emoteScale: widget.chatStore.settings.emoteScale,
+          badgeScale: widget.chatStore.settings.badgeScale,
+          launchExternal: false, // Disable launching for preview
+          style: DefaultTextStyle.of(context).style,
         ),
       ),
-      FrostyListTile(
-        leading: const Icon(Icons.timer_outlined),
-        title: 'Sleep timer',
-        onTap: () => _showSleepTimerDialog(context),
-      ),
-      FrostyListTile(
-        leading: const Icon(Icons.delete_outline_rounded),
-        title: 'Clear recent emotes',
-        onTap: () => _showClearDialog(context),
-      ),
-      FrostyListTile(
-        leading: const Icon(Icons.refresh_rounded),
-        title: 'Reconnect to chat',
-        onTap: () {
-          chatStore.updateNotification('Reconnecting to chat...');
+    );
+  }
 
-          chatStore.connectToChat();
-        },
+  Widget _buildColorList() {
+    return Expanded(
+      child: FrostyScrollbar(
+        controller: widget.scrollController,
+        child: ListView(
+          padding: EdgeInsets.zero,
+          controller: widget.scrollController,
+          children: chatColorNames
+              .map((colorName) => _buildColorTile(colorName))
+              .toList(),
+        ),
       ),
-      FrostyListTile(
-        leading: const Icon(Icons.refresh_rounded),
-        title: 'Refresh badges and emotes',
-        onTap: () async {
-          await chatStore.getAssets();
+    );
+  }
 
-          chatStore.updateNotification('Badges and emotes refreshed');
-        },
+  Widget _buildColorTile(String colorName) {
+    final isSelected = selectedColor == colorName;
+    final displayName = colorName
+        .replaceAll('_', ' ')
+        .split(' ')
+        .map((word) => word[0].toUpperCase() + word.substring(1))
+        .join(' ');
+
+    // Apply the same color adjustment for consistent preview
+    final rawColor = chatColorValues[colorName]!;
+    final adjustedColor = adjustChatNameColor(context, rawColor);
+
+    return ListTile(
+      leading: Container(
+        width: 24,
+        height: 24,
+        decoration: BoxDecoration(color: adjustedColor, shape: BoxShape.circle),
       ),
-      FrostyListTile(
-        leading: const Icon(Icons.settings_outlined),
-        title: 'Settings',
-        onTap: () => Navigator.push(
-          context,
-          MaterialPageRoute(
-            builder: (context) => Settings(settingsStore: chatStore.settings),
+      title: Text(displayName),
+      trailing: isSelected
+          ? Icon(Icons.check, color: Theme.of(context).colorScheme.primary)
+          : null,
+      onTap: () => setState(() => selectedColor = colorName),
+    );
+  }
+
+  Widget _buildBottomBar() {
+    return Column(
+      children: [
+        AnimatedScrollBorder(
+          scrollController: widget.scrollController,
+          position: ScrollBorderPosition.bottom,
+        ),
+        SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+            child: Row(
+              children: [
+                Expanded(
+                  child: TextButton(
+                    onPressed: () => Navigator.of(context).pop(),
+                    child: const Text('Cancel'),
+                  ),
+                ),
+                const SizedBox(width: 12),
+                Expanded(
+                  child: FilledButton(
+                    onPressed: selectedColor == null
+                        ? null
+                        : () => widget.onColorSelected(context, selectedColor!),
+                    child: const Text('Save'),
+                  ),
+                ),
+              ],
+            ),
           ),
         ),
-      ),
-    ];
-
-    return FrostyBottomSheet(
-      child: MediaQuery.of(context).orientation == Orientation.landscape
-          ? SizedBox(
-              height: MediaQuery.of(context).size.height * 0.8,
-              child: ListView(
-                children: children,
-              ),
-            )
-          : Column(
-              crossAxisAlignment: CrossAxisAlignment.start, children: children),
+      ],
     );
   }
 }
diff --git a/lib/screens/channel/chat/details/chat_details_store.g.dart b/lib/screens/channel/chat/details/chat_details_store.g.dart
index 6cd8e900..cc6ee138 100644
--- a/lib/screens/channel/chat/details/chat_details_store.g.dart
+++ b/lib/screens/channel/chat/details/chat_details_store.g.dart
@@ -12,13 +12,16 @@ mixin _$ChatDetailsStore on ChatDetailsStoreBase, Store {
   Computed<Iterable<String>>? _$filteredUsersComputed;
 
   @override
-  Iterable<String> get filteredUsers => (_$filteredUsersComputed ??=
-          Computed<Iterable<String>>(() => super.filteredUsers,
-              name: 'ChatDetailsStoreBase.filteredUsers'))
-      .value;
+  Iterable<String> get filteredUsers =>
+      (_$filteredUsersComputed ??= Computed<Iterable<String>>(
+        () => super.filteredUsers,
+        name: 'ChatDetailsStoreBase.filteredUsers',
+      )).value;
 
-  late final _$roomStateAtom =
-      Atom(name: 'ChatDetailsStoreBase.roomState', context: context);
+  late final _$roomStateAtom = Atom(
+    name: 'ChatDetailsStoreBase.roomState',
+    context: context,
+  );
 
   @override
   ROOMSTATE get roomState {
@@ -33,8 +36,10 @@ mixin _$ChatDetailsStore on ChatDetailsStoreBase, Store {
     });
   }
 
-  late final _$showJumpButtonAtom =
-      Atom(name: 'ChatDetailsStoreBase.showJumpButton', context: context);
+  late final _$showJumpButtonAtom = Atom(
+    name: 'ChatDetailsStoreBase.showJumpButton',
+    context: context,
+  );
 
   @override
   bool get showJumpButton {
@@ -49,8 +54,10 @@ mixin _$ChatDetailsStore on ChatDetailsStoreBase, Store {
     });
   }
 
-  late final _$_filterTextAtom =
-      Atom(name: 'ChatDetailsStoreBase._filterText', context: context);
+  late final _$_filterTextAtom = Atom(
+    name: 'ChatDetailsStoreBase._filterText',
+    context: context,
+  );
 
   String get filterText {
     _$_filterTextAtom.reportRead();
diff --git a/lib/screens/channel/chat/details/chat_modes.dart b/lib/screens/channel/chat/details/chat_modes.dart
index 573c192f..403381dc 100644
--- a/lib/screens/channel/chat/details/chat_modes.dart
+++ b/lib/screens/channel/chat/details/chat_modes.dart
@@ -1,87 +1,183 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/models/irc.dart';
+import 'package:frosty/utils/context_extensions.dart';
 
 class ChatModes extends StatelessWidget {
   final ROOMSTATE roomState;
 
-  const ChatModes({Key? key, required this.roomState}) : super(key: key);
+  const ChatModes({super.key, required this.roomState});
 
   String pluralize(String str, String count) => count == '1' ? str : '${str}s';
 
   @override
   Widget build(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-      children: [
-        Tooltip(
-          preferBelow: false,
-          triggerMode: TooltipTriggerMode.tap,
-          showDuration: const Duration(seconds: 3),
-          message:
-              'Emote-only mode ${roomState.emoteOnly != '0' ? 'on' : 'off'}',
-          child: Icon(
-            roomState.emoteOnly != '0'
-                ? Icons.emoji_emotions_rounded
-                : Icons.emoji_emotions_outlined,
-            color: roomState.emoteOnly != '0' ? Colors.yellow : Colors.grey,
-          ),
-        ),
-        Tooltip(
-          preferBelow: false,
-          triggerMode: TooltipTriggerMode.tap,
-          showDuration: const Duration(seconds: 3),
-          message: roomState.followersOnly == '-1'
-              ? 'Followers-only mode off'
-              : roomState.followersOnly == '0'
-                  ? 'Followers-only mode on'
-                  : 'Followers-only mode on (${roomState.followersOnly} ${pluralize('minute', roomState.followersOnly)})',
-          child: Icon(
-            roomState.followersOnly != '-1'
-                ? Icons.favorite_rounded
-                : Icons.favorite_outline_rounded,
-            color: roomState.followersOnly != '-1' ? Colors.red : Colors.grey,
-          ),
-        ),
-        Tooltip(
-          preferBelow: false,
-          triggerMode: TooltipTriggerMode.tap,
-          showDuration: const Duration(seconds: 3),
-          message:
-              'R9K (unique-chat) mode ${roomState.r9k != '0' ? 'on' : 'off'}',
-          child: Text(
-            'R9K',
-            style: TextStyle(
-              color: roomState.r9k != '0' ? Colors.purple : Colors.grey,
-              fontWeight: FontWeight.w500,
+    return Observer(
+      builder: (context) {
+        final activeModes = <MapEntry<String, Widget>>[];
+
+        // Collect active modes with their labels for sorting
+        if (roomState.emoteOnly != '0') {
+          activeModes.add(
+            MapEntry(
+              'Emote only',
+              _buildModeChip(
+                context: context,
+                icon: Icons.emoji_emotions_outlined,
+                activeIcon: Icons.emoji_emotions_rounded,
+                label: 'Emote only',
+                activeLabel: 'Emote only',
+                isActive: true,
+                activeColor: context.frostyColors.emoteOnly,
+              ),
             ),
-          ),
-        ),
-        Tooltip(
-          preferBelow: false,
-          triggerMode: TooltipTriggerMode.tap,
-          showDuration: const Duration(seconds: 3),
-          message:
-              'Slow mode ${roomState.slowMode != '0' ? 'on (${roomState.slowMode} ${pluralize('second', roomState.slowMode)})' : 'off'}',
-          child: Icon(
-            roomState.slowMode != '0'
-                ? Icons.hourglass_top_rounded
-                : Icons.hourglass_empty_rounded,
-            color: roomState.slowMode != '0' ? Colors.blue : Colors.grey,
-          ),
-        ),
-        Tooltip(
-          preferBelow: false,
-          triggerMode: TooltipTriggerMode.tap,
-          showDuration: const Duration(seconds: 3),
-          message: 'Subs-only mode ${roomState.subMode != '0' ? 'on' : 'off'}',
-          child: Icon(
-            roomState.subMode != '0'
-                ? Icons.monetization_on_rounded
-                : Icons.monetization_on_outlined,
-            color: roomState.subMode != '0' ? Colors.green : Colors.grey,
-          ),
-        ),
-      ],
+          );
+        }
+
+        if (roomState.followersOnly != '-1') {
+          activeModes.add(
+            MapEntry(
+              'Follower only',
+              _buildModeChip(
+                context: context,
+                icon: Icons.favorite_outline_rounded,
+                activeIcon: Icons.favorite_rounded,
+                label: 'Follower only',
+                activeLabel: 'Follower only',
+                isActive: true,
+                activeColor: context.frostyColors.followersOnly,
+                duration: _getFollowersDuration(),
+              ),
+            ),
+          );
+        }
+
+        if (roomState.slowMode != '0') {
+          activeModes.add(
+            MapEntry(
+              'Slow mode',
+              _buildModeChip(
+                context: context,
+                icon: Icons.hourglass_empty_rounded,
+                activeIcon: Icons.hourglass_top_rounded,
+                label: 'Slow mode',
+                activeLabel: 'Slow mode',
+                isActive: true,
+                activeColor: context.frostyColors.slowMode,
+                duration: _getSlowModeDuration(),
+              ),
+            ),
+          );
+        }
+
+        if (roomState.subMode != '0') {
+          activeModes.add(
+            MapEntry(
+              'Sub only',
+              _buildModeChip(
+                context: context,
+                icon: Icons.monetization_on_outlined,
+                activeIcon: Icons.monetization_on_rounded,
+                label: 'Sub only',
+                activeLabel: 'Sub only',
+                isActive: true,
+                activeColor: context.frostyColors.subOnly,
+              ),
+            ),
+          );
+        }
+
+        if (roomState.r9k != '0') {
+          activeModes.add(
+            MapEntry(
+              'Unique mode',
+              _buildModeChip(
+                context: context,
+                icon: Icons.quiz_outlined,
+                activeIcon: Icons.quiz_rounded,
+                label: 'Unique mode',
+                activeLabel: 'Unique mode',
+                isActive: true,
+                activeColor: context.frostyColors.uniqueMode,
+              ),
+            ),
+          );
+        }
+
+        // Sort alphabetically by label
+        activeModes.sort((a, b) => a.key.compareTo(b.key));
+        final activeChips = activeModes.map((entry) => entry.value).toList();
+
+        return Wrap(spacing: 8, runSpacing: -4, children: activeChips);
+      },
+    );
+  }
+
+  String? _getFollowersDuration() {
+    if (roomState.followersOnly == '0') {
+      return null; // No duration for immediate followers
+    }
+    final minutes = int.parse(roomState.followersOnly);
+    if (minutes >= 60) {
+      final hours = minutes ~/ 60;
+      final remainingMinutes = minutes % 60;
+      if (remainingMinutes == 0) {
+        return '${hours}h';
+      } else {
+        return '${hours}h ${remainingMinutes}m';
+      }
+    }
+    return '${minutes}m';
+  }
+
+  String _getSlowModeDuration() {
+    final seconds = int.parse(roomState.slowMode);
+    if (seconds >= 60) {
+      final minutes = seconds ~/ 60;
+      final remainingSeconds = seconds % 60;
+      if (remainingSeconds == 0) {
+        return '${minutes}m';
+      } else {
+        return '${minutes}m ${remainingSeconds}s';
+      }
+    }
+    return '${seconds}s';
+  }
+
+  Widget _buildModeChip({
+    required BuildContext context,
+    required IconData icon,
+    required IconData activeIcon,
+    required String label,
+    required String activeLabel,
+    required bool isActive,
+    required Color activeColor,
+    String? duration,
+  }) {
+    return Chip(
+      avatar: Icon(
+        isActive ? activeIcon : icon,
+        size: 16,
+        color: isActive ? activeColor : null,
+      ),
+      label: duration != null
+          ? Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(isActive ? activeLabel : label),
+                const SizedBox(width: 4),
+                Text(
+                  duration,
+                  style: TextStyle(
+                    color: Theme.of(
+                      context,
+                    ).colorScheme.onSurfaceVariant.withValues(alpha: 0.7),
+                  ),
+                ),
+              ],
+            )
+          : Text(isActive ? activeLabel : label),
+      side: BorderSide.none,
     );
   }
 }
diff --git a/lib/screens/channel/chat/details/chat_users_list.dart b/lib/screens/channel/chat/details/chat_users_list.dart
index 5eabc983..ddaabb1c 100644
--- a/lib/screens/channel/chat/details/chat_users_list.dart
+++ b/lib/screens/channel/chat/details/chat_users_list.dart
@@ -5,8 +5,10 @@ import 'package:frosty/apis/twitch_api.dart';
 import 'package:frosty/screens/channel/chat/details/chat_details_store.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
 import 'package:frosty/screens/channel/chat/widgets/chat_user_modal.dart';
-import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
 import 'package:frosty/widgets/alert_message.dart';
+import 'package:frosty/widgets/animated_scroll_border.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
 import 'package:frosty/widgets/scroll_to_top_button.dart';
 import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
@@ -17,11 +19,11 @@ class ChattersList extends StatefulWidget {
   final String userLogin;
 
   const ChattersList({
-    Key? key,
+    super.key,
     required this.chatDetailsStore,
     required this.chatStore,
     required this.userLogin,
-  }) : super(key: key);
+  });
 
   @override
   State<ChattersList> createState() => _ChattersListState();
@@ -30,155 +32,163 @@ class ChattersList extends StatefulWidget {
 class _ChattersListState extends State<ChattersList> {
   @override
   Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Padding(
-          padding: const EdgeInsets.all(10.0),
-          child: Observer(
-            builder: (context) {
-              return TextField(
-                controller: widget.chatDetailsStore.textController,
-                focusNode: widget.chatDetailsStore.textFieldFocusNode,
-                autocorrect: false,
-                decoration: InputDecoration(
-                  contentPadding: EdgeInsets.zero,
-                  prefixIcon: const Icon(Icons.filter_list_rounded),
-                  hintText: 'Filter chatters',
-                  suffixIcon: widget
-                              .chatDetailsStore.textFieldFocusNode.hasFocus ||
-                          widget.chatDetailsStore.filterText.isNotEmpty
-                      ? IconButton(
-                          tooltip: widget.chatDetailsStore.filterText.isEmpty
-                              ? 'Cancel'
-                              : 'Clear',
-                          onPressed: () {
-                            if (widget.chatDetailsStore.filterText.isEmpty) {
-                              widget.chatDetailsStore.textFieldFocusNode
-                                  .unfocus();
-                            }
-                            widget.chatDetailsStore.textController.clear();
-                          },
-                          icon: const Icon(Icons.close_rounded),
-                        )
-                      : null,
-                ),
-              );
-            },
-          ),
-        ),
-        Expanded(
-          child: RefreshIndicator(
-            onRefresh: () async {
-              HapticFeedback.lightImpact();
-
-              setState(() {});
-            },
-            child: Stack(
-              alignment: AlignmentDirectional.bottomCenter,
-              children: [
-                Observer(
-                  builder: (context) {
-                    return CustomScrollView(
-                      physics: const AlwaysScrollableScrollPhysics(),
-                      controller: widget.chatDetailsStore.scrollController,
-                      slivers: [
-                        if (widget.chatDetailsStore.filterText.isEmpty)
-                          SliverPadding(
-                            padding: const EdgeInsets.only(
-                              left: 10.0,
-                              right: 10.0,
-                              top: 20.0,
-                              bottom: 10.0,
-                            ),
-                            sliver: SliverToBoxAdapter(
-                              child: Text(
-                                '${NumberFormat().format(widget.chatDetailsStore.chatUsers.length)} chatters found',
-                                style: const TextStyle(
-                                  fontWeight: FontWeight.bold,
-                                  fontSize: 18.0,
-                                ),
-                              ),
-                            ),
-                          ),
-                        if (widget.chatDetailsStore.chatUsers.isEmpty)
-                          const SliverFillRemaining(
-                            hasScrollBody: false,
-                            child: Center(
-                              child: AlertMessage(message: 'No chatters found'),
-                            ),
+    return SizedBox(
+      height: MediaQuery.of(context).size.height * 0.8,
+      child: Column(
+        children: [
+          Padding(
+            padding: const EdgeInsets.fromLTRB(12, 0, 12, 8),
+            child: Observer(
+              builder: (context) {
+                return TextField(
+                  controller: widget.chatDetailsStore.textController,
+                  focusNode: widget.chatDetailsStore.textFieldFocusNode,
+                  autocorrect: false,
+                  decoration: InputDecoration(
+                    prefixIcon: const Icon(Icons.filter_list_rounded),
+                    hintText: 'Filter chatters',
+                    suffixIcon:
+                        widget.chatDetailsStore.textFieldFocusNode.hasFocus ||
+                            widget.chatDetailsStore.filterText.isNotEmpty
+                        ? IconButton(
+                            tooltip: widget.chatDetailsStore.filterText.isEmpty
+                                ? 'Cancel'
+                                : 'Clear',
+                            onPressed: () {
+                              if (widget.chatDetailsStore.filterText.isEmpty) {
+                                widget.chatDetailsStore.textFieldFocusNode
+                                    .unfocus();
+                              }
+                              widget.chatDetailsStore.textController.clear();
+                            },
+                            icon: const Icon(Icons.close_rounded),
                           )
-                        else if (widget.chatDetailsStore.filteredUsers.isEmpty)
-                          const SliverFillRemaining(
-                            hasScrollBody: false,
-                            child: Center(
-                              child:
-                                  AlertMessage(message: 'No matching chatters'),
-                            ),
-                          )
-                        else
-                          SliverList(
-                            delegate: SliverChildBuilderDelegate(
-                              (context, index) => InkWell(
-                                child: Padding(
-                                  padding: const EdgeInsets.symmetric(
-                                      horizontal: 10.0, vertical: 5.0),
-                                  child: Text(widget
-                                      .chatDetailsStore.filteredUsers
-                                      .elementAt(index)),
-                                ),
-                                onLongPress: () async {
-                                  HapticFeedback.lightImpact();
-
-                                  final userInfo = await context
-                                      .read<TwitchApi>()
-                                      .getUser(
-                                          headers: context
-                                              .read<AuthStore>()
-                                              .headersTwitch,
-                                          userLogin: widget
-                                              .chatDetailsStore.filteredUsers
-                                              .elementAt(index));
-
-                                  if (!mounted) return;
-
-                                  showModalBottomSheet(
-                                    backgroundColor: Colors.transparent,
-                                    isScrollControlled: true,
-                                    context: context,
-                                    builder: (context) => ChatUserModal(
-                                      chatStore: widget.chatStore,
-                                      username: userInfo.login,
-                                      userId: userInfo.id,
-                                      displayName: userInfo.displayName,
-                                    ),
-                                  );
-                                },
-                              ),
-                              childCount:
-                                  widget.chatDetailsStore.filteredUsers.length,
-                            ),
-                          ),
-                      ],
-                    );
-                  },
-                ),
-                Observer(
-                  builder: (context) => AnimatedSwitcher(
-                    duration: const Duration(milliseconds: 200),
-                    switchInCurve: Curves.easeOut,
-                    switchOutCurve: Curves.easeIn,
-                    child: widget.chatDetailsStore.showJumpButton
-                        ? ScrollToTopButton(
-                            scrollController:
-                                widget.chatDetailsStore.scrollController)
                         : null,
                   ),
-                ),
-              ],
+                );
+              },
             ),
           ),
-        ),
-      ],
+          AnimatedScrollBorder(
+            scrollController: widget.chatDetailsStore.scrollController,
+          ),
+          Expanded(
+            child: RefreshIndicator.adaptive(
+              onRefresh: () async {
+                HapticFeedback.lightImpact();
+
+                setState(() {});
+              },
+              child: Stack(
+                alignment: AlignmentDirectional.bottomCenter,
+                children: [
+                  FrostyScrollbar(
+                    controller: widget.chatDetailsStore.scrollController,
+                    child: Observer(
+                      builder: (context) {
+                        return CustomScrollView(
+                          physics: const AlwaysScrollableScrollPhysics(),
+                          controller: widget.chatDetailsStore.scrollController,
+                          slivers: [
+                            if (widget.chatDetailsStore.filterText.isEmpty)
+                              SliverPadding(
+                                padding: const EdgeInsets.symmetric(
+                                  horizontal: 12,
+                                  vertical: 8,
+                                ),
+                                sliver: SliverToBoxAdapter(
+                                  child: Text(
+                                    '${NumberFormat().format(widget.chatDetailsStore.chatUsers.length)} chatters found',
+                                    style: const TextStyle(
+                                      fontWeight: FontWeight.bold,
+                                      fontSize: 18.0,
+                                    ),
+                                  ),
+                                ),
+                              ),
+                            if (widget.chatDetailsStore.chatUsers.isEmpty)
+                              const SliverFillRemaining(
+                                hasScrollBody: false,
+                                child: AlertMessage(
+                                  message: 'No chatters found',
+                                ),
+                              )
+                            else if (widget
+                                .chatDetailsStore
+                                .filteredUsers
+                                .isEmpty)
+                              const SliverFillRemaining(
+                                hasScrollBody: false,
+                                child: AlertMessage(
+                                  message: 'No matching chatters',
+                                ),
+                              )
+                            else
+                              SliverList.builder(
+                                itemBuilder: (context, index) => InkWell(
+                                  child: Padding(
+                                    padding: const EdgeInsets.symmetric(
+                                      horizontal: 12,
+                                      vertical: 4,
+                                    ),
+                                    child: Text(
+                                      widget.chatDetailsStore.filteredUsers
+                                          .elementAt(index),
+                                    ),
+                                  ),
+                                  onTap: () async {
+                                    final userInfo = await context
+                                        .read<TwitchApi>()
+                                        .getUser(
+                                          userLogin: widget
+                                              .chatDetailsStore
+                                              .filteredUsers
+                                              .elementAt(index),
+                                        );
+
+                                    if (!context.mounted) return;
+
+                                    showModalBottomSheetWithProperFocus(
+                                      isScrollControlled: true,
+                                      context: context,
+                                      builder: (context) => ChatUserModal(
+                                        chatStore: widget.chatStore,
+                                        username: userInfo.login,
+                                        userId: userInfo.id,
+                                        displayName: userInfo.displayName,
+                                      ),
+                                    );
+                                  },
+                                ),
+                                itemCount: widget
+                                    .chatDetailsStore
+                                    .filteredUsers
+                                    .length,
+                              ),
+                          ],
+                        );
+                      },
+                    ),
+                  ),
+                  Observer(
+                    builder: (context) => AnimatedSwitcher(
+                      duration: const Duration(milliseconds: 200),
+                      switchInCurve: Curves.easeOut,
+                      switchOutCurve: Curves.easeIn,
+                      child: widget.chatDetailsStore.showJumpButton
+                          ? ScrollToTopButton(
+                              scrollController:
+                                  widget.chatDetailsStore.scrollController,
+                            )
+                          : null,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
     );
   }
 
diff --git a/lib/screens/channel/chat/emote_menu/emote_menu_panel.dart b/lib/screens/channel/chat/emote_menu/emote_menu_panel.dart
index f6a18f93..20c1f2bc 100644
--- a/lib/screens/channel/chat/emote_menu/emote_menu_panel.dart
+++ b/lib/screens/channel/chat/emote_menu/emote_menu_panel.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:frosty/models/emotes.dart';
 import 'package:frosty/screens/channel/chat/emote_menu/emote_menu_section.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
-import 'package:frosty/widgets/page_view.dart';
+import 'package:frosty/widgets/frosty_page_view.dart';
 
 class EmoteMenuPanel extends StatelessWidget {
   final ChatStore chatStore;
@@ -10,50 +10,61 @@ class EmoteMenuPanel extends StatelessWidget {
   final Map<String, List<Emote>>? twitchEmotes;
 
   const EmoteMenuPanel({
-    Key? key,
+    super.key,
     required this.chatStore,
     this.emotes,
     this.twitchEmotes,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
     if (emotes != null) {
       final globalEmotes = emotes!
-          .where((emote) =>
-              emote.type == EmoteType.bttvGlobal ||
-              emote.type == EmoteType.ffzGlobal ||
-              emote.type == EmoteType.sevenTVGlobal)
+          .where(
+            (emote) =>
+                emote.type == EmoteType.bttvGlobal ||
+                emote.type == EmoteType.ffzGlobal ||
+                emote.type == EmoteType.sevenTVGlobal,
+          )
           .toList();
 
       final channelEmotes = emotes!
-          .where((emote) =>
-              emote.type == EmoteType.bttvChannel ||
-              emote.type == EmoteType.bttvShared ||
-              emote.type == EmoteType.ffzChannel ||
-              emote.type == EmoteType.sevenTVChannel)
+          .where(
+            (emote) =>
+                emote.type == EmoteType.bttvChannel ||
+                emote.type == EmoteType.bttvShared ||
+                emote.type == EmoteType.ffzChannel ||
+                emote.type == EmoteType.sevenTVChannel,
+          )
           .toList();
 
       return FrostyPageView(
-        headers: ['Global', if (channelEmotes.isNotEmpty) 'Channel'],
+        headers: [if (channelEmotes.isNotEmpty) 'Channel', 'Global'],
         children: [
-          EmoteMenuSection(
-            chatStore: chatStore,
-            emotes: globalEmotes,
-          ),
           if (channelEmotes.isNotEmpty)
-            EmoteMenuSection(
-              chatStore: chatStore,
-              emotes: channelEmotes,
-            ),
+            EmoteMenuSection(chatStore: chatStore, emotes: channelEmotes),
+          EmoteMenuSection(chatStore: chatStore, emotes: globalEmotes),
         ],
       );
     } else {
+      final isSubbed = chatStore.userState.subscriber;
+
+      twitchEmotes?.removeWhere(
+        (key, value) => key.toLowerCase() == chatStore.channelName,
+      );
+
       return FrostyPageView(
-        headers:
-            twitchEmotes!.keys.map((header) => header.split(' ')[0]).toList(),
+        headers: twitchEmotes!.keys
+            .map((header) => header.split(' ')[0])
+            .toList(),
         children: twitchEmotes!.entries
-            .map((e) => EmoteMenuSection(chatStore: chatStore, emotes: e.value))
+            .map(
+              (e) => EmoteMenuSection(
+                chatStore: chatStore,
+                emotes: e.value,
+                disabled: e.key.contains('Channel') && !isSubbed,
+              ),
+            )
             .toList(),
       );
     }
diff --git a/lib/screens/channel/chat/emote_menu/emote_menu_section.dart b/lib/screens/channel/chat/emote_menu/emote_menu_section.dart
index 2bb49284..52005c0c 100644
--- a/lib/screens/channel/chat/emote_menu/emote_menu_section.dart
+++ b/lib/screens/channel/chat/emote_menu/emote_menu_section.dart
@@ -1,50 +1,80 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:frosty/constants.dart';
 import 'package:frosty/models/emotes.dart';
+import 'package:frosty/models/irc.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
-import 'package:frosty/screens/settings/stores/settings_store.dart';
-import 'package:frosty/widgets/cached_image.dart';
-import 'package:provider/provider.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
 
-class EmoteMenuSection extends StatelessWidget {
+class EmoteMenuSection extends StatefulWidget {
   final ChatStore chatStore;
   final List<Emote> emotes;
+  final bool disabled;
 
   const EmoteMenuSection({
-    Key? key,
+    super.key,
     required this.chatStore,
     required this.emotes,
-  }) : super(key: key);
+    this.disabled = false,
+  });
 
+  @override
+  State<EmoteMenuSection> createState() => _EmoteMenuSectionState();
+}
+
+class _EmoteMenuSectionState extends State<EmoteMenuSection>
+    with AutomaticKeepAliveClientMixin {
   @override
   Widget build(BuildContext context) {
-    return GridView.builder(
-      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount:
-            MediaQuery.of(context).orientation == Orientation.portrait
-                ? 8
-                : context.read<SettingsStore>().showVideo
-                    ? 6
-                    : 16,
-      ),
-      itemBuilder: (context, index) => InkWell(
-        onTap: () => chatStore.addEmote(emotes[index]),
-        child: Tooltip(
-          message: emotes[index].name,
-          preferBelow: false,
+    super.build(context);
+
+    return MediaQuery.removePadding(
+      context: context,
+      removeTop: true,
+      child: GridView.builder(
+        gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+          crossAxisCount: context.isPortrait
+              ? 8
+              : context.settingsStore.showVideo
+              ? 6
+              : 16,
+        ),
+        padding: EdgeInsets.zero,
+        itemBuilder: (context, index) => InkWell(
+          onTap: widget.disabled
+              ? null
+              : () => widget.chatStore.addEmote(widget.emotes[index]),
+          onLongPress: () {
+            HapticFeedback.lightImpact();
+
+            IRCMessage.showEmoteDetailsBottomSheet(
+              context,
+              emote: widget.emotes[index],
+              launchExternal: widget.chatStore.settings.launchUrlExternal,
+            );
+          },
           child: Padding(
             padding: const EdgeInsets.all(5.0),
             child: Center(
               child: FrostyCachedNetworkImage(
-                imageUrl: emotes[index].url,
-                height: emotes[index].height?.toDouble() ?? defaultEmoteSize,
-                width: emotes[index].width?.toDouble(),
+                imageUrl: widget.emotes[index].url,
+                height:
+                    widget.emotes[index].height?.toDouble() ?? defaultEmoteSize,
+                width: widget.emotes[index].width?.toDouble(),
+                color: widget.disabled
+                    ? const Color.fromRGBO(255, 255, 255, 0.5)
+                    : null,
+                colorBlendMode: widget.disabled ? BlendMode.modulate : null,
               ),
             ),
           ),
         ),
+        itemCount: widget.emotes.length,
       ),
-      itemCount: emotes.length,
     );
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }
diff --git a/lib/screens/channel/chat/emote_menu/recent_emotes_panel.dart b/lib/screens/channel/chat/emote_menu/recent_emotes_panel.dart
index 16b13c9f..f4fb7897 100644
--- a/lib/screens/channel/chat/emote_menu/recent_emotes_panel.dart
+++ b/lib/screens/channel/chat/emote_menu/recent_emotes_panel.dart
@@ -1,81 +1,91 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/constants.dart';
+import 'package:frosty/models/irc.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/utils/context_extensions.dart';
 import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/cached_image.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
 import 'package:provider/provider.dart';
 
 class RecentEmotesPanel extends StatelessWidget {
   final ChatStore chatStore;
 
-  const RecentEmotesPanel({
-    Key? key,
-    required this.chatStore,
-  }) : super(key: key);
+  const RecentEmotesPanel({super.key, required this.chatStore});
 
   @override
   Widget build(BuildContext context) {
-    return CustomScrollView(
-      slivers: [
-        if (chatStore.assetsStore.recentEmotes.isEmpty)
-          const SliverFillRemaining(
-            hasScrollBody: false,
+    return Observer(
+      builder: (context) {
+        if (chatStore.assetsStore.recentEmotes.isEmpty) {
+          return const Center(
             child: AlertMessage(message: 'No recent emotes'),
-          )
-        else
-          SliverGrid(
-            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount:
-                  MediaQuery.of(context).orientation == Orientation.portrait
-                      ? 8
-                      : context.read<SettingsStore>().showVideo
-                          ? 6
-                          : 16,
-            ),
-            delegate: SliverChildBuilderDelegate(
-              (context, index) {
-                final emote = chatStore.assetsStore.recentEmotes[index];
-                final validEmotes = [
-                  ...chatStore.assetsStore.emoteToObject.values,
-                  ...chatStore.assetsStore.userEmoteToObject.values
-                ];
-                final matchingEmotes = validEmotes.where((existingEmote) =>
-                    existingEmote.name == emote.name &&
-                    existingEmote.type == emote.type);
+          );
+        }
 
-                return InkWell(
-                  onTap: matchingEmotes.isNotEmpty
-                      ? () => chatStore.addEmote(emote)
-                      : null,
-                  child: Tooltip(
-                    message: emote.name,
-                    preferBelow: false,
-                    child: Padding(
-                      padding: const EdgeInsets.all(10.0),
-                      child: Center(
-                        child: FrostyCachedNetworkImage(
-                          imageUrl: matchingEmotes.isNotEmpty
-                              ? matchingEmotes.first.url
-                              : emote.url,
-                          color: matchingEmotes.isNotEmpty
-                              ? null
-                              : const Color.fromRGBO(255, 255, 255, 0.5),
-                          colorBlendMode: matchingEmotes.isNotEmpty
-                              ? null
-                              : BlendMode.modulate,
-                          height: emote.height?.toDouble() ?? defaultEmoteSize,
-                          width: emote.width?.toDouble(),
-                        ),
-                      ),
+        return MediaQuery.removePadding(
+          context: context,
+          removeTop: true,
+          child: GridView.builder(
+            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+              crossAxisCount: context.isPortrait
+                  ? 8
+                  : context.read<SettingsStore>().showVideo
+                  ? 6
+                  : 16,
+            ),
+            itemBuilder: (context, index) {
+              final emote = chatStore.assetsStore.recentEmotes[index];
+              final validEmotes = [
+                ...chatStore.assetsStore.emoteToObject.values,
+                ...chatStore.assetsStore.userEmoteToObject.values,
+              ];
+              final matchingEmotes = validEmotes.where(
+                (existingEmote) =>
+                    existingEmote.name == emote.name &&
+                    existingEmote.type == emote.type,
+              );
+
+              return InkWell(
+                onTap: matchingEmotes.isNotEmpty
+                    ? () => chatStore.addEmote(emote)
+                    : null,
+                onLongPress: () {
+                  HapticFeedback.lightImpact();
+
+                  IRCMessage.showEmoteDetailsBottomSheet(
+                    context,
+                    emote: emote,
+                    launchExternal: chatStore.settings.launchUrlExternal,
+                  );
+                },
+                child: Padding(
+                  padding: const EdgeInsets.all(8),
+                  child: Center(
+                    child: FrostyCachedNetworkImage(
+                      imageUrl: matchingEmotes.isNotEmpty
+                          ? matchingEmotes.first.url
+                          : emote.url,
+                      color: matchingEmotes.isNotEmpty
+                          ? null
+                          : const Color.fromRGBO(255, 255, 255, 0.5),
+                      colorBlendMode: matchingEmotes.isNotEmpty
+                          ? null
+                          : BlendMode.modulate,
+                      height:
+                          emote.height?.toDouble() ?? defaultEmoteSize,
+                      width: emote.width?.toDouble(),
                     ),
                   ),
-                );
-              },
-              childCount: chatStore.assetsStore.recentEmotes.length,
-            ),
+                ),
+              );
+            },
+            itemCount: chatStore.assetsStore.recentEmotes.length,
           ),
-      ],
+        );
+      },
     );
   }
 }
diff --git a/lib/screens/channel/chat/stores/banned_user_tracker.dart b/lib/screens/channel/chat/stores/banned_user_tracker.dart
new file mode 100644
index 00000000..83a929b2
--- /dev/null
+++ b/lib/screens/channel/chat/stores/banned_user_tracker.dart
@@ -0,0 +1,31 @@
+/// Tracks which users are currently banned or timed out, learned from IRC
+/// CLEARCHAT events, so the chat can offer an "unban / remove timeout" action
+/// only when it's actually applicable.
+///
+/// Keyed by Twitch user id. A value of null means a permanent ban; a non-null
+/// [DateTime] is when a timeout expires. Pure logic (clock passed in) so it can
+/// be unit-tested without the chat store.
+class BannedUserTracker {
+  final _expiries = <String, DateTime?>{};
+
+  /// Record a permanent ban (CLEARCHAT without a ban-duration).
+  void recordBan(String userId) => _expiries[userId] = null;
+
+  /// Record a timeout (CLEARCHAT with a ban-duration), expiring at [now] + [duration].
+  void recordTimeout(String userId, Duration duration, DateTime now) =>
+      _expiries[userId] = now.add(duration);
+
+  /// Forget a user (e.g. after a successful unban).
+  void clear(String userId) => _expiries.remove(userId);
+
+  /// Whether [userId] is currently banned or within an unexpired timeout.
+  /// Expired timeouts are pruned on read.
+  bool isBannedOrTimedOut(String userId, DateTime now) {
+    if (!_expiries.containsKey(userId)) return false;
+    final expiry = _expiries[userId];
+    if (expiry == null) return true; // permanent ban
+    if (now.isBefore(expiry)) return true; // timeout still active
+    _expiries.remove(userId); // expired — clean up
+    return false;
+  }
+}
diff --git a/lib/screens/channel/chat/stores/chat_assets_store.dart b/lib/screens/channel/chat/stores/chat_assets_store.dart
index dec1329b..6a2187ca 100644
--- a/lib/screens/channel/chat/stores/chat_assets_store.dart
+++ b/lib/screens/channel/chat/stores/chat_assets_store.dart
@@ -6,6 +6,9 @@ import 'package:frosty/apis/seventv_api.dart';
 import 'package:frosty/apis/twitch_api.dart';
 import 'package:frosty/models/badges.dart';
 import 'package:frosty/models/emotes.dart';
+import 'package:frosty/models/shared_chat_session.dart';
+import 'package:frosty/models/user.dart';
+import 'package:frosty/stores/global_assets_store.dart';
 import 'package:mobx/mobx.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
@@ -18,31 +21,61 @@ abstract class ChatAssetsStoreBase with Store {
   final BTTVApi bttvApi;
   final FFZApi ffzApi;
   final SevenTVApi sevenTVApi;
+  final GlobalAssetsStore globalAssetsStore;
 
   /// Contains any custom FFZ mod and vip badges for the channel.
   RoomFFZ? ffzRoomInfo;
 
+  String? sevenTvEmoteSetId;
+
+  /// Tracks shared chat participant channels that we've already loaded assets for.
+  final Set<String> _loadedSharedChannelIds = <String>{};
+
+  /// Optional: Track 7TV set ids for shared chat participants (keyed by broadcaster id).
+  final sharedSevenTvSetIds = ObservableMap<String, String>();
+
+  final channelIdToUserTwitch = ObservableMap<String, UserTwitch>();
+
   @computed
   List<Emote> get bttvEmotes =>
-      _emoteToObject.values.where((emote) => isBTTV(emote)).toList();
+      emoteToObject.values.where((emote) => isBTTV(emote)).toList();
 
   @computed
   List<Emote> get ffzEmotes =>
-      _emoteToObject.values.where((emote) => isFFZ(emote)).toList();
+      emoteToObject.values.where((emote) => isFFZ(emote)).toList();
 
   @computed
   List<Emote> get sevenTVEmotes =>
-      _emoteToObject.values.where((emote) => is7TV(emote)).toList();
-
-  /// The map of badges ids to their object representation.
-  final twitchBadgesToObject = ObservableMap<String, ChatBadge>();
+      emoteToObject.values.where((emote) => is7TV(emote)).toList();
 
   @readonly
   var _recentEmotes = ObservableList<Emote>();
 
-  /// The map of emote words to their image or GIF URL. May be used by anyone in the chat.
+  /// Channel-specific emotes only (not global).
   @readonly
-  var _emoteToObject = <String, Emote>{};
+  var _channelEmoteToObject = ObservableMap<String, Emote>();
+
+  /// Channel-specific Twitch badges (overrides globals).
+  @readonly
+  var _channelTwitchBadges = <String, ChatBadge>{};
+
+  /// Combined emotes: global + channel. Channel emotes take precedence.
+  @computed
+  Map<String, Emote> get emoteToObject {
+    final combined = Map<String, Emote>.from(globalAssetsStore.globalEmoteMap);
+    combined.addAll(_channelEmoteToObject);
+    return combined;
+  }
+
+  /// Combined Twitch badges: global + channel. Channel badges take precedence.
+  @computed
+  Map<String, ChatBadge> get twitchBadgesToObject {
+    final combined = Map<String, ChatBadge>.from(
+      globalAssetsStore.twitchGlobalBadges,
+    );
+    combined.addAll(_channelTwitchBadges);
+    return combined;
+  }
 
   /// The emotes that are "owned" and may be used by the current user.
   @readonly
@@ -54,17 +87,16 @@ abstract class ChatAssetsStoreBase with Store {
   // ignore: prefer_final_fields
   var _userEmoteSectionToEmotes = <String, List<Emote>>{};
 
-  /// The map of user IDs to their FFZ badges.
-  @readonly
-  var _userToFFZBadges = <String, List<ChatBadge>>{};
+  /// The map of user IDs to their FFZ badges (from global store).
+  Map<String, List<ChatBadge>> get userToFFZBadges =>
+      globalAssetsStore.ffzBadges;
 
   /// The map of user IDs to their 7TV badges.
   @readonly
   var _userTo7TVBadges = <String, List<ChatBadge>>{};
 
-  /// The map of user IDs to their BTTV badge.
-  @readonly
-  var _userToBTTVBadges = <String, ChatBadge>{};
+  /// The map of user IDs to their BTTV badge (from global store).
+  Map<String, ChatBadge> get userToBTTVBadges => globalAssetsStore.bttvBadges;
 
   /// Whether or not the emote menu is visible.
   @observable
@@ -93,14 +125,16 @@ abstract class ChatAssetsStoreBase with Store {
     required this.bttvApi,
     required this.ffzApi,
     required this.sevenTVApi,
+    required this.globalAssetsStore,
   });
 
   @action
   Future<void> init() async {
-    // Retrieve the instance that will allow us to retrieve local search history.
+    // Load SharedPreferences for recent emotes.
     final prefs = await SharedPreferences.getInstance();
 
-    _recentEmotes = prefs
+    _recentEmotes =
+        prefs
             .getStringList('recent_emotes')
             ?.map((emoteJson) => Emote.fromJson(jsonDecode(emoteJson)))
             .toList()
@@ -109,89 +143,264 @@ abstract class ChatAssetsStoreBase with Store {
 
     _disposeReaction = autorun((_) {
       if (_recentEmotes.length > 48) _recentEmotes.removeLast();
-      prefs.setStringList('recent_emotes',
-          _recentEmotes.map((emote) => jsonEncode(emote)).toList());
+      prefs.setStringList(
+        'recent_emotes',
+        _recentEmotes.map((emote) => jsonEncode(emote)).toList(),
+      );
     });
   }
 
-  /// Fetches global and channel assets (badges and emotes) and stores them in [_emoteToUrl]
+  /// Fetches channel-specific assets (badges and emotes).
+  /// Global assets are loaded via [globalAssetsStore] and combined automatically.
   @action
   Future<void> assetsFuture({
     required String channelId,
     required Map<String, String> headers,
     required Function onEmoteError,
     required Function onBadgeError,
-  }) =>
-      // Fetch the global and channel's assets (emotes & badges).
-      // Async awaits are placed in a list so they are performed in parallel.
+    bool showTwitchEmotes = true,
+    bool showTwitchBadges = true,
+    bool show7TVEmotes = true,
+    bool showBTTVEmotes = true,
+    bool showBTTVBadges = true,
+    bool showFFZEmotes = true,
+    bool showFFZBadges = true,
+  }) async {
+    // Fetch global (cached) and channel-specific assets in parallel
+    await Future.wait([
+      // Global assets (cached across all tabs - only fetches once)
+      globalAssetsStore.ensureLoaded(
+        showTwitchEmotes: showTwitchEmotes,
+        showTwitchBadges: showTwitchBadges,
+        show7TVEmotes: show7TVEmotes,
+        showBTTVEmotes: showBTTVEmotes,
+        showBTTVBadges: showBTTVBadges,
+        showFFZEmotes: showFFZEmotes,
+        showFFZBadges: showFFZBadges,
+      ),
+      // Channel-specific emotes
       Future.wait([
-        emotesFuture(
-          channelId: channelId,
-          headers: headers,
-          onError: onEmoteError,
-        ),
-        badgesFuture(
-          channelId: channelId,
-          headers: headers,
-          onError: onBadgeError,
-        ),
-      ]);
+            if (showTwitchEmotes)
+              twitchApi
+                  .getEmotesChannel(id: channelId)
+                  .then((emotes) {
+                    _userEmoteSectionToEmotes.update(
+                      'Channel Emotes',
+                      (existingEmoteSet) => [...existingEmoteSet, ...emotes],
+                      ifAbsent: () => emotes.toList(),
+                    );
+                    return emotes;
+                  })
+                  .catchError(onEmoteError),
+            if (show7TVEmotes)
+              sevenTVApi
+                  .getEmotesChannel(id: channelId)
+                  .then((data) {
+                    final (setId, emotes) = data;
+                    sevenTvEmoteSetId = setId;
+                    return emotes;
+                  })
+                  .catchError(onEmoteError),
+            if (showBTTVEmotes)
+              bttvApi.getEmotesChannel(id: channelId).catchError(onEmoteError),
+            if (showFFZEmotes)
+              ffzApi
+                  .getRoomInfo(id: channelId)
+                  .then((ffzRoom) {
+                    final (roomInfo, emotes) = ffzRoom;
+                    ffzRoomInfo = roomInfo;
+                    return emotes;
+                  })
+                  .catchError(onEmoteError),
+          ])
+          .then((assets) => assets.expand((list) => list))
+          .then(
+            (emotes) => _channelEmoteToObject = <String, Emote>{
+              for (final emote in emotes) emote.name: emote,
+            }.asObservable(),
+          ),
+      // Channel badges (Twitch only - FFZ/BTTV badges are global)
+      if (showTwitchBadges)
+        twitchApi
+            .getBadgesChannel(id: channelId)
+            .then((badges) => _channelTwitchBadges = badges)
+            .catchError(onBadgeError),
+    ]);
+  }
 
+  /// Fetch and merge assets for all participants in a shared chat session.
+  /// Safe to call multiple times; only new participant channels will be fetched.
   @action
-  Future<void> emotesFuture({
+  Future<void> fetchSharedChatAssets({
     required String channelId,
     required Map<String, String> headers,
-    required Function onError,
-  }) =>
-      // Parallel futures look ugly, but are worth the performance improvement.
-      // Each future has it's own catchError so that the entire future is not ended on an error.
-      // This will ensure that other futures complete even if one fails.
-      Future.wait([
-        ffzApi.getEmotesGlobal().catchError(onError),
-        bttvApi.getEmotesGlobal().catchError(onError),
-        bttvApi.getEmotesChannel(id: channelId).catchError(onError),
-        twitchApi.getEmotesGlobal(headers: headers).catchError(onError),
-        twitchApi
-            .getEmotesChannel(id: channelId, headers: headers)
-            .catchError(onError),
-        sevenTVApi.getEmotesGlobal().catchError(onError),
-        sevenTVApi.getEmotesChannel(id: channelId).catchError(onError),
-        ffzApi.getRoomInfo(id: channelId).then((ffzRoom) {
-          ffzRoomInfo = ffzRoom.item1;
-          return ffzRoom.item2;
-        }).catchError(onError),
-      ]).then((assets) => assets.expand((list) => list)).then((emotes) =>
-          _emoteToObject = {for (final emote in emotes) emote.name: emote});
+    required Function onEmoteError,
+    required Function onBadgeError,
+    bool showTwitchEmotes = true,
+    bool showTwitchBadges = true,
+    bool show7TVEmotes = true,
+    bool showBTTVEmotes = true,
+    bool showFFZEmotes = true,
+    bool showFFZBadges = true,
+    bool force = false,
+  }) async {
+    if (force) {
+      _loadedSharedChannelIds.clear();
+      sharedSevenTvSetIds.clear();
+    }
 
+    final newParticipantIds = await populateSharedChatParticipants(
+      channelId: channelId,
+      onBadgeError: onBadgeError,
+    );
+
+    if (newParticipantIds.isEmpty) return;
+
+    // Fetch emotes and badges for all new participants in parallel.
+    final futures = <Future<void>>[];
+
+    // Add emote futures for each participant.
+    futures.addAll(
+      newParticipantIds.map(
+        (id) =>
+            _fetchEmotesForChannel(
+              id,
+              onEmoteError: onEmoteError,
+              showTwitchEmotes: showTwitchEmotes,
+              show7TVEmotes: show7TVEmotes,
+              showBTTVEmotes: showBTTVEmotes,
+              showFFZEmotes: showFFZEmotes,
+            ).then((emotes) {
+              for (final emote in emotes) {
+                _channelEmoteToObject[emote.name] = emote;
+              }
+            }),
+      ),
+    );
+
+    // Add badge futures for each participant.
+    if (showTwitchBadges) {
+      futures.addAll(
+        newParticipantIds.map(
+          (id) => _fetchBadgesForChannel(id, onBadgeError: onBadgeError),
+        ),
+      );
+    }
+
+    await Future.wait(futures);
+  }
+
+  /// Whether any shared chat participant assets have been merged in.
+  bool get hasLoadedSharedChatAssets => _loadedSharedChannelIds.isNotEmpty;
+
+  /// Clears tracking of merged shared chat participant assets so that leaving
+  /// and later re-entering a shared chat session re-fetches cleanly. The caller
+  /// must re-fetch this channel's own assets afterwards (which replaces the
+  /// merged emote/badge maps). Must run within a MobX action.
+  void resetSharedChatAssets() {
+    _loadedSharedChannelIds.clear();
+    sharedSevenTvSetIds.clear();
+  }
+
+  /// Load and cache shared chat participants for a broadcaster.
+  /// Returns the list of new participant broadcaster IDs (deduped).
   @action
-  Future<void> badgesFuture({
+  Future<List<String>> populateSharedChatParticipants({
     required String channelId,
-    required Map<String, String> headers,
-    required Function onError,
-  }) =>
-      Future.wait([
-        // Get global badges first, then channel badges to avoid badge conflicts.
-        // We want the channel badges to override the global badges.
-        twitchApi
-            .getBadgesGlobal(headers: headers)
-            .then((badges) => twitchBadgesToObject.addAll(badges))
-            .then((_) => twitchApi
-                .getBadgesChannel(id: channelId, headers: headers)
-                .then((badges) => twitchBadgesToObject.addAll(badges))
-                .catchError(onError)),
-        ffzApi
-            .getBadges()
-            .then((badges) => _userToFFZBadges = badges)
-            .catchError(onError),
+    required Function onBadgeError,
+  }) async {
+    SharedChatSession? sharedSession;
+    try {
+      sharedSession = await twitchApi.getSharedChatSession(
+        broadcasterId: channelId,
+      );
+    } catch (e) {
+      onBadgeError(e);
+      return <String>[];
+    }
+
+    if (sharedSession == null) return <String>[];
+
+    final newParticipantIds = <String>[];
+    for (final participant in sharedSession.participants) {
+      final id = participant.broadcasterId;
+      if (_loadedSharedChannelIds.add(id)) {
+        newParticipantIds.add(id);
+      }
+    }
+
+    // Fetch user profiles concurrently.
+    if (newParticipantIds.isNotEmpty) {
+      await Future.wait(
+        newParticipantIds.map((id) async {
+          try {
+            final user = await twitchApi.getUser(id: id);
+            channelIdToUserTwitch[id] = user;
+          } catch (e) {
+            onBadgeError(e);
+          }
+        }),
+      );
+    }
+
+    return newParticipantIds;
+  }
+
+  Future<List<Emote>> _fetchEmotesForChannel(
+    String id, {
+    required Function onEmoteError,
+    bool showTwitchEmotes = true,
+    bool show7TVEmotes = true,
+    bool showBTTVEmotes = true,
+    bool showFFZEmotes = true,
+  }) async {
+    final futures = <Future<List<Emote>>>[];
+
+    if (showTwitchEmotes) {
+      futures.add(twitchApi.getEmotesChannel(id: id).catchError(onEmoteError));
+    }
+    if (show7TVEmotes) {
+      futures.add(
         sevenTVApi
-            .getBadges()
-            .then((badges) => _userTo7TVBadges = badges)
-            .catchError(onError),
-        bttvApi
-            .getBadges()
-            .then((badges) => _userToBTTVBadges = badges)
-            .catchError(onError),
-      ]);
+            .getEmotesChannel(id: id)
+            .then((data) {
+              final (setId, emotes) = data;
+              sharedSevenTvSetIds[id] = setId;
+              return emotes;
+            })
+            .catchError(onEmoteError),
+      );
+    }
+    if (showBTTVEmotes) {
+      futures.add(bttvApi.getEmotesChannel(id: id).catchError(onEmoteError));
+    }
+    if (showFFZEmotes) {
+      futures.add(
+        ffzApi
+            .getRoomInfo(id: id)
+            .then((ffzRoom) {
+              final (roomInfoIgnored, emotes) = ffzRoom;
+              return emotes;
+            })
+            .catchError(onEmoteError),
+      );
+    }
+
+    final lists = await Future.wait(futures);
+    return lists.expand((e) => e).toList();
+  }
+
+  Future<void> _fetchBadgesForChannel(
+    String id, {
+    required Function onBadgeError,
+  }) async {
+    try {
+      final badges = await twitchApi.getBadgesChannel(id: id);
+      _channelTwitchBadges = {..._channelTwitchBadges, ...badges};
+    } catch (e) {
+      onBadgeError(e);
+    }
+  }
 
   @action
   Future<void> userEmotesFuture({
@@ -199,20 +408,32 @@ abstract class ChatAssetsStoreBase with Store {
     required Map<String, String> headers,
     required Function onError,
   }) async {
-    final userEmotes = await Future.wait(emoteSets.map((setId) => twitchApi
-        .getEmotesSets(setId: setId, headers: headers)
-        .catchError(onError)));
+    final userEmotes = await Future.wait(
+      emoteSets.map(
+        (setId) => twitchApi.getEmotesSets(setId: setId).catchError(onError),
+      ),
+    );
 
     for (final emoteSet in userEmotes) {
       if (emoteSet.isNotEmpty) {
         if (emoteSet.first.type == EmoteType.twitchSub) {
-          final owner = await twitchApi.getUser(
-              id: emoteSet.first.ownerId, headers: headers);
-          _userEmoteSectionToEmotes.update(
-            owner.displayName,
-            (existingEmoteSet) => [...existingEmoteSet, ...emoteSet],
-            ifAbsent: () => emoteSet,
-          );
+          final ownerId = emoteSet.first.ownerId;
+
+          // Check for tuurbo emote sets (e.g., monkey set).
+          if (ownerId == 'twitch') {
+            _userEmoteSectionToEmotes.update(
+              'Global Emotes',
+              (existingEmoteSet) => [...existingEmoteSet, ...emoteSet],
+              ifAbsent: () => emoteSet,
+            );
+          } else {
+            final owner = await twitchApi.getUser(id: ownerId);
+            _userEmoteSectionToEmotes.update(
+              owner.displayName,
+              (existingEmoteSet) => [...existingEmoteSet, ...emoteSet],
+              ifAbsent: () => emoteSet,
+            );
+          }
         } else if (emoteSet.first.type == EmoteType.twitchGlobal) {
           _userEmoteSectionToEmotes.update(
             'Global Emotes',
@@ -234,5 +455,19 @@ abstract class ChatAssetsStoreBase with Store {
     }
   }
 
+  /// Adds a channel emote (e.g., from a live 7TV event).
+  /// Mutates the observable `_channelEmoteToObject` so `emoteToObject` recomputes.
+  @action
+  void addChannelEmote(Emote emote) {
+    _channelEmoteToObject[emote.name] = emote;
+  }
+
+  /// Removes a channel emote by name (e.g., from a live 7TV event).
+  /// Mutates the observable `_channelEmoteToObject` so `emoteToObject` recomputes.
+  @action
+  void removeChannelEmote(String emoteName) {
+    _channelEmoteToObject.remove(emoteName);
+  }
+
   void dispose() => _disposeReaction();
 }
diff --git a/lib/screens/channel/chat/stores/chat_assets_store.g.dart b/lib/screens/channel/chat/stores/chat_assets_store.g.dart
index 322318f5..1c1e1b51 100644
--- a/lib/screens/channel/chat/stores/chat_assets_store.g.dart
+++ b/lib/screens/channel/chat/stores/chat_assets_store.g.dart
@@ -12,27 +12,46 @@ mixin _$ChatAssetsStore on ChatAssetsStoreBase, Store {
   Computed<List<Emote>>? _$bttvEmotesComputed;
 
   @override
-  List<Emote> get bttvEmotes =>
-      (_$bttvEmotesComputed ??= Computed<List<Emote>>(() => super.bttvEmotes,
-              name: 'ChatAssetsStoreBase.bttvEmotes'))
-          .value;
+  List<Emote> get bttvEmotes => (_$bttvEmotesComputed ??= Computed<List<Emote>>(
+    () => super.bttvEmotes,
+    name: 'ChatAssetsStoreBase.bttvEmotes',
+  )).value;
   Computed<List<Emote>>? _$ffzEmotesComputed;
 
   @override
-  List<Emote> get ffzEmotes =>
-      (_$ffzEmotesComputed ??= Computed<List<Emote>>(() => super.ffzEmotes,
-              name: 'ChatAssetsStoreBase.ffzEmotes'))
-          .value;
+  List<Emote> get ffzEmotes => (_$ffzEmotesComputed ??= Computed<List<Emote>>(
+    () => super.ffzEmotes,
+    name: 'ChatAssetsStoreBase.ffzEmotes',
+  )).value;
   Computed<List<Emote>>? _$sevenTVEmotesComputed;
 
   @override
-  List<Emote> get sevenTVEmotes => (_$sevenTVEmotesComputed ??=
-          Computed<List<Emote>>(() => super.sevenTVEmotes,
-              name: 'ChatAssetsStoreBase.sevenTVEmotes'))
-      .value;
+  List<Emote> get sevenTVEmotes =>
+      (_$sevenTVEmotesComputed ??= Computed<List<Emote>>(
+        () => super.sevenTVEmotes,
+        name: 'ChatAssetsStoreBase.sevenTVEmotes',
+      )).value;
+  Computed<Map<String, Emote>>? _$emoteToObjectComputed;
 
-  late final _$_recentEmotesAtom =
-      Atom(name: 'ChatAssetsStoreBase._recentEmotes', context: context);
+  @override
+  Map<String, Emote> get emoteToObject =>
+      (_$emoteToObjectComputed ??= Computed<Map<String, Emote>>(
+        () => super.emoteToObject,
+        name: 'ChatAssetsStoreBase.emoteToObject',
+      )).value;
+  Computed<Map<String, ChatBadge>>? _$twitchBadgesToObjectComputed;
+
+  @override
+  Map<String, ChatBadge> get twitchBadgesToObject =>
+      (_$twitchBadgesToObjectComputed ??= Computed<Map<String, ChatBadge>>(
+        () => super.twitchBadgesToObject,
+        name: 'ChatAssetsStoreBase.twitchBadgesToObject',
+      )).value;
+
+  late final _$_recentEmotesAtom = Atom(
+    name: 'ChatAssetsStoreBase._recentEmotes',
+    context: context,
+  );
 
   ObservableList<Emote> get recentEmotes {
     _$_recentEmotesAtom.reportRead();
@@ -49,26 +68,59 @@ mixin _$ChatAssetsStore on ChatAssetsStoreBase, Store {
     });
   }
 
-  late final _$_emoteToObjectAtom =
-      Atom(name: 'ChatAssetsStoreBase._emoteToObject', context: context);
+  late final _$_channelEmoteToObjectAtom = Atom(
+    name: 'ChatAssetsStoreBase._channelEmoteToObject',
+    context: context,
+  );
 
-  Map<String, Emote> get emoteToObject {
-    _$_emoteToObjectAtom.reportRead();
-    return super._emoteToObject;
+  ObservableMap<String, Emote> get channelEmoteToObject {
+    _$_channelEmoteToObjectAtom.reportRead();
+    return super._channelEmoteToObject;
   }
 
   @override
-  Map<String, Emote> get _emoteToObject => emoteToObject;
+  ObservableMap<String, Emote> get _channelEmoteToObject =>
+      channelEmoteToObject;
 
   @override
-  set _emoteToObject(Map<String, Emote> value) {
-    _$_emoteToObjectAtom.reportWrite(value, super._emoteToObject, () {
-      super._emoteToObject = value;
-    });
+  set _channelEmoteToObject(ObservableMap<String, Emote> value) {
+    _$_channelEmoteToObjectAtom.reportWrite(
+      value,
+      super._channelEmoteToObject,
+      () {
+        super._channelEmoteToObject = value;
+      },
+    );
   }
 
-  late final _$_userEmoteToObjectAtom =
-      Atom(name: 'ChatAssetsStoreBase._userEmoteToObject', context: context);
+  late final _$_channelTwitchBadgesAtom = Atom(
+    name: 'ChatAssetsStoreBase._channelTwitchBadges',
+    context: context,
+  );
+
+  Map<String, ChatBadge> get channelTwitchBadges {
+    _$_channelTwitchBadgesAtom.reportRead();
+    return super._channelTwitchBadges;
+  }
+
+  @override
+  Map<String, ChatBadge> get _channelTwitchBadges => channelTwitchBadges;
+
+  @override
+  set _channelTwitchBadges(Map<String, ChatBadge> value) {
+    _$_channelTwitchBadgesAtom.reportWrite(
+      value,
+      super._channelTwitchBadges,
+      () {
+        super._channelTwitchBadges = value;
+      },
+    );
+  }
+
+  late final _$_userEmoteToObjectAtom = Atom(
+    name: 'ChatAssetsStoreBase._userEmoteToObject',
+    context: context,
+  );
 
   Map<String, Emote> get userEmoteToObject {
     _$_userEmoteToObjectAtom.reportRead();
@@ -86,7 +138,9 @@ mixin _$ChatAssetsStore on ChatAssetsStoreBase, Store {
   }
 
   late final _$_userEmoteSectionToEmotesAtom = Atom(
-      name: 'ChatAssetsStoreBase._userEmoteSectionToEmotes', context: context);
+    name: 'ChatAssetsStoreBase._userEmoteSectionToEmotes',
+    context: context,
+  );
 
   Map<String, List<Emote>> get userEmoteSectionToEmotes {
     _$_userEmoteSectionToEmotesAtom.reportRead();
@@ -99,32 +153,19 @@ mixin _$ChatAssetsStore on ChatAssetsStoreBase, Store {
 
   @override
   set _userEmoteSectionToEmotes(Map<String, List<Emote>> value) {
-    _$_userEmoteSectionToEmotesAtom
-        .reportWrite(value, super._userEmoteSectionToEmotes, () {
-      super._userEmoteSectionToEmotes = value;
-    });
+    _$_userEmoteSectionToEmotesAtom.reportWrite(
+      value,
+      super._userEmoteSectionToEmotes,
+      () {
+        super._userEmoteSectionToEmotes = value;
+      },
+    );
   }
 
-  late final _$_userToFFZBadgesAtom =
-      Atom(name: 'ChatAssetsStoreBase._userToFFZBadges', context: context);
-
-  Map<String, List<ChatBadge>> get userToFFZBadges {
-    _$_userToFFZBadgesAtom.reportRead();
-    return super._userToFFZBadges;
-  }
-
-  @override
-  Map<String, List<ChatBadge>> get _userToFFZBadges => userToFFZBadges;
-
-  @override
-  set _userToFFZBadges(Map<String, List<ChatBadge>> value) {
-    _$_userToFFZBadgesAtom.reportWrite(value, super._userToFFZBadges, () {
-      super._userToFFZBadges = value;
-    });
-  }
-
-  late final _$_userTo7TVBadgesAtom =
-      Atom(name: 'ChatAssetsStoreBase._userTo7TVBadges', context: context);
+  late final _$_userTo7TVBadgesAtom = Atom(
+    name: 'ChatAssetsStoreBase._userTo7TVBadges',
+    context: context,
+  );
 
   Map<String, List<ChatBadge>> get userTo7TVBadges {
     _$_userTo7TVBadgesAtom.reportRead();
@@ -141,26 +182,10 @@ mixin _$ChatAssetsStore on ChatAssetsStoreBase, Store {
     });
   }
 
-  late final _$_userToBTTVBadgesAtom =
-      Atom(name: 'ChatAssetsStoreBase._userToBTTVBadges', context: context);
-
-  Map<String, ChatBadge> get userToBTTVBadges {
-    _$_userToBTTVBadgesAtom.reportRead();
-    return super._userToBTTVBadges;
-  }
-
-  @override
-  Map<String, ChatBadge> get _userToBTTVBadges => userToBTTVBadges;
-
-  @override
-  set _userToBTTVBadges(Map<String, ChatBadge> value) {
-    _$_userToBTTVBadgesAtom.reportWrite(value, super._userToBTTVBadges, () {
-      super._userToBTTVBadges = value;
-    });
-  }
-
-  late final _$showEmoteMenuAtom =
-      Atom(name: 'ChatAssetsStoreBase.showEmoteMenu', context: context);
+  late final _$showEmoteMenuAtom = Atom(
+    name: 'ChatAssetsStoreBase.showEmoteMenu',
+    context: context,
+  );
 
   @override
   bool get showEmoteMenu {
@@ -175,73 +200,150 @@ mixin _$ChatAssetsStore on ChatAssetsStoreBase, Store {
     });
   }
 
-  late final _$initAsyncAction =
-      AsyncAction('ChatAssetsStoreBase.init', context: context);
+  late final _$initAsyncAction = AsyncAction(
+    'ChatAssetsStoreBase.init',
+    context: context,
+  );
 
   @override
   Future<void> init() {
     return _$initAsyncAction.run(() => super.init());
   }
 
-  late final _$userEmotesFutureAsyncAction =
-      AsyncAction('ChatAssetsStoreBase.userEmotesFuture', context: context);
+  late final _$assetsFutureAsyncAction = AsyncAction(
+    'ChatAssetsStoreBase.assetsFuture',
+    context: context,
+  );
 
   @override
-  Future<void> userEmotesFuture(
-      {required List<String> emoteSets,
-      required Map<String, String> headers,
-      required Function onError}) {
-    return _$userEmotesFutureAsyncAction.run(() => super.userEmotesFuture(
-        emoteSets: emoteSets, headers: headers, onError: onError));
+  Future<void> assetsFuture({
+    required String channelId,
+    required Map<String, String> headers,
+    required Function onEmoteError,
+    required Function onBadgeError,
+    bool showTwitchEmotes = true,
+    bool showTwitchBadges = true,
+    bool show7TVEmotes = true,
+    bool showBTTVEmotes = true,
+    bool showBTTVBadges = true,
+    bool showFFZEmotes = true,
+    bool showFFZBadges = true,
+  }) {
+    return _$assetsFutureAsyncAction.run(
+      () => super.assetsFuture(
+        channelId: channelId,
+        headers: headers,
+        onEmoteError: onEmoteError,
+        onBadgeError: onBadgeError,
+        showTwitchEmotes: showTwitchEmotes,
+        showTwitchBadges: showTwitchBadges,
+        show7TVEmotes: show7TVEmotes,
+        showBTTVEmotes: showBTTVEmotes,
+        showBTTVBadges: showBTTVBadges,
+        showFFZEmotes: showFFZEmotes,
+        showFFZBadges: showFFZBadges,
+      ),
+    );
   }
 
-  late final _$ChatAssetsStoreBaseActionController =
-      ActionController(name: 'ChatAssetsStoreBase', context: context);
+  late final _$fetchSharedChatAssetsAsyncAction = AsyncAction(
+    'ChatAssetsStoreBase.fetchSharedChatAssets',
+    context: context,
+  );
 
   @override
-  Future<void> assetsFuture(
-      {required String channelId,
-      required Map<String, String> headers,
-      required Function onEmoteError,
-      required Function onBadgeError}) {
+  Future<void> fetchSharedChatAssets({
+    required String channelId,
+    required Map<String, String> headers,
+    required Function onEmoteError,
+    required Function onBadgeError,
+    bool showTwitchEmotes = true,
+    bool showTwitchBadges = true,
+    bool show7TVEmotes = true,
+    bool showBTTVEmotes = true,
+    bool showFFZEmotes = true,
+    bool showFFZBadges = true,
+    bool force = false,
+  }) {
+    return _$fetchSharedChatAssetsAsyncAction.run(
+      () => super.fetchSharedChatAssets(
+        channelId: channelId,
+        headers: headers,
+        onEmoteError: onEmoteError,
+        onBadgeError: onBadgeError,
+        showTwitchEmotes: showTwitchEmotes,
+        showTwitchBadges: showTwitchBadges,
+        show7TVEmotes: show7TVEmotes,
+        showBTTVEmotes: showBTTVEmotes,
+        showFFZEmotes: showFFZEmotes,
+        showFFZBadges: showFFZBadges,
+        force: force,
+      ),
+    );
+  }
+
+  late final _$populateSharedChatParticipantsAsyncAction = AsyncAction(
+    'ChatAssetsStoreBase.populateSharedChatParticipants',
+    context: context,
+  );
+
+  @override
+  Future<List<String>> populateSharedChatParticipants({
+    required String channelId,
+    required Function onBadgeError,
+  }) {
+    return _$populateSharedChatParticipantsAsyncAction.run(
+      () => super.populateSharedChatParticipants(
+        channelId: channelId,
+        onBadgeError: onBadgeError,
+      ),
+    );
+  }
+
+  late final _$userEmotesFutureAsyncAction = AsyncAction(
+    'ChatAssetsStoreBase.userEmotesFuture',
+    context: context,
+  );
+
+  @override
+  Future<void> userEmotesFuture({
+    required List<String> emoteSets,
+    required Map<String, String> headers,
+    required Function onError,
+  }) {
+    return _$userEmotesFutureAsyncAction.run(
+      () => super.userEmotesFuture(
+        emoteSets: emoteSets,
+        headers: headers,
+        onError: onError,
+      ),
+    );
+  }
+
+  late final _$ChatAssetsStoreBaseActionController = ActionController(
+    name: 'ChatAssetsStoreBase',
+    context: context,
+  );
+
+  @override
+  void addChannelEmote(Emote emote) {
     final _$actionInfo = _$ChatAssetsStoreBaseActionController.startAction(
-        name: 'ChatAssetsStoreBase.assetsFuture');
+      name: 'ChatAssetsStoreBase.addChannelEmote',
+    );
     try {
-      return super.assetsFuture(
-          channelId: channelId,
-          headers: headers,
-          onEmoteError: onEmoteError,
-          onBadgeError: onBadgeError);
+      return super.addChannelEmote(emote);
     } finally {
       _$ChatAssetsStoreBaseActionController.endAction(_$actionInfo);
     }
   }
 
   @override
-  Future<void> emotesFuture(
-      {required String channelId,
-      required Map<String, String> headers,
-      required Function onError}) {
+  void removeChannelEmote(String emoteName) {
     final _$actionInfo = _$ChatAssetsStoreBaseActionController.startAction(
-        name: 'ChatAssetsStoreBase.emotesFuture');
+      name: 'ChatAssetsStoreBase.removeChannelEmote',
+    );
     try {
-      return super.emotesFuture(
-          channelId: channelId, headers: headers, onError: onError);
-    } finally {
-      _$ChatAssetsStoreBaseActionController.endAction(_$actionInfo);
-    }
-  }
-
-  @override
-  Future<void> badgesFuture(
-      {required String channelId,
-      required Map<String, String> headers,
-      required Function onError}) {
-    final _$actionInfo = _$ChatAssetsStoreBaseActionController.startAction(
-        name: 'ChatAssetsStoreBase.badgesFuture');
-    try {
-      return super.badgesFuture(
-          channelId: channelId, headers: headers, onError: onError);
+      return super.removeChannelEmote(emoteName);
     } finally {
       _$ChatAssetsStoreBaseActionController.endAction(_$actionInfo);
     }
@@ -253,7 +355,9 @@ mixin _$ChatAssetsStore on ChatAssetsStoreBase, Store {
 showEmoteMenu: ${showEmoteMenu},
 bttvEmotes: ${bttvEmotes},
 ffzEmotes: ${ffzEmotes},
-sevenTVEmotes: ${sevenTVEmotes}
+sevenTVEmotes: ${sevenTVEmotes},
+emoteToObject: ${emoteToObject},
+twitchBadgesToObject: ${twitchBadgesToObject}
     ''';
   }
 }
diff --git a/lib/screens/channel/chat/stores/chat_interaction_pause.dart b/lib/screens/channel/chat/stores/chat_interaction_pause.dart
new file mode 100644
index 00000000..0d3456a9
--- /dev/null
+++ b/lib/screens/channel/chat/stores/chat_interaction_pause.dart
@@ -0,0 +1,54 @@
+import 'package:flutter/gestures.dart';
+
+/// Decides whether the chat message list should hold buffered messages back
+/// because the user is *holding* a message (a long-press candidate).
+///
+/// Flushing buffered messages grows the reverse list and pushes the pressed
+/// message up and out of the build range, which disposes its gesture recognizer
+/// mid-press and cancels the long-press. Freezing the list while a finger rests
+/// on a message keeps it under the finger so the press lands.
+///
+/// Crucially, the freeze applies *only to a stationary finger*. The moment a
+/// pointer travels past [kTouchSlop] it's a scroll, not a hold, so the chat
+/// resumes flowing — otherwise freezing then batch-releasing mid-scroll makes
+/// scrolling feel like it gets cancelled. This is the same threshold the
+/// long-press recognizer uses to tell a hold from a drag.
+///
+/// Tracks pointers individually so multi-touch resolves correctly: the chat
+/// only resumes once every stationary pointer has lifted or started moving.
+class ChatInteractionPause {
+  /// Down position of each active pointer, by pointer id.
+  final _origins = <int, Offset>{};
+
+  /// Pointers that have moved past the slop this gesture — i.e. are scrolling.
+  /// Once a pointer is here it stays until it lifts, so a drag never flips back
+  /// to a hold mid-gesture.
+  final _scrolling = <int>{};
+
+  /// Whether any pointer is down and still stationary (a long-press candidate).
+  bool get isPaused => _origins.length > _scrolling.length;
+
+  /// Register a pointer touching down at [position].
+  void pointerDown(int pointer, Offset position) {
+    _origins[pointer] = position;
+  }
+
+  /// Update a pointer's position; flags it as scrolling once it passes the slop.
+  void pointerMove(int pointer, Offset position) {
+    final origin = _origins[pointer];
+    if (origin == null) return;
+    if ((position - origin).distance > kTouchSlop) _scrolling.add(pointer);
+  }
+
+  /// Register a pointer lifting off (or being cancelled).
+  void pointerUp(int pointer) {
+    _origins.remove(pointer);
+    _scrolling.remove(pointer);
+  }
+
+  /// Force-clear all active pointers (e.g. on dispose or tab switch).
+  void reset() {
+    _origins.clear();
+    _scrolling.clear();
+  }
+}
diff --git a/lib/screens/channel/chat/stores/chat_store.dart b/lib/screens/channel/chat/stores/chat_store.dart
index 493aebd6..e7baa1c1 100644
--- a/lib/screens/channel/chat/stores/chat_store.dart
+++ b/lib/screens/channel/chat/stores/chat_store.dart
@@ -1,15 +1,24 @@
 import 'dart:async';
+import 'dart:convert';
 
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:flutter/material.dart';
-import 'package:frosty/constants.dart';
+import 'package:flutter/services.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/models/badges.dart';
 import 'package:frosty/models/emotes.dart';
+import 'package:frosty/models/events.dart';
 import 'package:frosty/models/irc.dart';
 import 'package:frosty/screens/channel/chat/details/chat_details_store.dart';
+import 'package:frosty/screens/channel/chat/stores/banned_user_tracker.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_assets_store.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_interaction_pause.dart';
+import 'package:frosty/screens/channel/chat/stores/shared_chat_bubble_state.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/utils.dart';
 import 'package:mobx/mobx.dart';
-import 'package:wakelock/wakelock.dart';
+import 'package:web_socket_channel/io.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
 part 'chat_store.g.dart';
@@ -21,9 +30,84 @@ abstract class ChatStoreBase with Store {
   /// The total maximum amount of messages in chat.
   static const _messageLimit = 5000;
 
-  /// The maximum ammount of messages to render when autoscroll is enabled.
+  /// The maximum amount of messages to render when autoscroll is enabled.
   static const _renderMessageLimit = 100;
 
+  /// IRC commands that should bypass chat delay.
+  /// These are confirmations/state updates rather than chat messages to sync.
+  static const _delayBypassCommands = {
+    'USERSTATE',
+    'GLOBALUSERSTATE',
+    'ROOMSTATE',
+    'NOTICE', // Rejection notices need immediate feedback
+  };
+
+  /// NOTICE msg-id values indicating message was rejected (from Twitch IRC docs).
+  /// https://dev.twitch.tv/docs/irc/msg-id/
+  static const _rejectionMsgIds = {
+    // Rate limiting
+    'msg_slowmode',
+    'msg_ratelimit',
+    'msg_duplicate',
+    // User restrictions
+    'msg_banned',
+    'msg_timedout',
+    'msg_channel_blocked',
+    'msg_suspended',
+    // Room mode restrictions
+    'msg_emoteonly',
+    'msg_subsonly',
+    'msg_followersonly',
+    'msg_followersonly_followed',
+    'msg_followersonly_zero',
+    'msg_r9k',
+    // Verification requirements
+    'msg_verified_email',
+    'msg_requires_verified_phone_number',
+    // Moderation
+    'msg_rejected',
+    'msg_rejected_mandatory',
+    'msg_bad_characters',
+  };
+
+  /// Fallback height used to pad the message list for one frame, until the
+  /// real bottom bar reports its measured height via [setBottomBarHeight].
+  static const _baseBottomBarHeight = 68.0;
+
+  /// Server-initiated graceful reconnect notice. Twitch sends this untagged
+  /// before maintenance so clients can re-establish ahead of the close.
+  static const _serverReconnectNotice = ':tmi.twitch.tv RECONNECT';
+
+  /// Muted words pre-normalized (trimmed, lowercased, empties dropped) by a
+  /// reaction on the setting — avoids re-normalizing on every message.
+  var _normalizedMutedWords = <String>[];
+
+  /// Whether a single IRC [line] should bypass the chat delay and be handled
+  /// immediately. Displayable chat content (PRIVMSG/USERNOTICE and the
+  /// moderation CLEARCHAT/CLEARMSG) is delayed, so it stays in sync with the
+  /// delayed video. Everything else is handled at once: control/state messages
+  /// (USERSTATE/ROOMSTATE/GLOBALUSERSTATE), NOTICE (so a send rejection surfaces
+  /// immediately instead of one chat-delay later), the reconnect notice, and
+  /// any untagged server line (PING keepalives, CAP, JOIN, the welcome banner)
+  /// — delaying those would stall the send-ack, drop the PONG, or never start
+  /// the buffer drain.
+  bool _lineShouldBypassDelay(String line) {
+    if (line.isEmpty || line == _serverReconnectNotice) return true;
+    // Displayable chat content is always IRCv3-tagged; an untagged line is
+    // never delayed.
+    if (!line.startsWith('@')) return true;
+    final parts = line.split(' ');
+    return parts.length >= 3 && _delayBypassCommands.contains(parts[2]);
+  }
+
+  Duration get _chatDelay =>
+      Duration(milliseconds: (settings.effectiveChatDelay * 1000).round());
+
+  bool get _hasActiveChatDelay =>
+      settings.showVideo && _chatDelay > Duration.zero;
+
+  final TwitchApi twitchApi;
+
   /// The amount of messages to free (remove) when the [_messageLimit] is reached.
   final _messagesToRemove = (_messageLimit * 0.2).toInt();
 
@@ -45,18 +129,39 @@ abstract class ChatStoreBase with Store {
   /// The channel's display name to show on widgets.
   final String displayName;
 
+  var _shouldDisconnect = false;
+
   /// The Twitch IRC WebSocket channel.
   WebSocketChannel? _channel;
 
   /// The subscription that handles the WebSocket connection.
   StreamSubscription? _channelListener;
 
+  WebSocketChannel? _sevenTVChannel;
+
+  /// The subscription that handles the 7TV WebSocket connection.
+  StreamSubscription? _sevenTVChannelListener;
+
+  static const _maxRetries = 5;
+
+  /// Ping interval for both the IRC and 7TV WebSocket sockets. Catches
+  /// zombie connections (silent network changes, OS suspends) without
+  /// waking the radio every 15s. Twitch's own recommended keepalive tops
+  /// out at 600s; community libs (e.g. dank-twitch-irc) sit around 30s.
+  static const _pingInterval = Duration(seconds: 60);
+
   // The retry counter for exponential backoff.
   var _retries = 0;
 
   // The current time to wait between retries for exponential backoff.
   var _backoffTime = 0;
 
+  // Reference to the reconnect message for in-place updates.
+  IRCMessage? _reconnectMessage;
+
+  // Timestamp when reconnection started, for calculating elapsed time.
+  DateTime? _reconnectStartTime;
+
   /// The scroll controller that controls auto-scroll and resume-scroll behavior.
   final scrollController = ScrollController();
 
@@ -72,30 +177,84 @@ abstract class ChatStoreBase with Store {
   /// Requested message to be sent by the user. Will only be sent on receipt of a USERNOTICE command.
   IRCMessage? toSend;
 
+  /// Raw text of the most recent outgoing message, retained until the send is
+  /// confirmed. Lets the USERSTATE handler build the local echo even when the
+  /// message was sent before this session's first USERSTATE arrived (so
+  /// [toSend] couldn't be built up front).
+  String? _pendingSentMessageText;
+
   /// The list of reaction disposer functions that will be used later when disposing.
   final reactions = <ReactionDisposer>[];
 
   /// The periodic timer used for batching chat message re-renders.
-  late final Timer _messageBufferTimer;
+  Timer? _messageBufferTimer;
 
   /// The list of chat messages to add once autoscroll is resumed.
   /// This is used as an optimization to prevent the list from being updated/shifted while the user is scrolling.
-  final _messageBuffer = <IRCMessage>[];
+  final messageBuffer = ObservableList<IRCMessage>();
+
+  /// Pending delayed IRC payloads waiting to be rendered.
+  final _pendingChatCallbacks = <_DelayedCallback>[];
+
+  /// Pending delayed 7TV payloads waiting to be rendered.
+  final _pendingSevenTVCallbacks = <_DelayedCallback>[];
+
+  /// The set of message IDs that have been revealed by the user (for deleted messages).
+  final revealedMessageIds = ObservableSet<String>();
+
+  /// User-driven spotlight/hide selections for shared chat participant
+  /// channels. See [SharedChatBubbleState].
+  final sharedChatBubbles = SharedChatBubbleState();
+
+  @action
+  void revealMessage(String id) {
+    revealedMessageIds.add(id);
+  }
+
+  /// Whether a message from [sourceChannelId] should render faded.
+  ///
+  /// [overrideCurrentChannelId] is set only when rendering the manual
+  /// "merged mode" view (multiple manually-added tabs interleaved), which
+  /// always fades non-active-tab messages, gated by [focusCurrentChannel].
+  /// Otherwise this is the normal single-connection view, where native
+  /// Twitch shared chat defaults to unfaded and only fades once the user
+  /// spotlights a participant channel via a chat bubble — an explicit
+  /// action that isn't gated by that setting.
+  bool shouldFadeMessage({
+    required String? sourceChannelId,
+    required String? overrideCurrentChannelId,
+  }) {
+    if (sourceChannelId == null) return false;
+
+    final currentChannelId = overrideCurrentChannelId ?? channelId;
+    if (sourceChannelId == currentChannelId) return false;
+
+    final isMerged = overrideCurrentChannelId != null;
+    if (isMerged) return settings.focusCurrentChannel;
+
+    return sharedChatBubbles.focusedChannelIds.isNotEmpty &&
+        !sharedChatBubbles.isFocused(sourceChannelId);
+  }
 
   /// Timer used for dismissing the notification.
   Timer? _notificationTimer;
 
+  /// Timer used for resetting the sending state if no acknowledgment is received.
+  Timer? _sendingTimeoutTimer;
+
+  /// Timer used for updating the chat delay countdown message.
+  Timer? _chatDelayCountdownTimer;
+
+  /// Reference to the current countdown message for direct updates (avoids O(n) search).
+  IRCMessage? _countdownMessage;
+
+  /// Tracks whether the initial chat delay sync has completed for the current session.
+  /// Prevents the countdown from re-appearing when latency updates arrive after initial sync.
+  bool _chatDelaySyncCompleted = false;
+
   /// The current timer for the sleep timer if active.
   Timer? sleepTimer;
 
-  /// The amount of hours the sleep timer is set to.
-  @observable
-  var sleepHours = 0;
-
-  /// The amount of minutes the sleep timer is set to.
-  @observable
-  var sleepMinutes = 0;
-
   /// The time remaining for the sleep timer.
   @observable
   var timeRemaining = const Duration();
@@ -112,21 +271,54 @@ abstract class ChatStoreBase with Store {
   @computed
   List<IRCMessage> get renderMessages {
     // If autoscroll is disabled, render ALL messages in chat.
-    // The second condition is to prevent an out of index error with sublist.
-    if (!_autoScroll || _messages.length < _renderMessageLimit) {
-      return _messages;
-    }
+    // The second condition is to prevent an out-of-range index error with sublist.
+    final base = (!_autoScroll || _messages.length < _renderMessageLimit)
+        ? _messages
+        : _messages.sublist(_messages.length - _renderMessageLimit);
 
-    // When autoscroll is enabled, only show the first [_renderMessageLimit] messages.
-    // This will improve performance by only rendering a limited amount of messages
-    // instead of the entire history at all times.
-    return _messages.sublist(_messages.length - _renderMessageLimit);
+    // Filter out messages from shared chat participant channels the user
+    // has hidden. Short-circuit when nothing is hidden (the common case).
+    if (sharedChatBubbles.hiddenChannelIds.isEmpty) return base;
+    return base.where((message) {
+      final sourceChannelId = message.sourceChannelId;
+      return sourceChannelId == null ||
+          !sharedChatBubbles.hiddenChannelIds.contains(sourceChannelId);
+    }).toList();
   }
 
   /// If the chat should automatically scroll/jump to the latest message.
   @readonly
   var _autoScroll = true;
 
+  /// Tracks users banned/timed-out via CLEARCHAT so the moderation menu only
+  /// offers an unban action when it applies.
+  final _bannedUserTracker = BannedUserTracker();
+
+  /// Whether [userId] is currently banned or within an unexpired timeout
+  /// (as observed from CLEARCHAT in this session).
+  bool isUserBannedOrTimedOut(String userId) =>
+      _bannedUserTracker.isBannedOrTimedOut(userId, DateTime.now());
+
+  /// Forget a user's ban state after a successful unban so the action hides.
+  void clearUserBanState(String userId) => _bannedUserTracker.clear(userId);
+
+  /// Freezes the rendered list while the user is touching it, so a long-press
+  /// target can't scroll out from under the finger and get its gesture
+  /// recognizer disposed mid-press. Plain field (not observable): it only gates
+  /// the periodic [addMessages] flush, which reads it each 200ms tick.
+  final _interactionPause = ChatInteractionPause();
+
+  /// Hooks for the message list to report touch start/move/end (see [Chat]).
+  void onMessageListPointerDown(int pointer, Offset position) =>
+      _interactionPause.pointerDown(pointer, position);
+  void onMessageListPointerMove(int pointer, Offset position) =>
+      _interactionPause.pointerMove(pointer, position);
+  void onMessageListPointerUp(int pointer) =>
+      _interactionPause.pointerUp(pointer);
+
+  @readonly
+  var _inputText = '';
+
   @readonly
   var _showSendButton = false;
 
@@ -136,6 +328,23 @@ abstract class ChatStoreBase with Store {
   @readonly
   var _showMentionAutocomplete = false;
 
+  /// Whether the chat is currently in shared chat mode (based on source-room-id tag presence).
+  @readonly
+  var _isInSharedChatMode = false;
+
+  /// Whether we're waiting for server acknowledgment of a sent message.
+  @readonly
+  var _isWaitingForAck = false;
+
+  /// Whether the chat WebSocket is currently connected.
+  @readonly
+  var _isConnected = false;
+
+  /// Whether we've successfully connected at least once (to distinguish
+  /// "connecting" from "disconnected" in the UI).
+  @readonly
+  var _hasConnected = false;
+
   /// The logged-in user's appearance in chat.
   @readonly
   var _userState = const USERSTATE();
@@ -143,7 +352,62 @@ abstract class ChatStoreBase with Store {
   @observable
   var expandChat = false;
 
+  @observable
+  IRCMessage? replyingToMessage;
+
+  /// Emotes matching the current autocomplete search term.
+  @computed
+  List<Emote> get matchingEmotes {
+    if (!_showEmoteAutocomplete) return const [];
+    final searchTerm = _inputText.split(' ').last.toLowerCase();
+    if (searchTerm.isEmpty) return const [];
+
+    return [
+      ...assetsStore.userEmoteToObject.values,
+      ...assetsStore.bttvEmotes,
+      ...assetsStore.ffzEmotes,
+      ...assetsStore.sevenTVEmotes,
+    ].where((emote) => emote.name.toLowerCase().contains(searchTerm)).toList();
+  }
+
+  /// Chatters matching the current mention autocomplete search term.
+  @computed
+  List<String> get matchingChatters {
+    if (!_showMentionAutocomplete) return const [];
+    final searchTerm = _inputText
+        .split(' ')
+        .last
+        .replaceFirst('@', '')
+        .toLowerCase();
+    return chatDetailsStore.chatUsers
+        .where((chatter) => chatter.contains(searchTerm))
+        .toList();
+  }
+
+  /// Measured height of the rendered bottom bar (input plus any reply or
+  /// autocomplete overlays). The bar reports this via [setBottomBarHeight] so
+  /// the message list's bottom padding tracks the bar's *true* height —
+  /// including multi-line input growth and OS text scaling, which fixed
+  /// per-overlay constants silently undercount.
+  final _measuredBottomBarHeight = Observable<double?>(null);
+
+  /// Current bottom bar height, used to dynamically pad the message list so the
+  /// bar never overlaps messages. Falls back to the single-line base height
+  /// until the real bar reports its first measurement.
+  @computed
+  double get bottomBarHeight =>
+      _measuredBottomBarHeight.value ?? _baseBottomBarHeight;
+
+  /// Reports the bar's real rendered height. Sub-pixel changes are ignored to
+  /// avoid needless message-list relayouts.
+  void setBottomBarHeight(double height) {
+    final current = _measuredBottomBarHeight.value;
+    if (current != null && (current - height).abs() < 0.5) return;
+    runInAction(() => _measuredBottomBarHeight.value = height);
+  }
+
   ChatStoreBase({
+    required this.twitchApi,
     required this.auth,
     required this.chatDetailsStore,
     required this.assetsStore,
@@ -152,34 +416,94 @@ abstract class ChatStoreBase with Store {
     required this.channelId,
     required this.displayName,
   }) {
-    // Enable wakelock to prevent the chat from sleeping.
-    if (settings.chatOnlyPreventSleep) Wakelock.enable();
-
     // Create a reaction that will reconnect to chat when logging in or out.
     // Closing the channel will trigger a reconnect with the new credentials.
+    reactions.add(
+      reaction((_) => auth.isLoggedIn, (_) => _channel?.sink.close(1000)),
+    );
+
+    // Normalize muted words once per settings change instead of per message
+    // — the filter runs in the IRC hot path (50+ msgs/s in busy channels).
+    reactions.add(
+      reaction((_) => settings.mutedWords.toList(), (List<String> words) {
+        _normalizedMutedWords = words
+            .map((word) => word.trim().toLowerCase())
+            .where((word) => word.isNotEmpty)
+            .toList();
+      }, fireImmediately: true),
+    );
+
     reactions.add(
       reaction(
-        (_) => auth.isLoggedIn,
-        (_) => _channel?.sink.close(1001),
+        (_) => [
+          settings.showTwitchEmotes,
+          settings.showTwitchBadges,
+          settings.show7TVEmotes,
+          settings.showBTTVEmotes,
+          settings.showBTTVBadges,
+          settings.showFFZEmotes,
+          settings.showFFZBadges,
+        ],
+        (_) {
+          if (!settings.show7TVEmotes) {
+            _sevenTVChannel?.sink.close(1000);
+          }
+
+          getAssets().then((_) {
+            if (settings.show7TVEmotes) {
+              final emoteSetId = assetsStore.sevenTvEmoteSetId;
+              if (emoteSetId != null) {
+                listenToSevenTVEmoteSet(emoteSetId: emoteSetId);
+              }
+            }
+          });
+        },
       ),
     );
 
-    // Create a timer that will add messages from the buffer every 200 milliseconds.
-    _messageBufferTimer = Timer.periodic(
-        const Duration(milliseconds: 200), (timer) => addMessages());
+    // Start chat delay countdown when toggling video on, cancel when off
+    reactions.add(
+      reaction((_) => settings.showVideo, (showVideo) {
+        if (showVideo && settings.effectiveChatDelay > 0) {
+          _startChatDelayCountdown();
+        } else if (!showVideo) {
+          _flushPendingDelayedCallbacks();
+          _cancelChatDelayCountdown();
+          _chatDelaySyncCompleted = false;
+        }
+      }),
+    );
+
+    // Start chat delay countdown when chatDelay is set (for auto sync mode)
+    // Cancel countdown if delay becomes 0
+    reactions.add(
+      reaction((_) => settings.effectiveChatDelay, (chatDelay) {
+        if (chatDelay == 0) {
+          _flushPendingDelayedCallbacks();
+          _cancelChatDelayCountdown();
+          _chatDelaySyncCompleted = false;
+        } else if (settings.autoSyncChatDelay &&
+            settings.showVideo &&
+            chatDelay > 0 &&
+            !_chatDelaySyncCompleted) {
+          _startChatDelayCountdown();
+        }
+      }),
+    );
 
     assetsStore.init();
 
-    _messageBuffer
-        .add(IRCMessage.createNotice(message: 'Connecting to chat...'));
+    _messages.add(IRCMessage.createNotice(message: 'Connecting to chat...'));
 
-    if (settings.chatDelay > 0) {
-      _messageBuffer.add(IRCMessage.createNotice(
-          message:
-              'Waiting ${settings.chatDelay.toInt()} ${settings.chatDelay == 1.0 ? 'second' : 'seconds'} due to message delay setting...'));
+    if (settings.showRecentMessages) {
+      getRecentMessage().then((_) => connectToChat());
+    } else {
+      connectToChat();
     }
 
-    connectToChat();
+    // Refresh which channels the user moderates on entry so mod actions reflect
+    // status granted/revoked since login. Fire-and-forget, like blocked users.
+    if (auth.isLoggedIn) auth.user.refreshModeratedChannels();
 
     // Tell the scrollController to determine when auto-scroll should be enabled or disabled.
     scrollController.addListener(() {
@@ -204,18 +528,86 @@ abstract class ChatStoreBase with Store {
 
     // Add a listener to the textfield that will show/hide the autocomplete bar if focused.
     // Will also rebuild the autocomplete bar when typing, refreshing the results as the user types.
-    textController.addListener(() => _showEmoteAutocomplete =
-        !_showMentionAutocomplete &&
-            textFieldFocusNode.hasFocus &&
-            textController.text.split(' ').last.isNotEmpty);
-
     textController.addListener(() {
+      _inputText = textController.text;
+
+      _showEmoteAutocomplete =
+          !_showMentionAutocomplete &&
+          textFieldFocusNode.hasFocus &&
+          textController.text.split(' ').last.isNotEmpty;
+
       _showSendButton = textController.text.isNotEmpty;
-      _showMentionAutocomplete = textFieldFocusNode.hasFocus &&
+      _showMentionAutocomplete =
+          textFieldFocusNode.hasFocus &&
           textController.text.split(' ').last.startsWith('@');
     });
   }
 
+  void _enqueueDelayedCallback(
+    List<_DelayedCallback> queue,
+    void Function() callback,
+  ) {
+    queue.add(
+      _DelayedCallback(
+        releaseAt: DateTime.now().add(_chatDelay),
+        callback: callback,
+      ),
+    );
+  }
+
+  void _flushDueDelayedCallbacks() {
+    _flushDueDelayedCallbacksForQueue(_pendingChatCallbacks);
+    _flushDueDelayedCallbacksForQueue(_pendingSevenTVCallbacks);
+  }
+
+  void _flushDueDelayedCallbacksForQueue(List<_DelayedCallback> queue) {
+    if (queue.isEmpty) return;
+
+    final now = DateTime.now();
+    final readyCallbacks = <_DelayedCallback>[];
+
+    queue.removeWhere((delayedCallback) {
+      final isReady = !delayedCallback.releaseAt.isAfter(now);
+      if (isReady) {
+        readyCallbacks.add(delayedCallback);
+      }
+      return isReady;
+    });
+
+    for (final delayedCallback in readyCallbacks) {
+      delayedCallback.callback();
+    }
+  }
+
+  void _flushPendingDelayedCallbacks() {
+    _flushPendingDelayedCallbacksForQueue(_pendingChatCallbacks);
+    _flushPendingDelayedCallbacksForQueue(_pendingSevenTVCallbacks);
+  }
+
+  void _flushPendingDelayedCallbacksForQueue(List<_DelayedCallback> queue) {
+    if (queue.isEmpty) return;
+
+    final pendingCallbacks = List<_DelayedCallback>.from(queue);
+    queue.clear();
+
+    for (final delayedCallback in pendingCallbacks) {
+      delayedCallback.callback();
+    }
+  }
+
+  void _clearPendingDelayedCallbacks({
+    bool clearChat = true,
+    bool clearSevenTV = true,
+  }) {
+    if (clearChat) {
+      _pendingChatCallbacks.clear();
+    }
+
+    if (clearSevenTV) {
+      _pendingSevenTVCallbacks.clear();
+    }
+  }
+
   /// Handle and process the provided string-representation of the IRC data.
   ///
   /// If a message, parses the IRC data into an [IRCMessage] and handles it based on the [Command].
@@ -226,9 +618,29 @@ abstract class ChatStoreBase with Store {
     // To account for this, split by CRLF, then loop and process each message.
     for (final message in data.trimRight().split('\r\n')) {
       // debugPrint('$message\n');
+      if (message == _serverReconnectNotice) {
+        // Twitch is about to close the socket for maintenance — close it
+        // ourselves so the existing onDone path reconnects with no backoff
+        // (first retry is immediate) instead of waiting for the server to
+        // drop us mid-message.
+        _channel?.sink.close(1000);
+        continue;
+      }
+
       if (message.startsWith('@')) {
-        final parsedIRCMessage =
-            IRCMessage.fromString(message, userLogin: auth.user.details?.login);
+        // Parse defensively: a single malformed message must never abort the
+        // loop, or one bad frame would drop every other message batched with
+        // it (e.g. an entire recent-messages backlog). Skip and keep going.
+        final IRCMessage parsedIRCMessage;
+        try {
+          parsedIRCMessage = IRCMessage.fromString(
+            message,
+            userLogin: auth.user.details?.login,
+          );
+        } catch (e) {
+          debugPrint('Failed to parse IRC message: $e');
+          continue;
+        }
 
         if (parsedIRCMessage.user != null) {
           chatDetailsStore.chatUsers.add(parsedIRCMessage.user!);
@@ -238,43 +650,153 @@ abstract class ChatStoreBase with Store {
         if (!_userState.mod &&
             channelName != auth.user.details?.login &&
             auth.user.blockedUsers
-                .where((blockedUser) =>
-                    blockedUser.userLogin == parsedIRCMessage.user)
+                .where(
+                  (blockedUser) =>
+                      blockedUser.userLogin == parsedIRCMessage.user,
+                )
                 .isNotEmpty) {
           continue;
         }
 
+        // Filter messages containing any muted words. Must use `continue`
+        // (not `return`) — a single IRC frame can batch many messages, and
+        // returning would drop the rest of the frame with the matched one.
+        if (parsedIRCMessage.message != null &&
+            _normalizedMutedWords.isNotEmpty) {
+          final msg = parsedIRCMessage.message!.toLowerCase();
+          final words = settings.matchWholeWord ? msg.split(' ') : null;
+          final muted = _normalizedMutedWords.any(
+            (word) => words != null ? words.contains(word) : msg.contains(word),
+          );
+          if (muted) continue;
+        }
+
         switch (parsedIRCMessage.command) {
           case Command.privateMessage:
           case Command.notice:
           case Command.userNotice:
-            _messageBuffer.add(parsedIRCMessage);
+            // Check if this is a rejection notice for a pending message
+            if (parsedIRCMessage.command == Command.notice &&
+                _isWaitingForAck) {
+              final msgId = parsedIRCMessage.tags['msg-id'];
+              if (msgId != null && _rejectionMsgIds.contains(msgId)) {
+                // Message was rejected - clear pending but preserve text field for retry
+                _sendingTimeoutTimer?.cancel();
+                _isWaitingForAck = false;
+                toSend = null;
+                // Drop the retained text so a later USERSTATE can't render the
+                // rejected message as a deferred echo.
+                _pendingSentMessageText = null;
+
+                // Show notification with Twitch's rejection message
+                if (parsedIRCMessage.message != null) {
+                  HapticFeedback.heavyImpact();
+                  updateNotification(parsedIRCMessage.message!);
+                }
+              }
+            }
+
+            // Update shared chat mode based on source-room-id tag presence.
+            // Only PRIVMSG reliably carries this tag for the session's
+            // duration — NOTICE/USERNOTICE (subs, raids, announcements)
+            // don't always, so gating on those too would flap this flag off
+            // and on within a single live session (now visibly, since the
+            // shared chat bubble bar reads it — previously this only risked
+            // a redundant asset refetch, guarded below).
+            if (parsedIRCMessage.command == Command.privateMessage) {
+              final wasShared = _isInSharedChatMode;
+              _isInSharedChatMode = parsedIRCMessage.tags.containsKey(
+                'source-room-id',
+              );
+              // On transition into shared chat mode, fetch assets for participants.
+              if (!wasShared && _isInSharedChatMode) {
+                assetsStore.fetchSharedChatAssets(
+                  channelId: channelId,
+                  headers: auth.headersTwitch,
+                  onEmoteError: (error) {
+                    debugPrint(error.toString());
+                    return <Emote>[];
+                  },
+                  onBadgeError: (error) {
+                    debugPrint(error.toString());
+                    return <String, ChatBadge>{};
+                  },
+                  showTwitchEmotes: settings.showTwitchEmotes,
+                  showTwitchBadges: settings.showTwitchBadges,
+                  show7TVEmotes: settings.show7TVEmotes,
+                  showBTTVEmotes: settings.showBTTVEmotes,
+                  showFFZEmotes: settings.showFFZEmotes,
+                  showFFZBadges: settings.showFFZBadges,
+                );
+              } else if (wasShared &&
+                  !_isInSharedChatMode &&
+                  assetsStore.hasLoadedSharedChatAssets) {
+                // On leaving shared chat, drop the participants' merged emotes and
+                // badges and restore just this channel's assets — otherwise the
+                // other streamer's emote set and badges linger (#522). Guarded on
+                // having actually loaded shared assets so a flapping tag can't
+                // trigger redundant refetches.
+                assetsStore.resetSharedChatAssets();
+                getAssets();
+              }
+            }
+            messageBuffer.add(parsedIRCMessage);
             break;
           case Command.clearChat:
+            // Track the banned/timed-out user so the chat can offer an unban
+            // action only when applicable. target-user-id is absent for a
+            // whole-chat clear.
+            final clearedUserId = parsedIRCMessage.tags['target-user-id'];
+            if (clearedUserId != null) {
+              final banDuration = parsedIRCMessage.tags['ban-duration'];
+              final seconds = banDuration != null
+                  ? int.tryParse(banDuration)
+                  : null;
+              if (seconds != null) {
+                _bannedUserTracker.recordTimeout(
+                  clearedUserId,
+                  Duration(seconds: seconds),
+                  DateTime.now(),
+                );
+              } else {
+                _bannedUserTracker.recordBan(clearedUserId);
+              }
+            }
             IRCMessage.clearChat(
               messages: _messages,
-              bufferedMessages: _messageBuffer,
+              bufferedMessages: messageBuffer,
               ircMessage: parsedIRCMessage,
             );
+            // clearChat marks messages in place, which doesn't notify the
+            // observable list; reassign so renderMessages recomputes and the
+            // ban/timeout strike-through shows without waiting for the next
+            // message.
+            _messages = _messages.toList().asObservable();
             break;
           case Command.clearMessage:
             IRCMessage.clearMessage(
               messages: _messages,
-              bufferedMessages: _messageBuffer,
+              bufferedMessages: messageBuffer,
               ircMessage: parsedIRCMessage,
             );
+            // Same as clearChat: force a re-render so the deleted message
+            // updates immediately rather than on the next incoming message.
+            _messages = _messages.toList().asObservable();
             break;
           case Command.roomState:
-            chatDetailsStore.roomState =
-                chatDetailsStore.roomState.fromIRCMessage(parsedIRCMessage);
+            chatDetailsStore.roomState = chatDetailsStore.roomState
+                .fromIRCMessage(parsedIRCMessage);
             continue;
           case Command.userState:
             _userState = _userState.fromIRCMessage(parsedIRCMessage);
 
-            if (toSend != null) {
-              textController.clear();
-              _messageBuffer.add(toSend!);
-              toSend = null;
+            // A USERSTATE following our PRIVMSG confirms the send. Finalize
+            // regardless of whether a local echo was pre-built — gating this on
+            // `toSend` left the player stuck "sending" (and firing a false
+            // "may not have been sent") whenever the message went out before
+            // this session's first USERSTATE populated `_userState`.
+            if (_isWaitingForAck) {
+              _finalizeSend(parsedIRCMessage.tags['id']);
             }
             break;
           case Command.globalUserState:
@@ -297,9 +819,9 @@ abstract class ChatStoreBase with Store {
 
         if (!_autoScroll) {
           // While autoscroll is disabled, occasionally move messages from the buffer to the messages to prevent a memory leak.
-          if (_messageBuffer.length >= _messagesToRemove) {
-            _messages.addAll(_messageBuffer);
-            _messageBuffer.clear();
+          if (messageBuffer.length >= _messagesToRemove) {
+            _messages.addAll(messageBuffer);
+            messageBuffer.clear();
           }
         }
 
@@ -311,33 +833,109 @@ abstract class ChatStoreBase with Store {
         _channel?.sink.add('PONG :tmi.twitch.tv');
         return;
       } else if (message.contains('Welcome, GLHF!')) {
-        _messageBuffer.add(IRCMessage.createNotice(
+        messageBuffer.add(
+          IRCMessage.createNotice(
             message:
-                "Connected to $displayName${regexEnglish.hasMatch(displayName) ? '' : ' ($channelName)'}'s chat!"));
+                "Welcome to ${getReadableName(displayName, channelName)}'s chat!",
+          ),
+        );
 
-        getAssets();
+        // Activate the message buffer.
+        // Cancel any existing timer before creating a new one to prevent duplicates on reconnect.
+        _messageBufferTimer?.cancel();
+        // Create a timer that will add messages from the buffer every 200 milliseconds.
+        _messageBufferTimer = Timer.periodic(
+          const Duration(milliseconds: 200),
+          (timer) => addMessages(),
+        );
+
+        // Set up 7TV real-time listener (assets already fetched in connectToChat)
+        if (settings.show7TVEmotes) {
+          final emoteSetId = assetsStore.sevenTvEmoteSetId;
+          if (emoteSetId != null && !_shouldDisconnect) {
+            listenToSevenTVEmoteSet(emoteSetId: emoteSetId);
+          }
+        }
+
+        // Transform reconnect message to summary on successful connection
+        if (_reconnectMessage != null && _reconnectStartTime != null) {
+          final elapsed = DateTime.now()
+              .difference(_reconnectStartTime!)
+              .inSeconds;
+          final attempts = _retries;
+          final index = _messages.indexOf(_reconnectMessage!);
+          if (index != -1) {
+            _messages[index] = IRCMessage.createNotice(
+              message:
+                  'Reconnected ($attempts ${attempts == 1 ? 'attempt' : 'attempts'}, ${elapsed}s)',
+            );
+          }
+        }
+        _reconnectMessage = null;
+        _reconnectStartTime = null;
 
         // Reset exponential backoff if successfully connected.
         _retries = 0;
         _backoffTime = 0;
+
+        // Mark connection as established for UI
+        _isConnected = true;
+        _hasConnected = true;
       }
     }
   }
 
   // Fetch the assets used in chat including badges and emotes.
   @action
-  Future<void> getAssets() async => assetsStore.assetsFuture(
+  Future<void> getAssets() async {
+    // Prepare common error handlers to avoid repetition.
+    List<Emote> onEmoteError(dynamic error) {
+      debugPrint(error.toString());
+      return <Emote>[];
+    }
+
+    // Returns a Map, not a List: this is attached via `.catchError` to the
+    // `getBadgesChannel` future (a Future<Map<String, ChatBadge>>), so the
+    // handler must return that type or Dart throws at runtime.
+    Map<String, ChatBadge> onBadgeError(dynamic error) {
+      debugPrint(error.toString());
+      return <String, ChatBadge>{};
+    }
+
+    final baseAssets = assetsStore.assetsFuture(
+      channelId: channelId,
+      headers: auth.headersTwitch,
+      onEmoteError: onEmoteError,
+      onBadgeError: onBadgeError,
+      showTwitchEmotes: settings.showTwitchEmotes,
+      showTwitchBadges: settings.showTwitchBadges,
+      show7TVEmotes: settings.show7TVEmotes,
+      showBTTVEmotes: settings.showBTTVEmotes,
+      showBTTVBadges: settings.showBTTVBadges,
+      showFFZEmotes: settings.showFFZEmotes,
+      showFFZBadges: settings.showFFZBadges,
+    );
+
+    // If shared chat mode is active, also refresh participant assets in parallel.
+    if (_isInSharedChatMode) {
+      final sharedAssets = assetsStore.fetchSharedChatAssets(
         channelId: channelId,
         headers: auth.headersTwitch,
-        onEmoteError: (error) {
-          debugPrint(error.toString());
-          return <Emote>[];
-        },
-        onBadgeError: (error) {
-          debugPrint(error.toString());
-          return <Badge>[];
-        },
+        onEmoteError: onEmoteError,
+        onBadgeError: onBadgeError,
+        showTwitchEmotes: settings.showTwitchEmotes,
+        showTwitchBadges: settings.showTwitchBadges,
+        show7TVEmotes: settings.show7TVEmotes,
+        showBTTVEmotes: settings.showBTTVEmotes,
+        showFFZEmotes: settings.showFFZEmotes,
+        showFFZBadges: settings.showFFZBadges,
+        force: true,
       );
+      await Future.wait([baseAssets, sharedAssets]);
+    } else {
+      await baseAssets;
+    }
+  }
 
   /// Re-enables [_autoScroll] and jumps to the latest message.
   @action
@@ -354,37 +952,280 @@ abstract class ChatStoreBase with Store {
   }
 
   @action
-  void connectToChat() {
-    _channel?.sink.close(1001);
-    _channel =
-        WebSocketChannel.connect(Uri.parse('wss://irc-ws.chat.twitch.tv:443'));
+  void listenToSevenTVEmoteSet({required String emoteSetId}) {
+    final subscribePayload = SevenTVEvent(
+      op: 35,
+      d: SevenTVEventData(
+        type: 'emote_set.update',
+        condition: {'object_id': emoteSetId},
+      ),
+    );
+
+    _sevenTVChannel?.sink.close(1000);
+    _clearPendingDelayedCallbacks(clearChat: false);
+    _sevenTVChannel = IOWebSocketChannel.connect(
+      Uri.parse('wss://events.7tv.io/v3'),
+      pingInterval: _pingInterval,
+    );
+
+    void listener(dynamic data) {
+      // debugPrint(data);
+      final decoded = jsonDecode(data);
+
+      final event = SevenTVEvent.fromJson(decoded);
+
+      final body = event.d.body;
+      if (event.d.type != 'emote_set.update' || body == null) return;
+
+      if (body.pushed != null) {
+        final pushedEmote = body.pushed?.first.value;
+
+        if (pushedEmote == null) return;
+
+        final emote = Emote.from7TV(pushedEmote, EmoteType.sevenTVChannel);
+
+        assetsStore.addChannelEmote(emote);
+
+        messageBuffer.add(
+          IRCMessage.createNotice(
+            message:
+                '${getReadableName(body.actor.displayName, body.actor.username)} added 7TV emote "${emote.name}" to chat',
+          ),
+        );
+      } else if (body.pulled != null) {
+        final pulledEmote = body.pulled?.first.oldValue;
+
+        if (pulledEmote == null) return;
+
+        assetsStore.removeChannelEmote(pulledEmote.name);
+
+        messageBuffer.add(
+          IRCMessage.createNotice(
+            message:
+                '${getReadableName(body.actor.displayName, body.actor.username)} removed 7TV emote "${pulledEmote.name}" from chat',
+          ),
+        );
+      }
+    }
+
+    // Cancel previous subscription if exists
+    _sevenTVChannelListener?.cancel();
+    _sevenTVChannelListener = _sevenTVChannel?.stream.listen(
+      (data) {
+        if (!_hasActiveChatDelay) {
+          listener(data);
+        } else {
+          _enqueueDelayedCallback(
+            _pendingSevenTVCallbacks,
+            () => listener(data),
+          );
+        }
+      },
+      onError: (error) {
+        debugPrint('7TV events error: ${error.toString()}');
+        FirebaseCrashlytics.instance.recordError(
+          error,
+          StackTrace.current,
+          reason: '7TV WebSocket error, channel=$channelName',
+        );
+      },
+      onDone: () {
+        _clearPendingDelayedCallbacks(clearChat: false);
+        debugPrint('7TV events done');
+      },
+    );
+
+    _sevenTVChannel?.sink.add(jsonEncode(subscribePayload));
+  }
+
+  @action
+  Future<void> connectToChat({bool isReconnect = false}) async {
+    FirebaseCrashlytics.instance.setCustomKey('channel', channelName);
+
+    // Fetch assets first so they're available for all messages
+    getAssets().catchError(
+      (e) => debugPrint('Failed to fetch chat assets: $e'),
+    );
+
+    // Cancel existing listener to prevent duplicate message processing
+    _channelListener?.cancel();
+    _clearPendingDelayedCallbacks(clearSevenTV: false);
+
+    _channel?.sink.close(1000);
+    _channel = IOWebSocketChannel.connect(
+      Uri.parse('wss://irc-ws.chat.twitch.tv:443'),
+      pingInterval: _pingInterval,
+    );
+
+    // Only show chat delay countdown on initial connection or video toggle, not on reconnects
+    if (!isReconnect && _hasActiveChatDelay) {
+      _startChatDelayCountdown();
+    }
 
     // Listen for new messages and forward them to the handler.
     _channelListener = _channel?.stream.listen(
-      (data) => Future.delayed(Duration(seconds: settings.chatDelay.toInt()),
-          () => _handleIRCData(data.toString())),
-      onError: (error) => debugPrint('Chat error: ${error.toString()}'),
-      onDone: () async {
-        if (_channel == null) return;
+      (data) {
+        final dataStr = data.toString();
 
-        if (_backoffTime > 0) {
-          // Add notice that chat was disconnected and then wait the backoff time before reconnecting.
-          final notice =
-              'Disconnected from chat, waiting $_backoffTime ${_backoffTime == 1 ? 'second' : 'seconds'} before reconnecting...';
-          _messageBuffer.add(IRCMessage.createNotice(message: notice));
+        // No active delay: process the whole frame immediately.
+        if (!_hasActiveChatDelay) {
+          _handleIRCData(dataStr);
+          return;
         }
 
-        await Future.delayed(Duration(seconds: _backoffTime));
+        // Dispatch each line individually so a bypass-eligible control message
+        // isn't dragged behind the delay by chat lines batched in the same
+        // frame — and, conversely, so a delayed chat line can't hold up a
+        // PING/USERSTATE that shares the frame.
+        for (final line in dataStr.split('\r\n')) {
+          final trimmed = line.trimRight();
+          if (trimmed.isEmpty) continue;
+          if (_lineShouldBypassDelay(trimmed)) {
+            _handleIRCData(trimmed);
+          } else {
+            _enqueueDelayedCallback(
+              _pendingChatCallbacks,
+              () => _handleIRCData(trimmed),
+            );
+          }
+        }
+      },
+      onError: (error) {
+        debugPrint('Chat error: ${error.toString()}');
+        FirebaseCrashlytics.instance.recordError(
+          error,
+          StackTrace.current,
+          reason: 'IRC WebSocket error, channel=$channelName',
+        );
+      },
+      onDone: () async {
+        _clearPendingDelayedCallbacks(clearSevenTV: false);
 
-        // Increase the backoff time for the next retry.
-        _backoffTime == 0 ? _backoffTime++ : _backoffTime *= 2;
+        // Mark connection as disconnected for UI
+        _isConnected = false;
 
-        // Increment the retry count and attempt the reconnect.
+        // Cancel chat delay countdown when disconnecting
+        _cancelChatDelayCountdown();
+        _chatDelaySyncCompleted = false;
+
+        // Reset send state — any in-flight message is unrecoverable across
+        // a disconnect, so don't leave the user blocked waiting for an ack
+        // that will never arrive.
+        _sendingTimeoutTimer?.cancel();
+        _isWaitingForAck = false;
+        toSend = null;
+        _pendingSentMessageText = null;
+
+        if (_shouldDisconnect) {
+          _sevenTVChannel?.sink.close(1000);
+          return;
+        }
+
+        if (_retries >= _maxRetries) {
+          FirebaseCrashlytics.instance.log(
+            'WebSocket reconnection failed after $_maxRetries attempts, channel=$channelName',
+          );
+          // Remove the reconnect message before showing final disconnect notice
+          if (_reconnectMessage != null) {
+            final index = _messages.indexOf(_reconnectMessage!);
+            if (index != -1) _messages.removeAt(index);
+            _reconnectMessage = null;
+          }
+          _reconnectStartTime = null;
+
+          // Add directly to messages, not buffer, so it shows immediately
+          _messages.add(
+            IRCMessage.createNotice(
+              message: 'Chat disconnected. Please check your connection.',
+              actionCallback: () {
+                _retries = 0;
+                _backoffTime = 0;
+                connectToChat(isReconnect: true);
+              },
+              actionLabel: 'Reconnect',
+            ),
+          );
+          return;
+        }
+
+        // Increment the retry count.
         _retries++;
-        _messageBuffer.add(IRCMessage.createNotice(
-            message: 'Reconnecting to chat (attempt $_retries)...'));
+        FirebaseCrashlytics.instance.log(
+          'WebSocket reconnecting: attempt $_retries/$_maxRetries, channel=$channelName',
+        );
+
+        // Start exponential backoff only after first failed attempt (capped at 8s).
+        // First retry is immediate to catch brief network hiccups.
+        if (_retries > 1) {
+          final newBackoff = _backoffTime == 0 ? 1 : _backoffTime * 2;
+          _backoffTime = newBackoff > 8 ? 8 : newBackoff;
+        }
+
+        // Helper to update the single reconnect message in place (or add if first time)
+        void updateReconnectMessage(String text) {
+          final msg = IRCMessage.createNotice(message: text);
+          if (_reconnectMessage == null) {
+            _reconnectStartTime ??=
+                DateTime.now(); // Record when reconnection started
+            _reconnectMessage = msg;
+            _messages.add(_reconnectMessage!);
+          } else {
+            final index = _messages.indexOf(_reconnectMessage!);
+            if (index != -1) {
+              _reconnectMessage = msg;
+              _messages[index] = _reconnectMessage!;
+            } else {
+              // Reference was lost (e.g., message limit cleanup) - re-add
+              _reconnectMessage = msg;
+              _messages.add(_reconnectMessage!);
+            }
+          }
+        }
+
+        // Countdown phase (if backoff time > 0)
+        if (_backoffTime > 0) {
+          var remainingSeconds = _backoffTime;
+          updateReconnectMessage(
+            'Reconnecting in ${remainingSeconds}s... (attempt $_retries of $_maxRetries)',
+          );
+
+          // Update countdown every second
+          await Future.doWhile(() async {
+            await Future.delayed(const Duration(seconds: 1));
+
+            // Abort countdown if dispose was called
+            if (_shouldDisconnect) {
+              if (_reconnectMessage != null) {
+                final index = _messages.indexOf(_reconnectMessage!);
+                if (index != -1) _messages.removeAt(index);
+                _reconnectMessage = null;
+              }
+              _reconnectStartTime = null;
+              return false; // Exit loop
+            }
+
+            remainingSeconds--;
+
+            if (remainingSeconds > 0) {
+              updateReconnectMessage(
+                'Reconnecting in ${remainingSeconds}s... (attempt $_retries of $_maxRetries)',
+              );
+              return true; // Continue loop
+            }
+            return false; // Exit loop
+          });
+
+          // Don't proceed with reconnection if disposed
+          if (_shouldDisconnect) return;
+        }
+
+        // Attempting phase - update same message, no add/remove
+        updateReconnectMessage(
+          'Reconnecting... (attempt $_retries of $_maxRetries)',
+        );
+
         _channelListener?.cancel();
-        connectToChat();
+        connectToChat(isReconnect: true);
       },
     );
 
@@ -412,10 +1253,92 @@ abstract class ChatStoreBase with Store {
 
   @action
   void addMessages() {
-    if (!_autoScroll || _messageBuffer.isEmpty) return;
+    _flushDueDelayedCallbacks();
 
-    _messages.addAll(_messageBuffer);
-    _messageBuffer.clear();
+    // Hold messages back while the user is touching the list so the pressed
+    // message stays put (and alive) for the duration of a long-press.
+    if (!_autoScroll || _interactionPause.isPaused || messageBuffer.isEmpty) {
+      return;
+    }
+
+    _messages.addAll(messageBuffer);
+    messageBuffer.clear();
+  }
+
+  /// Cancels the chat delay countdown and removes the countdown message.
+  @action
+  void _cancelChatDelayCountdown() {
+    _chatDelayCountdownTimer?.cancel();
+    _chatDelayCountdownTimer = null;
+
+    // Remove the countdown message if it exists
+    if (_countdownMessage != null) {
+      _messages.remove(_countdownMessage);
+      _countdownMessage = null;
+    }
+  }
+
+  /// Starts and manages the chat delay countdown message.
+  @action
+  void _startChatDelayCountdown() {
+    // Cancel any existing countdown first (prevents duplicate messages)
+    _cancelChatDelayCountdown();
+
+    // Flush any buffered messages first to ensure countdown is at the bottom
+    if (messageBuffer.isNotEmpty) {
+      _messages.addAll(messageBuffer);
+      messageBuffer.clear();
+    }
+
+    var remainingSeconds = _chatDelay.inSeconds;
+
+    // Create and store reference to the countdown message
+    _countdownMessage = IRCMessage.createNotice(
+      message: 'Chat will sync in ${remainingSeconds}s...',
+    );
+    _messages.add(_countdownMessage!);
+
+    // Update countdown every second
+    _chatDelayCountdownTimer = Timer.periodic(const Duration(seconds: 1), (
+      timer,
+    ) {
+      remainingSeconds--;
+
+      // Use runInAction for proper MobX reactivity in async callbacks
+      runInAction(() {
+        // Check if countdown message still exists in the list
+        // (could be removed by message limit cleanup)
+        if (_countdownMessage == null ||
+            !_messages.contains(_countdownMessage)) {
+          timer.cancel();
+          _countdownMessage = null;
+          _chatDelayCountdownTimer = null;
+          return;
+        }
+
+        final index = _messages.indexOf(_countdownMessage!);
+        if (index != -1) {
+          if (remainingSeconds > 0) {
+            // Create new message and update reference
+            _countdownMessage = IRCMessage.createNotice(
+              message: 'Chat will sync in ${remainingSeconds}s...',
+            );
+            _messages[index] = _countdownMessage!;
+          } else {
+            // Remove countdown message when done
+            _messages.removeAt(index);
+            _countdownMessage = null;
+            _chatDelayCountdownTimer = null;
+            _chatDelaySyncCompleted = true;
+            timer.cancel();
+          }
+        } else {
+          _countdownMessage = null;
+          _chatDelayCountdownTimer = null;
+          timer.cancel();
+        }
+      });
+    });
   }
 
   /// Sends the given string message by the logged-in user and adds it to [_messages].
@@ -424,32 +1347,121 @@ abstract class ChatStoreBase with Store {
     // Do not send if the message is blank/empty.
     if (message.isEmpty) return;
 
-    if (_channel == null || _channel?.closeCode != null) {
-      _messageBuffer.add(IRCMessage.createNotice(
-          message: 'Failed to send message: disconnected from chat.'));
-    } else {
-      // Send the message to the IRC chat room.
-      _channel?.sink.add('PRIVMSG #$channelName :$message');
-
-      // Obtain the logged-in user's appearance in chat with USERSTATE and create the full message to render.
-      var userStateString = _userState.raw;
-      if (userStateString != null) {
-        if (message.length > 3 && message.substring(0, 3) == '/me') {
-          userStateString +=
-              ' :\x01ACTION ${message.replaceRange(0, 3, '').trim()}\x01';
-        } else {
-          userStateString += ' :${message.trim()}';
-        }
-
-        final userChatMessage = IRCMessage.fromString(userStateString);
-        userChatMessage.localEmotes?.addAll(assetsStore.userEmoteToObject);
-        if (auth.isLoggedIn && auth.user.details != null) {
-          userChatMessage.tags['user-id'] = auth.user.details!.id;
-        }
-
-        toSend = userChatMessage;
-      }
+    // Prevent double-sending while waiting for server acknowledgment
+    if (_isWaitingForAck) {
+      HapticFeedback.mediumImpact();
+      updateNotification('Please wait, sending previous message...');
+      return;
     }
+
+    if (_channel == null || _channel?.closeCode != null) {
+      messageBuffer.add(
+        IRCMessage.createNotice(
+          message:
+              'Cannot send message - chat is disconnected. Reconnecting...',
+        ),
+      );
+      return;
+    }
+
+    // Set waiting state for UI feedback
+    _isWaitingForAck = true;
+
+    // Send the message to the IRC chat room.
+    _channel?.sink.add(
+      '${replyingToMessage != null ? '@reply-parent-msg-id=${replyingToMessage!.tags['id']} ' : ''}PRIVMSG #$channelName :$message',
+    );
+
+    // Text field and reply state cleared on USERSTATE confirmation (not optimistically)
+    // to preserve message text if Twitch rejects it (e.g., slow mode)
+
+    // Fallback in case the confirming USERSTATE never arrives. Twitch can omit
+    // or drop the USERSTATE that acknowledges a send — intermittently, and more
+    // often under a long chat delay — even though the message was delivered.
+    // A missing ack is therefore NOT evidence of failure, so rather than cry
+    // wolf with a "may not have been sent" error (which pushes the user to
+    // resend and double-post), optimistically finalize the send: render the
+    // local echo and clear the pending state. Genuine rejections almost always
+    // arrive first — the rejection NOTICE bypasses the chat delay, so it lands
+    // well within this window and clears the pending send before the timeout. A
+    // rejection arriving after the timeout has finalized is treated as sent (the
+    // echo stays), an accepted edge given how early NOTICEs arrive. Scaled by
+    // the chat delay so a legitimately delayed USERSTATE is given time to land.
+    _sendingTimeoutTimer?.cancel();
+    _sendingTimeoutTimer = Timer(const Duration(seconds: 10) + _chatDelay, () {
+      if (_shouldDisconnect || !_isWaitingForAck) return;
+      runInAction(() => _finalizeSend(null));
+    });
+
+    // Build the optimistic local echo from the current USERSTATE. If the
+    // message is sent before this session's first USERSTATE arrives,
+    // _buildLocalEcho returns null and the echo is built later, when the
+    // confirming USERSTATE lands (see the Command.userState handler). The raw
+    // text is retained so that deferred build is possible.
+    _pendingSentMessageText = message;
+    toSend = _buildLocalEcho(message);
+  }
+
+  /// Renders the pending outgoing message's local echo (building it lazily if
+  /// it couldn't be built at send time) and clears all send-pending state.
+  /// Shared by the USERSTATE confirmation and the optimistic timeout fallback.
+  /// [serverMessageId] is the `id` tag from the confirming USERSTATE, or null
+  /// when finalizing optimistically without one.
+  void _finalizeSend(String? serverMessageId) {
+    toSend ??= _pendingSentMessageText != null
+        ? _buildLocalEcho(_pendingSentMessageText!)
+        : null;
+    if (toSend != null) {
+      // Prefer the server id; fall back to any id already set, then a local one.
+      toSend!.tags['id'] =
+          serverMessageId ??
+          toSend!.tags['id'] ??
+          'local-${DateTime.now().millisecondsSinceEpoch}';
+      messageBuffer.add(toSend!);
+      toSend = null;
+    }
+    _pendingSentMessageText = null;
+    _sendingTimeoutTimer?.cancel();
+    _isWaitingForAck = false;
+    textController.clear();
+    replyingToMessage = null;
+  }
+
+  /// Builds the optimistic local echo of an outgoing [message] from the current
+  /// USERSTATE, or null if no USERSTATE has been received yet this session
+  /// (the echo can't be rendered without the user's badges/color/display-name).
+  IRCMessage? _buildLocalEcho(String message) {
+    var userStateString = _userState.raw;
+    if (userStateString == null) return null;
+
+    if (message == '/me' || message.startsWith('/me ')) {
+      userStateString +=
+          ' :\x01ACTION ${message.replaceRange(0, 3, '').trim()}\x01';
+    } else {
+      userStateString +=
+          ' :${replyingToMessage?.tags['display-name'] != null ? '@${replyingToMessage!.tags['display-name']} ' : ''}${message.trim()}';
+    }
+
+    final userChatMessage = IRCMessage.fromString(userStateString);
+    userChatMessage.localEmotes?.addAll(assetsStore.userEmoteToObject);
+    if (auth.isLoggedIn && auth.user.details != null) {
+      userChatMessage.tags['user-id'] = auth.user.details!.id;
+    }
+
+    if (replyingToMessage != null && replyingToMessage!.tags['id'] != null) {
+      userChatMessage.tags['reply-parent-msg-id'] =
+          replyingToMessage!.tags['id']!;
+      userChatMessage.tags['reply-parent-display-name'] =
+          replyingToMessage!.tags['display-name'] ?? '';
+      userChatMessage.tags['reply-parent-msg-body'] =
+          replyingToMessage!.message ?? '';
+    }
+
+    // Ensure a timestamp so merged-mode sorting works correctly.
+    userChatMessage.tags['tmi-sent-ts'] ??=
+        '${DateTime.now().millisecondsSinceEpoch}';
+
+    return userChatMessage;
   }
 
   /// Adds the given [emote] to the chat textfield.
@@ -470,12 +1482,15 @@ abstract class ChatStoreBase with Store {
     }
 
     assetsStore.recentEmotes
-      ..removeWhere((recentEmote) =>
-          recentEmote.name == emote.name && recentEmote.type == emote.type)
+      ..removeWhere(
+        (recentEmote) =>
+            recentEmote.name == emote.name && recentEmote.type == emote.type,
+      )
       ..insert(0, emote);
 
     textController.selection = TextSelection.fromPosition(
-        TextPosition(offset: textController.text.length));
+      TextPosition(offset: textController.text.length),
+    );
   }
 
   /// Cancels the previous notification/timer and creates a new one with the provided [notificationMessage].
@@ -485,50 +1500,46 @@ abstract class ChatStoreBase with Store {
     // when copying messages repeatedly.
     _notificationTimer?.cancel();
 
-    // If empty, clear the notification and don't make a new timer (empty message means cancelling the notification).
-    if (notificationMessage.isEmpty) {
-      _notification = null;
-      return;
-    }
-
-    // Set the new notification message and create a new timer that will dismiss it after 2 seconds.
+    // Set the new notification message and create a new timer that will dismiss it after 3 seconds.
     _notification = notificationMessage;
-    _notificationTimer =
-        Timer(const Duration(seconds: 2), () => _notification = null);
+    _notificationTimer = Timer(
+      const Duration(seconds: 5),
+      () => _notification = null,
+    );
   }
 
-  /// Updates the sleep timer with [sleepHours] and [sleepMinutes].
+  /// Clears the current notification immediately.
+  @action
+  void clearNotification() {
+    _notificationTimer?.cancel();
+    _notification = null;
+  }
+
+  /// Updates the sleep timer with the given [duration].
   /// Calls [onTimerFinished] when the sleep timer completes.
   @action
-  void updateSleepTimer({required void Function() onTimerFinished}) {
-    // If hours and minutes are 0, do nothing.
-    if (sleepHours == 0 && sleepMinutes == 0) return;
-
+  void updateSleepTimer({
+    required Duration duration,
+    required VoidCallback onTimerFinished,
+  }) {
     // If there is an ongoing timer, cancel it since it'll be replaced.
     if (sleepTimer != null) cancelSleepTimer();
 
     // Update the new time remaining
-    timeRemaining = Duration(hours: sleepHours, minutes: sleepMinutes);
-
-    // Reset the hours and minutes in the dropdown buttons.
-    sleepHours = 0;
-    sleepMinutes = 0;
+    timeRemaining = duration;
 
     // Set a periodic timer that will update the time remaining every second.
-    sleepTimer = Timer.periodic(
-      const Duration(seconds: 1),
-      (timer) {
-        // If the timer is up, cancel the timer and exit the app.
-        if (timeRemaining.inSeconds == 0) {
-          timer.cancel();
-          onTimerFinished();
-          return;
-        }
+    sleepTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      // If the timer is up, cancel the timer and exit the app.
+      if (timeRemaining.inSeconds == 0) {
+        timer.cancel();
+        onTimerFinished();
+        return;
+      }
 
-        // Decrement the time remaining.
-        timeRemaining = Duration(seconds: timeRemaining.inSeconds - 1);
-      },
-    );
+      // Decrement the time remaining.
+      timeRemaining = Duration(seconds: timeRemaining.inSeconds - 1);
+    });
   }
 
   /// Cancels the sleep timer and resets the time remaining.
@@ -538,15 +1549,42 @@ abstract class ChatStoreBase with Store {
     timeRemaining = const Duration();
   }
 
+  @action
+  Future<void> getRecentMessage() async {
+    try {
+      final recentMessages = await twitchApi.getRecentMessages(
+        userLogin: channelName,
+      );
+
+      for (final message in recentMessages) {
+        _handleIRCData(message);
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch recent messages: $e');
+    }
+  }
+
   /// Closes and disposes all the channels and controllers used by the store.
   void dispose() {
-    _messageBufferTimer.cancel();
+    _shouldDisconnect = true;
+
+    _interactionPause.reset();
+
+    _clearPendingDelayedCallbacks();
+
+    _messageBufferTimer?.cancel();
     _notificationTimer?.cancel();
+    _sendingTimeoutTimer?.cancel();
+    _cancelChatDelayCountdown();
     sleepTimer?.cancel();
 
-    _channel?.sink.close(1001);
-    _channel = null;
+    // Cancel WebSocket subscriptions
     _channelListener?.cancel();
+    _sevenTVChannelListener?.cancel();
+
+    // Close WebSocket channels
+    _channel?.sink.close(1000);
+    _sevenTVChannel?.sink.close(1000);
 
     for (final reactionDisposer in reactions) {
       reactionDisposer();
@@ -558,8 +1596,24 @@ abstract class ChatStoreBase with Store {
 
     assetsStore.dispose();
     chatDetailsStore.dispose();
+  }
 
-    // Disable wakelock so that the sleep timer will function properly.
-    Wakelock.disable();
+  /// Unfocuses the text field.
+  @action
+  void unfocusInput() {
+    textFieldFocusNode.unfocus();
+  }
+
+  /// Requests focus for the text field.
+  @action
+  void safeRequestFocus() {
+    textFieldFocusNode.requestFocus();
   }
 }
+
+class _DelayedCallback {
+  _DelayedCallback({required this.releaseAt, required this.callback});
+
+  final DateTime releaseAt;
+  final void Function() callback;
+}
diff --git a/lib/screens/channel/chat/stores/chat_store.g.dart b/lib/screens/channel/chat/stores/chat_store.g.dart
index 39a130ca..826915be 100644
--- a/lib/screens/channel/chat/stores/chat_store.g.dart
+++ b/lib/screens/channel/chat/stores/chat_store.g.dart
@@ -12,45 +12,39 @@ mixin _$ChatStore on ChatStoreBase, Store {
   Computed<List<IRCMessage>>? _$renderMessagesComputed;
 
   @override
-  List<IRCMessage> get renderMessages => (_$renderMessagesComputed ??=
-          Computed<List<IRCMessage>>(() => super.renderMessages,
-              name: 'ChatStoreBase.renderMessages'))
-      .value;
-
-  late final _$sleepHoursAtom =
-      Atom(name: 'ChatStoreBase.sleepHours', context: context);
+  List<IRCMessage> get renderMessages =>
+      (_$renderMessagesComputed ??= Computed<List<IRCMessage>>(
+        () => super.renderMessages,
+        name: 'ChatStoreBase.renderMessages',
+      )).value;
+  Computed<List<Emote>>? _$matchingEmotesComputed;
 
   @override
-  int get sleepHours {
-    _$sleepHoursAtom.reportRead();
-    return super.sleepHours;
-  }
+  List<Emote> get matchingEmotes =>
+      (_$matchingEmotesComputed ??= Computed<List<Emote>>(
+        () => super.matchingEmotes,
+        name: 'ChatStoreBase.matchingEmotes',
+      )).value;
+  Computed<List<String>>? _$matchingChattersComputed;
 
   @override
-  set sleepHours(int value) {
-    _$sleepHoursAtom.reportWrite(value, super.sleepHours, () {
-      super.sleepHours = value;
-    });
-  }
-
-  late final _$sleepMinutesAtom =
-      Atom(name: 'ChatStoreBase.sleepMinutes', context: context);
+  List<String> get matchingChatters =>
+      (_$matchingChattersComputed ??= Computed<List<String>>(
+        () => super.matchingChatters,
+        name: 'ChatStoreBase.matchingChatters',
+      )).value;
+  Computed<double>? _$bottomBarHeightComputed;
 
   @override
-  int get sleepMinutes {
-    _$sleepMinutesAtom.reportRead();
-    return super.sleepMinutes;
-  }
+  double get bottomBarHeight => (_$bottomBarHeightComputed ??= Computed<double>(
+    () => super.bottomBarHeight,
+    name: 'ChatStoreBase.bottomBarHeight',
+  )).value;
 
-  @override
-  set sleepMinutes(int value) {
-    _$sleepMinutesAtom.reportWrite(value, super.sleepMinutes, () {
-      super.sleepMinutes = value;
-    });
-  }
-
-  late final _$timeRemainingAtom =
-      Atom(name: 'ChatStoreBase.timeRemaining', context: context);
+  late final _$timeRemainingAtom = Atom(
+    name: 'ChatStoreBase.timeRemaining',
+    context: context,
+  );
 
   @override
   Duration get timeRemaining {
@@ -65,8 +59,10 @@ mixin _$ChatStore on ChatStoreBase, Store {
     });
   }
 
-  late final _$_notificationAtom =
-      Atom(name: 'ChatStoreBase._notification', context: context);
+  late final _$_notificationAtom = Atom(
+    name: 'ChatStoreBase._notification',
+    context: context,
+  );
 
   String? get notification {
     _$_notificationAtom.reportRead();
@@ -83,8 +79,10 @@ mixin _$ChatStore on ChatStoreBase, Store {
     });
   }
 
-  late final _$_messagesAtom =
-      Atom(name: 'ChatStoreBase._messages', context: context);
+  late final _$_messagesAtom = Atom(
+    name: 'ChatStoreBase._messages',
+    context: context,
+  );
 
   ObservableList<IRCMessage> get messages {
     _$_messagesAtom.reportRead();
@@ -101,8 +99,10 @@ mixin _$ChatStore on ChatStoreBase, Store {
     });
   }
 
-  late final _$_autoScrollAtom =
-      Atom(name: 'ChatStoreBase._autoScroll', context: context);
+  late final _$_autoScrollAtom = Atom(
+    name: 'ChatStoreBase._autoScroll',
+    context: context,
+  );
 
   bool get autoScroll {
     _$_autoScrollAtom.reportRead();
@@ -119,8 +119,30 @@ mixin _$ChatStore on ChatStoreBase, Store {
     });
   }
 
-  late final _$_showSendButtonAtom =
-      Atom(name: 'ChatStoreBase._showSendButton', context: context);
+  late final _$_inputTextAtom = Atom(
+    name: 'ChatStoreBase._inputText',
+    context: context,
+  );
+
+  String get inputText {
+    _$_inputTextAtom.reportRead();
+    return super._inputText;
+  }
+
+  @override
+  String get _inputText => inputText;
+
+  @override
+  set _inputText(String value) {
+    _$_inputTextAtom.reportWrite(value, super._inputText, () {
+      super._inputText = value;
+    });
+  }
+
+  late final _$_showSendButtonAtom = Atom(
+    name: 'ChatStoreBase._showSendButton',
+    context: context,
+  );
 
   bool get showSendButton {
     _$_showSendButtonAtom.reportRead();
@@ -137,8 +159,10 @@ mixin _$ChatStore on ChatStoreBase, Store {
     });
   }
 
-  late final _$_showEmoteAutocompleteAtom =
-      Atom(name: 'ChatStoreBase._showEmoteAutocomplete', context: context);
+  late final _$_showEmoteAutocompleteAtom = Atom(
+    name: 'ChatStoreBase._showEmoteAutocomplete',
+    context: context,
+  );
 
   bool get showEmoteAutocomplete {
     _$_showEmoteAutocompleteAtom.reportRead();
@@ -150,14 +174,19 @@ mixin _$ChatStore on ChatStoreBase, Store {
 
   @override
   set _showEmoteAutocomplete(bool value) {
-    _$_showEmoteAutocompleteAtom
-        .reportWrite(value, super._showEmoteAutocomplete, () {
-      super._showEmoteAutocomplete = value;
-    });
+    _$_showEmoteAutocompleteAtom.reportWrite(
+      value,
+      super._showEmoteAutocomplete,
+      () {
+        super._showEmoteAutocomplete = value;
+      },
+    );
   }
 
-  late final _$_showMentionAutocompleteAtom =
-      Atom(name: 'ChatStoreBase._showMentionAutocomplete', context: context);
+  late final _$_showMentionAutocompleteAtom = Atom(
+    name: 'ChatStoreBase._showMentionAutocomplete',
+    context: context,
+  );
 
   bool get showMentionAutocomplete {
     _$_showMentionAutocompleteAtom.reportRead();
@@ -169,14 +198,99 @@ mixin _$ChatStore on ChatStoreBase, Store {
 
   @override
   set _showMentionAutocomplete(bool value) {
-    _$_showMentionAutocompleteAtom
-        .reportWrite(value, super._showMentionAutocomplete, () {
-      super._showMentionAutocomplete = value;
+    _$_showMentionAutocompleteAtom.reportWrite(
+      value,
+      super._showMentionAutocomplete,
+      () {
+        super._showMentionAutocomplete = value;
+      },
+    );
+  }
+
+  late final _$_isInSharedChatModeAtom = Atom(
+    name: 'ChatStoreBase._isInSharedChatMode',
+    context: context,
+  );
+
+  bool get isInSharedChatMode {
+    _$_isInSharedChatModeAtom.reportRead();
+    return super._isInSharedChatMode;
+  }
+
+  @override
+  bool get _isInSharedChatMode => isInSharedChatMode;
+
+  @override
+  set _isInSharedChatMode(bool value) {
+    _$_isInSharedChatModeAtom.reportWrite(value, super._isInSharedChatMode, () {
+      super._isInSharedChatMode = value;
     });
   }
 
-  late final _$_userStateAtom =
-      Atom(name: 'ChatStoreBase._userState', context: context);
+  late final _$_isWaitingForAckAtom = Atom(
+    name: 'ChatStoreBase._isWaitingForAck',
+    context: context,
+  );
+
+  bool get isWaitingForAck {
+    _$_isWaitingForAckAtom.reportRead();
+    return super._isWaitingForAck;
+  }
+
+  @override
+  bool get _isWaitingForAck => isWaitingForAck;
+
+  @override
+  set _isWaitingForAck(bool value) {
+    _$_isWaitingForAckAtom.reportWrite(value, super._isWaitingForAck, () {
+      super._isWaitingForAck = value;
+    });
+  }
+
+  late final _$_isConnectedAtom = Atom(
+    name: 'ChatStoreBase._isConnected',
+    context: context,
+  );
+
+  bool get isConnected {
+    _$_isConnectedAtom.reportRead();
+    return super._isConnected;
+  }
+
+  @override
+  bool get _isConnected => isConnected;
+
+  @override
+  set _isConnected(bool value) {
+    _$_isConnectedAtom.reportWrite(value, super._isConnected, () {
+      super._isConnected = value;
+    });
+  }
+
+  late final _$_hasConnectedAtom = Atom(
+    name: 'ChatStoreBase._hasConnected',
+    context: context,
+  );
+
+  bool get hasConnected {
+    _$_hasConnectedAtom.reportRead();
+    return super._hasConnected;
+  }
+
+  @override
+  bool get _hasConnected => hasConnected;
+
+  @override
+  set _hasConnected(bool value) {
+    _$_hasConnectedAtom.reportWrite(value, super._hasConnected, () {
+      super._hasConnected = value;
+    });
+  }
+
+  late final _$_userStateAtom = Atom(
+    name: 'ChatStoreBase._userState',
+    context: context,
+  );
 
   USERSTATE get userState {
     _$_userStateAtom.reportRead();
@@ -193,8 +307,10 @@ mixin _$ChatStore on ChatStoreBase, Store {
     });
   }
 
-  late final _$expandChatAtom =
-      Atom(name: 'ChatStoreBase.expandChat', context: context);
+  late final _$expandChatAtom = Atom(
+    name: 'ChatStoreBase.expandChat',
+    context: context,
+  );
 
   @override
   bool get expandChat {
@@ -209,21 +325,78 @@ mixin _$ChatStore on ChatStoreBase, Store {
     });
   }
 
-  late final _$getAssetsAsyncAction =
-      AsyncAction('ChatStoreBase.getAssets', context: context);
+  late final _$replyingToMessageAtom = Atom(
+    name: 'ChatStoreBase.replyingToMessage',
+    context: context,
+  );
+
+  @override
+  IRCMessage? get replyingToMessage {
+    _$replyingToMessageAtom.reportRead();
+    return super.replyingToMessage;
+  }
+
+  @override
+  set replyingToMessage(IRCMessage? value) {
+    _$replyingToMessageAtom.reportWrite(value, super.replyingToMessage, () {
+      super.replyingToMessage = value;
+    });
+  }
+
+  late final _$getAssetsAsyncAction = AsyncAction(
+    'ChatStoreBase.getAssets',
+    context: context,
+  );
 
   @override
   Future<void> getAssets() {
     return _$getAssetsAsyncAction.run(() => super.getAssets());
   }
 
-  late final _$ChatStoreBaseActionController =
-      ActionController(name: 'ChatStoreBase', context: context);
+  late final _$connectToChatAsyncAction = AsyncAction(
+    'ChatStoreBase.connectToChat',
+    context: context,
+  );
+
+  @override
+  Future<void> connectToChat({bool isReconnect = false}) {
+    return _$connectToChatAsyncAction.run(
+      () => super.connectToChat(isReconnect: isReconnect),
+    );
+  }
+
+  late final _$getRecentMessageAsyncAction = AsyncAction(
+    'ChatStoreBase.getRecentMessage',
+    context: context,
+  );
+
+  @override
+  Future<void> getRecentMessage() {
+    return _$getRecentMessageAsyncAction.run(() => super.getRecentMessage());
+  }
+
+  late final _$ChatStoreBaseActionController = ActionController(
+    name: 'ChatStoreBase',
+    context: context,
+  );
+
+  @override
+  void revealMessage(String id) {
+    final _$actionInfo = _$ChatStoreBaseActionController.startAction(
+      name: 'ChatStoreBase.revealMessage',
+    );
+    try {
+      return super.revealMessage(id);
+    } finally {
+      _$ChatStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
 
   @override
   void _handleIRCData(String data) {
     final _$actionInfo = _$ChatStoreBaseActionController.startAction(
-        name: 'ChatStoreBase._handleIRCData');
+      name: 'ChatStoreBase._handleIRCData',
+    );
     try {
       return super._handleIRCData(data);
     } finally {
@@ -234,7 +407,8 @@ mixin _$ChatStore on ChatStoreBase, Store {
   @override
   void resumeScroll() {
     final _$actionInfo = _$ChatStoreBaseActionController.startAction(
-        name: 'ChatStoreBase.resumeScroll');
+      name: 'ChatStoreBase.resumeScroll',
+    );
     try {
       return super.resumeScroll();
     } finally {
@@ -243,11 +417,12 @@ mixin _$ChatStore on ChatStoreBase, Store {
   }
 
   @override
-  void connectToChat() {
+  void listenToSevenTVEmoteSet({required String emoteSetId}) {
     final _$actionInfo = _$ChatStoreBaseActionController.startAction(
-        name: 'ChatStoreBase.connectToChat');
+      name: 'ChatStoreBase.listenToSevenTVEmoteSet',
+    );
     try {
-      return super.connectToChat();
+      return super.listenToSevenTVEmoteSet(emoteSetId: emoteSetId);
     } finally {
       _$ChatStoreBaseActionController.endAction(_$actionInfo);
     }
@@ -256,7 +431,8 @@ mixin _$ChatStore on ChatStoreBase, Store {
   @override
   void addMessages() {
     final _$actionInfo = _$ChatStoreBaseActionController.startAction(
-        name: 'ChatStoreBase.addMessages');
+      name: 'ChatStoreBase.addMessages',
+    );
     try {
       return super.addMessages();
     } finally {
@@ -264,10 +440,35 @@ mixin _$ChatStore on ChatStoreBase, Store {
     }
   }
 
+  @override
+  void _cancelChatDelayCountdown() {
+    final _$actionInfo = _$ChatStoreBaseActionController.startAction(
+      name: 'ChatStoreBase._cancelChatDelayCountdown',
+    );
+    try {
+      return super._cancelChatDelayCountdown();
+    } finally {
+      _$ChatStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void _startChatDelayCountdown() {
+    final _$actionInfo = _$ChatStoreBaseActionController.startAction(
+      name: 'ChatStoreBase._startChatDelayCountdown',
+    );
+    try {
+      return super._startChatDelayCountdown();
+    } finally {
+      _$ChatStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
   @override
   void sendMessage(String message) {
     final _$actionInfo = _$ChatStoreBaseActionController.startAction(
-        name: 'ChatStoreBase.sendMessage');
+      name: 'ChatStoreBase.sendMessage',
+    );
     try {
       return super.sendMessage(message);
     } finally {
@@ -278,7 +479,8 @@ mixin _$ChatStore on ChatStoreBase, Store {
   @override
   void addEmote(Emote emote, {bool autocompleteMode = false}) {
     final _$actionInfo = _$ChatStoreBaseActionController.startAction(
-        name: 'ChatStoreBase.addEmote');
+      name: 'ChatStoreBase.addEmote',
+    );
     try {
       return super.addEmote(emote, autocompleteMode: autocompleteMode);
     } finally {
@@ -289,7 +491,8 @@ mixin _$ChatStore on ChatStoreBase, Store {
   @override
   void updateNotification(String notificationMessage) {
     final _$actionInfo = _$ChatStoreBaseActionController.startAction(
-        name: 'ChatStoreBase.updateNotification');
+      name: 'ChatStoreBase.updateNotification',
+    );
     try {
       return super.updateNotification(notificationMessage);
     } finally {
@@ -298,11 +501,30 @@ mixin _$ChatStore on ChatStoreBase, Store {
   }
 
   @override
-  void updateSleepTimer({required void Function() onTimerFinished}) {
+  void clearNotification() {
     final _$actionInfo = _$ChatStoreBaseActionController.startAction(
-        name: 'ChatStoreBase.updateSleepTimer');
+      name: 'ChatStoreBase.clearNotification',
+    );
     try {
-      return super.updateSleepTimer(onTimerFinished: onTimerFinished);
+      return super.clearNotification();
+    } finally {
+      _$ChatStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void updateSleepTimer({
+    required Duration duration,
+    required VoidCallback onTimerFinished,
+  }) {
+    final _$actionInfo = _$ChatStoreBaseActionController.startAction(
+      name: 'ChatStoreBase.updateSleepTimer',
+    );
+    try {
+      return super.updateSleepTimer(
+        duration: duration,
+        onTimerFinished: onTimerFinished,
+      );
     } finally {
       _$ChatStoreBaseActionController.endAction(_$actionInfo);
     }
@@ -311,7 +533,8 @@ mixin _$ChatStore on ChatStoreBase, Store {
   @override
   void cancelSleepTimer() {
     final _$actionInfo = _$ChatStoreBaseActionController.startAction(
-        name: 'ChatStoreBase.cancelSleepTimer');
+      name: 'ChatStoreBase.cancelSleepTimer',
+    );
     try {
       return super.cancelSleepTimer();
     } finally {
@@ -319,14 +542,40 @@ mixin _$ChatStore on ChatStoreBase, Store {
     }
   }
 
+  @override
+  void unfocusInput() {
+    final _$actionInfo = _$ChatStoreBaseActionController.startAction(
+      name: 'ChatStoreBase.unfocusInput',
+    );
+    try {
+      return super.unfocusInput();
+    } finally {
+      _$ChatStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void safeRequestFocus() {
+    final _$actionInfo = _$ChatStoreBaseActionController.startAction(
+      name: 'ChatStoreBase.safeRequestFocus',
+    );
+    try {
+      return super.safeRequestFocus();
+    } finally {
+      _$ChatStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
   @override
   String toString() {
     return '''
-sleepHours: ${sleepHours},
-sleepMinutes: ${sleepMinutes},
 timeRemaining: ${timeRemaining},
 expandChat: ${expandChat},
-renderMessages: ${renderMessages}
+replyingToMessage: ${replyingToMessage},
+renderMessages: ${renderMessages},
+matchingEmotes: ${matchingEmotes},
+matchingChatters: ${matchingChatters},
+bottomBarHeight: ${bottomBarHeight}
     ''';
   }
 }
diff --git a/lib/screens/channel/chat/stores/chat_tabs_store.dart b/lib/screens/channel/chat/stores/chat_tabs_store.dart
new file mode 100644
index 00000000..ee095442
--- /dev/null
+++ b/lib/screens/channel/chat/stores/chat_tabs_store.dart
@@ -0,0 +1,754 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:frosty/apis/bttv_api.dart';
+import 'package:frosty/apis/ffz_api.dart';
+import 'package:frosty/apis/seventv_api.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/models/irc.dart';
+import 'package:frosty/models/user.dart';
+import 'package:frosty/screens/channel/chat/details/chat_details_store.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_assets_store.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_interaction_pause.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/stores/global_assets_store.dart';
+import 'package:json_annotation/json_annotation.dart';
+import 'package:mobx/mobx.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
+
+part 'chat_tabs_store.g.dart';
+
+/// Lightweight data class for persisting chat tab info to settings.
+/// Does NOT include ChatStore since WebSocket connections cannot be persisted.
+@JsonSerializable()
+class PersistedChatTab {
+  final String channelId;
+  final String channelLogin;
+  final String displayName;
+
+  const PersistedChatTab({
+    required this.channelId,
+    required this.channelLogin,
+    required this.displayName,
+  });
+
+  factory PersistedChatTab.fromJson(Map<String, dynamic> json) =>
+      _$PersistedChatTabFromJson(json);
+  Map<String, dynamic> toJson() => _$PersistedChatTabToJson(this);
+
+  /// Create from a ChatTabInfo (for syncing current tabs to settings).
+  factory PersistedChatTab.fromChatTabInfo(ChatTabInfo info) =>
+      PersistedChatTab(
+        channelId: info.channelId,
+        channelLogin: info.channelLogin,
+        displayName: info.displayName,
+      );
+}
+
+/// Data class holding information about a chat tab.
+class ChatTabInfo {
+  final String channelId;
+  final String channelLogin;
+  final String displayName;
+
+  /// The ChatStore for this tab. Null until the tab is activated (lazy loading).
+  ChatStore? chatStore;
+
+  /// The id of the most recent message visible the last time the user viewed
+  /// this tab. Used to compute unread state — null means "no baseline yet".
+  String? lastSeenMessageId;
+
+  /// Whether this is the primary tab (first tab, cannot be removed).
+  final bool isPrimary;
+
+  /// Whether this tab has been activated (chatStore created).
+  bool get isActivated => chatStore != null;
+
+  ChatTabInfo({
+    required this.channelId,
+    required this.channelLogin,
+    required this.displayName,
+    this.chatStore,
+    required this.isPrimary,
+  });
+}
+
+/// A message paired with its source ChatStore for merged view rendering.
+class MergedMessage {
+  final IRCMessage ircMessage;
+  final ChatStore chatStore;
+
+  const MergedMessage({required this.ircMessage, required this.chatStore});
+}
+
+/// Store that manages multiple chat tabs.
+class ChatTabsStore = ChatTabsStoreBase with _$ChatTabsStore;
+
+abstract class ChatTabsStoreBase with Store {
+  /// Maximum number of tabs allowed.
+  static const maxTabs = 10;
+
+  /// Max messages to render in merged view when autoscrolling.
+  static const _mergedRenderLimit = 100;
+
+  /// API services needed for creating ChatStore instances.
+  final TwitchApi twitchApi;
+  final BTTVApi bttvApi;
+  final FFZApi ffzApi;
+  final SevenTVApi sevenTVApi;
+
+  /// Global stores passed to each ChatStore.
+  final AuthStore authStore;
+  final SettingsStore settingsStore;
+  final GlobalAssetsStore globalAssetsStore;
+
+  /// The list of open chat tabs.
+  @readonly
+  var _tabs = ObservableList<ChatTabInfo>();
+
+  /// The index of the currently active tab.
+  @observable
+  var activeTabIndex = 0;
+
+  /// Returns the currently active tab info.
+  @computed
+  ChatTabInfo get activeTab => _tabs[activeTabIndex];
+
+  /// Returns the ChatStore of the currently active tab.
+  /// The active tab is always activated, so this should never be null.
+  @computed
+  ChatStore get activeChatStore => _tabs[activeTabIndex].chatStore!;
+
+  /// Whether we can add more tabs (under the limit).
+  @computed
+  bool get canAddTab => _tabs.length < maxTabs;
+
+  /// Whether the tab bar should be visible (more than 1 tab).
+  @computed
+  bool get showTabBar => _tabs.length > 1;
+
+  /// Whether merged chat mode is active (session-only, not persisted).
+  @observable
+  var mergedMode = false;
+
+  /// Channel profiles for badge rendering in merged view.
+  final _tabChannelProfiles = ObservableMap<String, UserTwitch>();
+
+  /// Scroll controller for the merged chat view.
+  final mergedScrollController = ScrollController();
+
+  /// Whether the merged view should auto-scroll.
+  @readonly
+  var _mergedAutoScroll = true;
+
+  /// Timer-driven rendered messages for merged view.
+  /// Updated every 200ms to match normal chat's batched flush cadence,
+  /// instead of reacting to each per-tab ObservableList mutation.
+  @readonly
+  var _mergedRenderedMessages = <MergedMessage>[];
+
+  /// Timer that drives merged message rendering at a fixed cadence.
+  Timer? _mergedRenderTimer;
+
+  /// Freezes the rendered merged list while the user is touching it, so a
+  /// long-press target can't scroll out from under the finger. Gates the
+  /// periodic [_refreshMergedMessages]; see [ChatInteractionPause].
+  final _interactionPause = ChatInteractionPause();
+
+  /// Hooks for the merged message list to report touch start/move/end (see [Chat]).
+  void onMessageListPointerDown(int pointer, Offset position) =>
+      _interactionPause.pointerDown(pointer, position);
+  void onMessageListPointerMove(int pointer, Offset position) =>
+      _interactionPause.pointerMove(pointer, position);
+  void onMessageListPointerUp(int pointer) =>
+      _interactionPause.pointerUp(pointer);
+
+  /// Frozen snapshot of merged messages when user scrolls up.
+  /// Prevents new messages from causing scroll jumps while reading.
+  List<MergedMessage>? _mergedSnapshot;
+
+  /// Total message count across all tabs when the snapshot was taken.
+  int _mergedSnapshotTotalCount = 0;
+
+  /// Combined channel-to-user map for merged view badge rendering.
+  @computed
+  Map<String, UserTwitch> get mergedChannelIdToUserTwitch {
+    final merged = <String, UserTwitch>{};
+    for (final tab in _tabs) {
+      if (tab.chatStore != null) {
+        merged.addAll(tab.chatStore!.assetsStore.channelIdToUserTwitch);
+      }
+    }
+    merged.addAll(_tabChannelProfiles);
+    return merged;
+  }
+
+  static int _compareByTimestamp(MergedMessage a, MergedMessage b) {
+    final aTs = int.tryParse(a.ircMessage.tags['tmi-sent-ts'] ?? '') ?? 0;
+    final bTs = int.tryParse(b.ircMessage.tags['tmi-sent-ts'] ?? '') ?? 0;
+    return aTs.compareTo(bTs);
+  }
+
+  /// Adds messages from [store] to [out], deduplicating by message ID
+  /// (handles Twitch shared chat where the same message arrives on multiple
+  /// IRC connections). Includes messageBuffer only when the tab's own
+  /// autoScroll is off (paused tabs whose timer won't flush).
+  void _collectMessages(
+    ChatStore store,
+    List<MergedMessage> out,
+    Set<String> seenIds, {
+    int? tailCount,
+  }) {
+    final msgs = store.messages;
+    final start = tailCount != null && msgs.length > tailCount
+        ? msgs.length - tailCount
+        : 0;
+    for (var i = start; i < msgs.length; i++) {
+      final id = msgs[i].tags['id'];
+      if (id != null && !seenIds.add(id)) continue;
+      out.add(MergedMessage(ircMessage: msgs[i], chatStore: store));
+    }
+    // Only read messageBuffer for paused tabs — their timer won't flush
+    // so these messages would otherwise be invisible in merged view.
+    if (!store.autoScroll) {
+      for (final msg in store.messageBuffer) {
+        final id = msg.tags['id'];
+        if (id != null && !seenIds.add(id)) continue;
+        out.add(MergedMessage(ircMessage: msg, chatStore: store));
+      }
+    }
+  }
+
+  /// Collects, sorts, and caps all messages from all tabs.
+  List<MergedMessage> _computeAllMergedMessages() {
+    final allMessages = <MergedMessage>[];
+    final seenIds = <String>{};
+    for (final tab in _tabs) {
+      if (tab.chatStore == null) continue;
+      _collectMessages(tab.chatStore!, allMessages, seenIds);
+    }
+    allMessages.sort(_compareByTimestamp);
+    return allMessages;
+  }
+
+  /// Fast path: only collects the tail of each tab's messages for autoscroll.
+  /// Instead of sorting all 50k messages, sorts at most k*100 items.
+  List<MergedMessage> _computeRecentMergedMessages() {
+    final recent = <MergedMessage>[];
+    final seenIds = <String>{};
+    for (final tab in _tabs) {
+      if (tab.chatStore == null) continue;
+      _collectMessages(
+        tab.chatStore!,
+        recent,
+        seenIds,
+        tailCount: _mergedRenderLimit,
+      );
+    }
+    recent.sort(_compareByTimestamp);
+    if (recent.length > _mergedRenderLimit) {
+      return recent.sublist(recent.length - _mergedRenderLimit);
+    }
+    return recent;
+  }
+
+  /// Interleaved messages from all activated tabs, sorted by timestamp.
+  /// During autoscroll, returns timer-driven [_mergedRenderedMessages] which
+  /// updates every 200ms — matching normal chat's batched flush cadence.
+  /// When scrolled up, returns a frozen snapshot.
+  @computed
+  List<MergedMessage> get mergedMessages {
+    if (!_mergedAutoScroll && _mergedSnapshot != null) {
+      return _mergedSnapshot!;
+    }
+    return _mergedRenderedMessages;
+  }
+
+  /// Refreshes the rendered merged messages. Called by the render timer.
+  @action
+  void _refreshMergedMessages() {
+    // Hold the rendered list still while the user is touching it so a
+    // long-press target stays put for the duration of the press.
+    if (!_mergedAutoScroll || _interactionPause.isPaused) return;
+    _mergedRenderedMessages = _computeRecentMergedMessages();
+  }
+
+  /// Count of new messages since the user scrolled up (for "N new messages").
+  /// Total messages (messages + messageBuffer) across all tabs.
+  int _totalMessageCount() {
+    var total = 0;
+    for (final tab in _tabs) {
+      if (tab.chatStore != null) {
+        total +=
+            tab.chatStore!.messages.length +
+            tab.chatStore!.messageBuffer.length;
+      }
+    }
+    return total;
+  }
+
+  @computed
+  int get mergedBufferCount {
+    if (!_mergedAutoScroll && _mergedSnapshot != null) {
+      final diff = _totalMessageCount() - _mergedSnapshotTotalCount;
+      return diff > 0 ? diff : 0;
+    }
+    return 0;
+  }
+
+  /// Public getter for the tabs list.
+  List<ChatTabInfo> get tabs => _tabs;
+
+  ChatTabsStoreBase({
+    required this.twitchApi,
+    required this.bttvApi,
+    required this.ffzApi,
+    required this.sevenTVApi,
+    required this.authStore,
+    required this.settingsStore,
+    required this.globalAssetsStore,
+    required String primaryChannelId,
+    required String primaryChannelLogin,
+    required String primaryDisplayName,
+  }) {
+    // Enable wakelock once for all chat tabs
+    if (settingsStore.keepScreenAwake) {
+      WakelockPlus.enable();
+    }
+
+    // Initialize with the primary channel tab
+    _addPrimaryTab(
+      channelId: primaryChannelId,
+      channelLogin: primaryChannelLogin,
+      displayName: primaryDisplayName,
+    );
+
+    // Restore persisted secondary tabs if feature is enabled
+    if (settingsStore.persistChatTabs) {
+      _restoreSecondaryTabs(primaryChannelId: primaryChannelId);
+    }
+
+    // Set up merged scroll listener once (reused across toggle cycles)
+    mergedScrollController.addListener(() {
+      if (!mergedScrollController.hasClients) return;
+      runInAction(() {
+        if (mergedScrollController.position.pixels <= 0) {
+          if (!_mergedAutoScroll) {
+            _mergedSnapshot = null;
+            _mergedAutoScroll = true;
+          }
+        } else if (mergedScrollController.position.pixels > 0) {
+          if (_mergedAutoScroll) {
+            // Capture snapshot so the list stays frozen while scrolling
+            _mergedSnapshot = _computeAllMergedMessages();
+            _mergedSnapshotTotalCount = _totalMessageCount();
+            _mergedAutoScroll = false;
+          }
+        }
+      });
+    });
+  }
+
+  /// Creates a ChatStore for a given channel.
+  ChatStore _createChatStore({
+    required String channelId,
+    required String channelLogin,
+    required String displayName,
+  }) {
+    return ChatStore(
+      twitchApi: twitchApi,
+      channelName: channelLogin,
+      channelId: channelId,
+      displayName: displayName,
+      auth: authStore,
+      settings: settingsStore,
+      chatDetailsStore: ChatDetailsStore(
+        twitchApi: twitchApi,
+        channelName: channelLogin,
+      ),
+      assetsStore: ChatAssetsStore(
+        twitchApi: twitchApi,
+        ffzApi: ffzApi,
+        bttvApi: bttvApi,
+        sevenTVApi: sevenTVApi,
+        globalAssetsStore: globalAssetsStore,
+      ),
+    );
+  }
+
+  /// Toggles merged chat mode. Only already-activated tabs are included;
+  /// tapping a lazy tab in merged mode activates it and adds it to the merge.
+  @action
+  void toggleMergedMode() {
+    mergedMode = !mergedMode;
+    if (mergedMode) {
+      // Reset scroll state
+      _mergedAutoScroll = true;
+      _mergedSnapshot = null;
+      // Fetch channel profiles for activated tabs only
+      for (final tab in _tabs) {
+        if (tab.chatStore != null) {
+          _fetchTabChannelProfile(tab);
+        }
+      }
+      // Start render timer — compute immediately then every 200ms
+      _refreshMergedMessages();
+      _mergedRenderTimer?.cancel();
+      _mergedRenderTimer = Timer.periodic(
+        const Duration(milliseconds: 200),
+        (_) => _refreshMergedMessages(),
+      );
+    } else {
+      _mergedRenderTimer?.cancel();
+      _mergedRenderTimer = null;
+      _mergedRenderedMessages = [];
+    }
+  }
+
+  /// Re-enables auto-scroll and jumps to the latest message in merged view.
+  @action
+  void resumeMergedScroll() {
+    _mergedSnapshot = null;
+    _mergedAutoScroll = true;
+    // Refresh immediately so the list shows latest messages before the
+    // next timer tick.
+    _refreshMergedMessages();
+    mergedScrollController.jumpTo(0);
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mergedScrollController.hasClients) {
+        mergedScrollController.jumpTo(0);
+      }
+    });
+  }
+
+  /// Fetches the channel profile for badge rendering in merged view.
+  Future<void> _fetchTabChannelProfile(ChatTabInfo tab) async {
+    if (_tabChannelProfiles.containsKey(tab.channelId)) return;
+    try {
+      final user = await twitchApi.getUser(id: tab.channelId);
+      _tabChannelProfiles[tab.channelId] = user;
+    } catch (e) {
+      debugPrint('Failed to fetch profile for ${tab.channelLogin}: $e');
+    }
+  }
+
+  /// Activates a tab by creating its ChatStore if not already activated.
+  @action
+  void activateTab(int index) {
+    if (index < 0 || index >= _tabs.length) return;
+
+    final tab = _tabs[index];
+    if (tab.chatStore != null) return; // Already activated
+
+    tab.chatStore = _createChatStore(
+      channelId: tab.channelId,
+      channelLogin: tab.channelLogin,
+      displayName: tab.displayName,
+    );
+  }
+
+  /// Adds the primary tab (called during initialization).
+  void _addPrimaryTab({
+    required String channelId,
+    required String channelLogin,
+    required String displayName,
+  }) {
+    final chatStore = _createChatStore(
+      channelId: channelId,
+      channelLogin: channelLogin,
+      displayName: displayName,
+    );
+
+    _tabs.add(
+      ChatTabInfo(
+        channelId: channelId,
+        channelLogin: channelLogin,
+        displayName: displayName,
+        chatStore: chatStore,
+        isPrimary: true,
+      ),
+    );
+  }
+
+  /// Restores secondary tabs from settings (lazy - no ChatStore created).
+  void _restoreSecondaryTabs({required String primaryChannelId}) {
+    for (final persisted in settingsStore.secondaryTabs) {
+      // Skip if this is the same as the primary tab (already added)
+      if (persisted.channelId == primaryChannelId) {
+        continue;
+      }
+
+      // Skip if at max capacity
+      if (_tabs.length >= maxTabs) {
+        break;
+      }
+
+      // Add tab without ChatStore (lazy loading)
+      _tabs.add(
+        ChatTabInfo(
+          channelId: persisted.channelId,
+          channelLogin: persisted.channelLogin,
+          displayName: persisted.displayName,
+          isPrimary: false,
+        ),
+      );
+    }
+  }
+
+  /// Syncs current secondary tabs to settings for persistence.
+  void _syncSecondaryTabsToSettings() {
+    if (!settingsStore.persistChatTabs) return;
+
+    // Get all non-primary tabs and convert to PersistedChatTab
+    final secondaryTabs = _tabs
+        .where((tab) => !tab.isPrimary)
+        .map(PersistedChatTab.fromChatTabInfo)
+        .toList();
+
+    // Update settings (autorun will handle persistence)
+    settingsStore.secondaryTabs = secondaryTabs;
+  }
+
+  /// Adds a new chat tab for the given channel.
+  /// Returns true if the tab was added, false if at limit or duplicate.
+  @action
+  bool addTab({
+    required String channelId,
+    required String channelLogin,
+    required String displayName,
+  }) {
+    // Check if at max capacity
+    if (_tabs.length >= maxTabs) {
+      return false;
+    }
+
+    // Check for duplicate channel
+    final existingIndex = _tabs.indexWhere((tab) => tab.channelId == channelId);
+    if (existingIndex != -1) {
+      // Switch to existing tab instead of adding duplicate
+      setActiveTab(existingIndex);
+      return false;
+    }
+
+    // Add the new tab (lazy - no ChatStore yet)
+    _tabs.add(
+      ChatTabInfo(
+        channelId: channelId,
+        channelLogin: channelLogin,
+        displayName: displayName,
+        isPrimary: false,
+      ),
+    );
+
+    // Switch to the new tab, snapshotting the outgoing tab's lastSeenMessageId.
+    final newIndex = _tabs.length - 1;
+    setActiveTab(newIndex);
+
+    // If in merged mode, fetch the new tab's channel profile
+    if (mergedMode) {
+      _fetchTabChannelProfile(_tabs[newIndex]);
+    }
+
+    // Sync to settings for persistence
+    _syncSecondaryTabsToSettings();
+
+    return true;
+  }
+
+  /// Deactivates a tab by disposing its ChatStore without removing the tab.
+  /// The tab stays in the tab bar but appears dimmed. Tapping reactivates it.
+  @action
+  void deactivateTab(int index) {
+    if (index < 0 || index >= _tabs.length) return;
+    final tab = _tabs[index];
+    if (tab.isPrimary) return;
+    if (tab.chatStore == null) return;
+
+    // If this is the active tab, switch to primary
+    if (index == activeTabIndex) {
+      activeTabIndex = 0;
+    }
+
+    // Clean up merged mode state
+    if (mergedMode) {
+      _tabChannelProfiles.remove(tab.channelId);
+      _mergedSnapshot = null;
+    }
+
+    // Dispose the ChatStore (closes IRC connection)
+    tab.chatStore!.dispose();
+    tab.chatStore = null;
+
+    // Exit merged mode if fewer than 2 tabs remain activated
+    if (mergedMode && _tabs.where((t) => t.chatStore != null).length < 2) {
+      mergedMode = false;
+      _mergedRenderTimer?.cancel();
+      _mergedRenderTimer = null;
+      _mergedRenderedMessages = [];
+    }
+  }
+
+  /// Removes the tab at the given index.
+  /// Returns true if removed, false if primary tab or invalid index.
+  @action
+  bool removeTab(int index) {
+    // Validate index
+    if (index < 0 || index >= _tabs.length) {
+      return false;
+    }
+
+    // Cannot remove primary tab
+    if (_tabs[index].isPrimary) {
+      return false;
+    }
+
+    // Clean up merged mode state
+    _tabChannelProfiles.remove(_tabs[index].channelId);
+    // Clear stale snapshot that may reference this tab's disposed ChatStore
+    _mergedSnapshot = null;
+
+    // Dispose the ChatStore before removing (if activated)
+    _tabs[index].chatStore?.dispose();
+
+    // Remove the tab
+    _tabs.removeAt(index);
+
+    // Disable merged mode if only 1 tab remains
+    if (_tabs.length <= 1 && mergedMode) {
+      mergedMode = false;
+      _mergedRenderTimer?.cancel();
+      _mergedRenderTimer = null;
+      _mergedRenderedMessages = [];
+    }
+
+    // Adjust active index if necessary
+    if (activeTabIndex >= _tabs.length) {
+      activeTabIndex = _tabs.length - 1;
+    } else if (activeTabIndex > index) {
+      activeTabIndex--;
+    }
+
+    // Ensure the new active tab is activated (in case it was lazy)
+    activateTab(activeTabIndex);
+
+    // Sync to settings for persistence
+    _syncSecondaryTabsToSettings();
+
+    return true;
+  }
+
+  /// Reorders a tab from oldIndex to newIndex.
+  /// The primary tab (index 0) cannot be moved, and no tab can be placed before it.
+  @action
+  void reorderTab(int oldIndex, int newIndex) {
+    // Primary tab (index 0) cannot be moved, and nothing can move before it
+    if (oldIndex == 0 || newIndex == 0) return;
+
+    // onReorderItem already adjusts newIndex for the removed item, so no
+    // manual off-by-one correction is needed here.
+    if (oldIndex == newIndex) return;
+
+    final tab = _tabs.removeAt(oldIndex);
+    _tabs.insert(newIndex, tab);
+
+    // Adjust activeTabIndex to follow the active tab
+    if (activeTabIndex == oldIndex) {
+      activeTabIndex = newIndex;
+    } else if (oldIndex < activeTabIndex && newIndex >= activeTabIndex) {
+      activeTabIndex -= 1;
+    } else if (oldIndex > activeTabIndex && newIndex <= activeTabIndex) {
+      activeTabIndex += 1;
+    }
+
+    _syncSecondaryTabsToSettings();
+  }
+
+  /// Returns the last message id in [messages] that has a non-null tag id,
+  /// or null if no such message exists. Skips system messages without ids.
+  String? _latestMessageId(List<IRCMessage> messages) {
+    for (var i = messages.length - 1; i >= 0; i--) {
+      final id = messages[i].tags['id'];
+      if (id != null) return id;
+    }
+    return null;
+  }
+
+  /// True if [index] has unread messages since the user last viewed it.
+  /// Always false for the active tab and in merged mode.
+  bool hasUnreadMessages(int index) {
+    if (mergedMode) return false;
+    if (index == activeTabIndex) return false;
+    if (index < 0 || index >= _tabs.length) return false;
+    final tab = _tabs[index];
+    final store = tab.chatStore;
+    if (store == null) return false;
+    final latest = _latestMessageId(store.messages);
+    if (latest == null) return false;
+    return latest != tab.lastSeenMessageId;
+  }
+
+  /// Sets the active tab to the given index.
+  ///
+  /// When [silent] is true, the current tab's draft text and reply state are
+  /// preserved. Used for programmatic switches (e.g., reply/paste routing in
+  /// merged mode) where wiping the draft would lose user work.
+  @action
+  void setActiveTab(int index, {bool silent = false}) {
+    if (index >= 0 && index < _tabs.length) {
+      // Snapshot the outgoing tab's most recent message id so the unread
+      // dot for that tab clears, and only future messages count as unread.
+      if (index != activeTabIndex &&
+          activeTabIndex >= 0 &&
+          activeTabIndex < _tabs.length) {
+        final outgoing = _tabs[activeTabIndex];
+        final outStore = outgoing.chatStore;
+        if (outStore != null) {
+          outgoing.lastSeenMessageId = _latestMessageId(outStore.messages);
+        }
+      }
+
+      // Clear text input and emote menu when switching tabs.
+      // Skip in merged mode — tabs act as send-target selectors, not
+      // view switches, so draft/reply state should be preserved.
+      if (index != activeTabIndex && !silent && !mergedMode) {
+        final currentStore = _tabs[activeTabIndex].chatStore;
+        if (currentStore != null) {
+          // Close emote menu if open
+          currentStore.assetsStore.showEmoteMenu = false;
+          // Unfocus input
+          currentStore.unfocusInput();
+          // Clear text input
+          currentStore.textController.clear();
+          // Clear reply state
+          currentStore.replyingToMessage = null;
+        }
+      }
+
+      // Activate the target tab if not already activated
+      activateTab(index);
+
+      if (mergedMode) {
+        _fetchTabChannelProfile(_tabs[index]);
+      }
+
+      activeTabIndex = index;
+    }
+  }
+
+  /// Disposes all ChatStores and cleans up resources.
+  void dispose() {
+    _mergedRenderTimer?.cancel();
+    _mergedRenderTimer = null;
+    _interactionPause.reset();
+    for (final tab in _tabs) {
+      tab.chatStore?.dispose();
+    }
+    _tabs.clear();
+    mergedScrollController.dispose();
+
+    // Disable wakelock once after all tabs disposed
+    WakelockPlus.disable();
+  }
+}
diff --git a/lib/screens/channel/chat/stores/chat_tabs_store.g.dart b/lib/screens/channel/chat/stores/chat_tabs_store.g.dart
new file mode 100644
index 00000000..61bfea32
--- /dev/null
+++ b/lib/screens/channel/chat/stores/chat_tabs_store.g.dart
@@ -0,0 +1,320 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'chat_tabs_store.dart';
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+PersistedChatTab _$PersistedChatTabFromJson(Map<String, dynamic> json) =>
+    PersistedChatTab(
+      channelId: json['channelId'] as String,
+      channelLogin: json['channelLogin'] as String,
+      displayName: json['displayName'] as String,
+    );
+
+Map<String, dynamic> _$PersistedChatTabToJson(PersistedChatTab instance) =>
+    <String, dynamic>{
+      'channelId': instance.channelId,
+      'channelLogin': instance.channelLogin,
+      'displayName': instance.displayName,
+    };
+
+// **************************************************************************
+// StoreGenerator
+// **************************************************************************
+
+// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
+
+mixin _$ChatTabsStore on ChatTabsStoreBase, Store {
+  Computed<ChatTabInfo>? _$activeTabComputed;
+
+  @override
+  ChatTabInfo get activeTab => (_$activeTabComputed ??= Computed<ChatTabInfo>(
+    () => super.activeTab,
+    name: 'ChatTabsStoreBase.activeTab',
+  )).value;
+  Computed<ChatStore>? _$activeChatStoreComputed;
+
+  @override
+  ChatStore get activeChatStore =>
+      (_$activeChatStoreComputed ??= Computed<ChatStore>(
+        () => super.activeChatStore,
+        name: 'ChatTabsStoreBase.activeChatStore',
+      )).value;
+  Computed<bool>? _$canAddTabComputed;
+
+  @override
+  bool get canAddTab => (_$canAddTabComputed ??= Computed<bool>(
+    () => super.canAddTab,
+    name: 'ChatTabsStoreBase.canAddTab',
+  )).value;
+  Computed<bool>? _$showTabBarComputed;
+
+  @override
+  bool get showTabBar => (_$showTabBarComputed ??= Computed<bool>(
+    () => super.showTabBar,
+    name: 'ChatTabsStoreBase.showTabBar',
+  )).value;
+  Computed<Map<String, UserTwitch>>? _$mergedChannelIdToUserTwitchComputed;
+
+  @override
+  Map<String, UserTwitch> get mergedChannelIdToUserTwitch =>
+      (_$mergedChannelIdToUserTwitchComputed ??=
+              Computed<Map<String, UserTwitch>>(
+                () => super.mergedChannelIdToUserTwitch,
+                name: 'ChatTabsStoreBase.mergedChannelIdToUserTwitch',
+              ))
+          .value;
+  Computed<List<MergedMessage>>? _$mergedMessagesComputed;
+
+  @override
+  List<MergedMessage> get mergedMessages =>
+      (_$mergedMessagesComputed ??= Computed<List<MergedMessage>>(
+        () => super.mergedMessages,
+        name: 'ChatTabsStoreBase.mergedMessages',
+      )).value;
+  Computed<int>? _$mergedBufferCountComputed;
+
+  @override
+  int get mergedBufferCount => (_$mergedBufferCountComputed ??= Computed<int>(
+    () => super.mergedBufferCount,
+    name: 'ChatTabsStoreBase.mergedBufferCount',
+  )).value;
+
+  late final _$_tabsAtom = Atom(
+    name: 'ChatTabsStoreBase._tabs',
+    context: context,
+  );
+
+  ObservableList<ChatTabInfo> get tabs {
+    _$_tabsAtom.reportRead();
+    return super._tabs;
+  }
+
+  @override
+  ObservableList<ChatTabInfo> get _tabs => tabs;
+
+  @override
+  set _tabs(ObservableList<ChatTabInfo> value) {
+    _$_tabsAtom.reportWrite(value, super._tabs, () {
+      super._tabs = value;
+    });
+  }
+
+  late final _$activeTabIndexAtom = Atom(
+    name: 'ChatTabsStoreBase.activeTabIndex',
+    context: context,
+  );
+
+  @override
+  int get activeTabIndex {
+    _$activeTabIndexAtom.reportRead();
+    return super.activeTabIndex;
+  }
+
+  @override
+  set activeTabIndex(int value) {
+    _$activeTabIndexAtom.reportWrite(value, super.activeTabIndex, () {
+      super.activeTabIndex = value;
+    });
+  }
+
+  late final _$mergedModeAtom = Atom(
+    name: 'ChatTabsStoreBase.mergedMode',
+    context: context,
+  );
+
+  @override
+  bool get mergedMode {
+    _$mergedModeAtom.reportRead();
+    return super.mergedMode;
+  }
+
+  @override
+  set mergedMode(bool value) {
+    _$mergedModeAtom.reportWrite(value, super.mergedMode, () {
+      super.mergedMode = value;
+    });
+  }
+
+  late final _$_mergedAutoScrollAtom = Atom(
+    name: 'ChatTabsStoreBase._mergedAutoScroll',
+    context: context,
+  );
+
+  bool get mergedAutoScroll {
+    _$_mergedAutoScrollAtom.reportRead();
+    return super._mergedAutoScroll;
+  }
+
+  @override
+  bool get _mergedAutoScroll => mergedAutoScroll;
+
+  @override
+  set _mergedAutoScroll(bool value) {
+    _$_mergedAutoScrollAtom.reportWrite(value, super._mergedAutoScroll, () {
+      super._mergedAutoScroll = value;
+    });
+  }
+
+  late final _$_mergedRenderedMessagesAtom = Atom(
+    name: 'ChatTabsStoreBase._mergedRenderedMessages',
+    context: context,
+  );
+
+  List<MergedMessage> get mergedRenderedMessages {
+    _$_mergedRenderedMessagesAtom.reportRead();
+    return super._mergedRenderedMessages;
+  }
+
+  @override
+  List<MergedMessage> get _mergedRenderedMessages => mergedRenderedMessages;
+
+  @override
+  set _mergedRenderedMessages(List<MergedMessage> value) {
+    _$_mergedRenderedMessagesAtom.reportWrite(
+      value,
+      super._mergedRenderedMessages,
+      () {
+        super._mergedRenderedMessages = value;
+      },
+    );
+  }
+
+  late final _$ChatTabsStoreBaseActionController = ActionController(
+    name: 'ChatTabsStoreBase',
+    context: context,
+  );
+
+  @override
+  void _refreshMergedMessages() {
+    final _$actionInfo = _$ChatTabsStoreBaseActionController.startAction(
+      name: 'ChatTabsStoreBase._refreshMergedMessages',
+    );
+    try {
+      return super._refreshMergedMessages();
+    } finally {
+      _$ChatTabsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void toggleMergedMode() {
+    final _$actionInfo = _$ChatTabsStoreBaseActionController.startAction(
+      name: 'ChatTabsStoreBase.toggleMergedMode',
+    );
+    try {
+      return super.toggleMergedMode();
+    } finally {
+      _$ChatTabsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void resumeMergedScroll() {
+    final _$actionInfo = _$ChatTabsStoreBaseActionController.startAction(
+      name: 'ChatTabsStoreBase.resumeMergedScroll',
+    );
+    try {
+      return super.resumeMergedScroll();
+    } finally {
+      _$ChatTabsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void activateTab(int index) {
+    final _$actionInfo = _$ChatTabsStoreBaseActionController.startAction(
+      name: 'ChatTabsStoreBase.activateTab',
+    );
+    try {
+      return super.activateTab(index);
+    } finally {
+      _$ChatTabsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  bool addTab({
+    required String channelId,
+    required String channelLogin,
+    required String displayName,
+  }) {
+    final _$actionInfo = _$ChatTabsStoreBaseActionController.startAction(
+      name: 'ChatTabsStoreBase.addTab',
+    );
+    try {
+      return super.addTab(
+        channelId: channelId,
+        channelLogin: channelLogin,
+        displayName: displayName,
+      );
+    } finally {
+      _$ChatTabsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void deactivateTab(int index) {
+    final _$actionInfo = _$ChatTabsStoreBaseActionController.startAction(
+      name: 'ChatTabsStoreBase.deactivateTab',
+    );
+    try {
+      return super.deactivateTab(index);
+    } finally {
+      _$ChatTabsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  bool removeTab(int index) {
+    final _$actionInfo = _$ChatTabsStoreBaseActionController.startAction(
+      name: 'ChatTabsStoreBase.removeTab',
+    );
+    try {
+      return super.removeTab(index);
+    } finally {
+      _$ChatTabsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void reorderTab(int oldIndex, int newIndex) {
+    final _$actionInfo = _$ChatTabsStoreBaseActionController.startAction(
+      name: 'ChatTabsStoreBase.reorderTab',
+    );
+    try {
+      return super.reorderTab(oldIndex, newIndex);
+    } finally {
+      _$ChatTabsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void setActiveTab(int index, {bool silent = false}) {
+    final _$actionInfo = _$ChatTabsStoreBaseActionController.startAction(
+      name: 'ChatTabsStoreBase.setActiveTab',
+    );
+    try {
+      return super.setActiveTab(index, silent: silent);
+    } finally {
+      _$ChatTabsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  String toString() {
+    return '''
+activeTabIndex: ${activeTabIndex},
+mergedMode: ${mergedMode},
+activeTab: ${activeTab},
+activeChatStore: ${activeChatStore},
+canAddTab: ${canAddTab},
+showTabBar: ${showTabBar},
+mergedChannelIdToUserTwitch: ${mergedChannelIdToUserTwitch},
+mergedMessages: ${mergedMessages},
+mergedBufferCount: ${mergedBufferCount}
+    ''';
+  }
+}
diff --git a/lib/screens/channel/chat/stores/shared_chat_bubble_state.dart b/lib/screens/channel/chat/stores/shared_chat_bubble_state.dart
new file mode 100644
index 00000000..6d18c655
--- /dev/null
+++ b/lib/screens/channel/chat/stores/shared_chat_bubble_state.dart
@@ -0,0 +1,45 @@
+import 'package:mobx/mobx.dart';
+
+/// Tracks user-driven spotlight/hide selections for participant channels in
+/// a Twitch shared chat session (multiple broadcasters merged onto one IRC
+/// connection). Pure state so it can be unit-tested without the chat store.
+///
+/// [ObservableSet] is reactive on its own, so [Observer] widgets reading
+/// [focusedChannelIds]/[hiddenChannelIds] rebuild without any MobX codegen.
+class SharedChatBubbleState {
+  /// Channel ids the user has spotlighted (kept unfaded). Empty means no
+  /// spotlight is active and nothing is faded.
+  final focusedChannelIds = ObservableSet<String>();
+
+  /// Channel ids whose messages are filtered out of the feed entirely.
+  final hiddenChannelIds = ObservableSet<String>();
+
+  /// Adds/removes [channelId] from the spotlight set. No-ops for a hidden
+  /// channel — its messages are filtered out, so spotlighting it would fade
+  /// every other channel to showcase nothing.
+  void toggleFocus(String channelId) {
+    if (hiddenChannelIds.contains(channelId)) return;
+    if (!focusedChannelIds.remove(channelId)) {
+      focusedChannelIds.add(channelId);
+    }
+  }
+
+  /// Hides [channelId]'s messages and drops it from the spotlight set.
+  void hide(String channelId) {
+    hiddenChannelIds.add(channelId);
+    focusedChannelIds.remove(channelId);
+  }
+
+  /// Un-hides [channelId]'s messages.
+  void show(String channelId) => hiddenChannelIds.remove(channelId);
+
+  bool isFocused(String channelId) => focusedChannelIds.contains(channelId);
+
+  bool isHidden(String channelId) => hiddenChannelIds.contains(channelId);
+
+  /// Clears both sets (e.g. when a shared chat session ends).
+  void reset() {
+    focusedChannelIds.clear();
+    hiddenChannelIds.clear();
+  }
+}
diff --git a/lib/screens/channel/chat/widgets/add_chat_dialog.dart b/lib/screens/channel/chat/widgets/add_chat_dialog.dart
new file mode 100644
index 00000000..cbf9927b
--- /dev/null
+++ b/lib/screens/channel/chat/widgets/add_chat_dialog.dart
@@ -0,0 +1,256 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/models/channel.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/alert_message.dart';
+import 'package:frosty/widgets/animated_scroll_border.dart';
+import 'package:frosty/widgets/live_indicator.dart';
+import 'package:frosty/widgets/profile_picture.dart';
+import 'package:frosty/widgets/section_header.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
+import 'package:frosty/widgets/uptime.dart';
+
+/// Data class returned when a channel is selected in the AddChatSheet.
+class AddChatResult {
+  final String channelId;
+  final String channelLogin;
+  final String displayName;
+
+  const AddChatResult({
+    required this.channelId,
+    required this.channelLogin,
+    required this.displayName,
+  });
+}
+
+/// Bottom sheet for adding a new chat tab by searching for a Twitch channel.
+class AddChatSheet extends StatefulWidget {
+  final TwitchApi twitchApi;
+
+  const AddChatSheet({super.key, required this.twitchApi});
+
+  /// Shows the bottom sheet and returns the selected channel info, or null if cancelled.
+  static Future<AddChatResult?> show(
+    BuildContext context,
+    TwitchApi twitchApi,
+  ) {
+    return showModalBottomSheetWithProperFocus<AddChatResult>(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => AddChatSheet(twitchApi: twitchApi),
+    );
+  }
+
+  @override
+  State<AddChatSheet> createState() => _AddChatSheetState();
+}
+
+class _AddChatSheetState extends State<AddChatSheet> {
+  final _textController = TextEditingController();
+  final _focusNode = FocusNode();
+  final _scrollController = ScrollController();
+
+  Timer? _debounce;
+  bool _isLoading = false;
+  String? _errorMessage;
+  List<ChannelQuery> _results = [];
+
+  @override
+  void initState() {
+    super.initState();
+    _textController.addListener(() => setState(() {}));
+    _focusNode.addListener(() => setState(() {}));
+  }
+
+  @override
+  void dispose() {
+    _debounce?.cancel();
+    _textController.dispose();
+    _focusNode.dispose();
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  void _onSearchChanged(String query) {
+    // Cancel any existing debounce
+    _debounce?.cancel();
+
+    if (query.isEmpty) {
+      setState(() {
+        _results = [];
+        _errorMessage = null;
+        _isLoading = false;
+      });
+      return;
+    }
+
+    setState(() {
+      _isLoading = true;
+      _errorMessage = null;
+    });
+
+    // Debounce the search by 300ms
+    _debounce = Timer(const Duration(milliseconds: 300), () async {
+      try {
+        final channels = await widget.twitchApi.searchChannels(query: query);
+        if (mounted) {
+          setState(() {
+            _results = channels;
+            _isLoading = false;
+            _errorMessage = null;
+          });
+        }
+      } catch (e) {
+        if (mounted) {
+          setState(() {
+            _results = [];
+            _isLoading = false;
+            _errorMessage = 'Failed to search channels';
+          });
+        }
+      }
+    });
+  }
+
+  void _selectChannel(ChannelQuery channel) {
+    Navigator.of(context).pop(
+      AddChatResult(
+        channelId: channel.id,
+        channelLogin: channel.broadcasterLogin,
+        displayName: channel.displayName,
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => FocusScope.of(context).unfocus(),
+      child: SizedBox(
+        height: MediaQuery.of(context).size.height * 0.8,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const SectionHeader('Add Chat', isFirst: true),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(12, 0, 12, 8),
+              child: TextField(
+                controller: _textController,
+                focusNode: _focusNode,
+                autocorrect: false,
+                decoration: InputDecoration(
+                  prefixIcon: const Icon(Icons.search_rounded),
+                  hintText: 'Search for a channel',
+                  suffixIcon:
+                      _focusNode.hasFocus || _textController.text.isNotEmpty
+                      ? IconButton(
+                          tooltip: _textController.text.isEmpty
+                              ? 'Cancel'
+                              : 'Clear',
+                          onPressed: () {
+                            if (_textController.text.isEmpty) {
+                              _focusNode.unfocus();
+                            }
+                            _textController.clear();
+                            _onSearchChanged('');
+                          },
+                          icon: const Icon(Icons.close_rounded),
+                        )
+                      : null,
+                ),
+                onChanged: _onSearchChanged,
+                textInputAction: TextInputAction.search,
+              ),
+            ),
+            AnimatedScrollBorder(scrollController: _scrollController),
+            Expanded(child: _buildResults()),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildResults() {
+    if (_textController.text.isEmpty) {
+      return Center(
+        child: Padding(
+          padding: const EdgeInsets.all(24),
+          child: Text(
+            'Search for a channel to add',
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
+          ),
+        ),
+      );
+    }
+
+    if (_isLoading) {
+      return ListView.builder(
+        controller: _scrollController,
+        itemCount: 8,
+        itemBuilder: (context, index) => ChannelSkeletonLoader(index: index),
+      );
+    }
+
+    if (_errorMessage != null) {
+      return Center(
+        child: Padding(
+          padding: const EdgeInsets.all(24),
+          child: AlertMessage(message: _errorMessage!),
+        ),
+      );
+    }
+
+    if (_results.isEmpty) {
+      return Center(
+        child: Padding(
+          padding: const EdgeInsets.all(24),
+          child: Text(
+            'No channels found',
+            style: TextStyle(
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
+          ),
+        ),
+      );
+    }
+
+    return ListView.builder(
+      controller: _scrollController,
+      padding: EdgeInsets.zero,
+      itemCount: _results.length,
+      itemBuilder: (context, index) {
+        final channel = _results[index];
+        final displayName = getReadableName(
+          channel.displayName,
+          channel.broadcasterLogin,
+        );
+
+        return ListTile(
+          leading: ProfilePicture(
+            userLogin: channel.broadcasterLogin,
+            radius: 16,
+          ),
+          title: Text(displayName),
+          subtitle: channel.isLive
+              ? Row(
+                  spacing: 6,
+                  children: [
+                    const LiveIndicator(),
+                    Uptime(startTime: channel.startedAt),
+                  ],
+                )
+              : null,
+          onTap: () => _selectChannel(channel),
+        );
+      },
+    );
+  }
+}
+
+// Keep backward compatibility alias
+typedef AddChatDialog = AddChatSheet;
diff --git a/lib/screens/channel/chat/widgets/chat_bottom_bar.dart b/lib/screens/channel/chat/widgets/chat_bottom_bar.dart
index 9c8d7de4..7f5365f2 100644
--- a/lib/screens/channel/chat/widgets/chat_bottom_bar.dart
+++ b/lib/screens/channel/chat/widgets/chat_bottom_bar.dart
@@ -1,84 +1,174 @@
+import 'package:extended_text_field/extended_text_field.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/constants.dart';
+import 'package:frosty/models/irc.dart';
 import 'package:frosty/screens/channel/chat/details/chat_details.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
-import 'package:frosty/widgets/button.dart';
-import 'package:frosty/widgets/cached_image.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/chat_input/emote_text_span_builder.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
+import 'package:frosty/widgets/measure_size.dart';
 
 class ChatBottomBar extends StatelessWidget {
   final ChatStore chatStore;
 
-  const ChatBottomBar({Key? key, required this.chatStore}) : super(key: key);
+  /// Callback to add a new chat tab.
+  /// Passes this to ChatDetails to show "Add chat" option.
+  final VoidCallback onAddChat;
+
+  /// When set, indicates merged mode — shown in hint text (e.g., "Chat in xQc").
+  final String? channelDisplayName;
+
+  const ChatBottomBar({
+    super.key,
+    required this.chatStore,
+    required this.onAddChat,
+    this.channelDisplayName,
+  });
 
   @override
   Widget build(BuildContext context) {
-    final emoteMenuButton = Tooltip(
-      message: 'Emote menu',
-      preferBelow: false,
-      child: IconButton(
-        color: chatStore.assetsStore.showEmoteMenu
-            ? Theme.of(context).colorScheme.secondary
-            : null,
-        icon: Icon(chatStore.assetsStore.showEmoteMenu
-            ? Icons.emoji_emotions_rounded
-            : Icons.emoji_emotions_outlined),
-        onPressed: () {
-          FocusScope.of(context).unfocus();
-          chatStore.assetsStore.showEmoteMenu =
-              !chatStore.assetsStore.showEmoteMenu;
-        },
-      ),
-    );
+    final isEmotesEnabled =
+        chatStore.settings.showTwitchEmotes ||
+        chatStore.settings.show7TVEmotes ||
+        chatStore.settings.showBTTVEmotes ||
+        chatStore.settings.showFFZEmotes;
+
+    final emoteMenuButton = isEmotesEnabled
+        ? Tooltip(
+            message: 'Emote menu',
+            preferBelow: false,
+            child: IconButton(
+              color: chatStore.assetsStore.showEmoteMenu
+                  ? Theme.of(context).colorScheme.secondary
+                  : null,
+              icon: Icon(
+                chatStore.assetsStore.showEmoteMenu
+                    ? Icons.emoji_emotions_rounded
+                    : Icons.emoji_emotions_outlined,
+              ),
+              onPressed: () {
+                chatStore.unfocusInput();
+                chatStore.assetsStore.showEmoteMenu =
+                    !chatStore.assetsStore.showEmoteMenu;
+              },
+            ),
+          )
+        : null;
 
     return Observer(
       builder: (context) {
-        final matchingEmotes = [
-          ...chatStore.assetsStore.userEmoteToObject.values,
-          ...chatStore.assetsStore.bttvEmotes,
-          ...chatStore.assetsStore.ffzEmotes,
-          ...chatStore.assetsStore.sevenTVEmotes
-        ]
-            .where((emote) => emote.name.toLowerCase().contains(
-                chatStore.textController.text.split(' ').last.toLowerCase()))
-            .toList();
+        final matchingEmotes = chatStore.matchingEmotes;
+        final matchingChatters = chatStore.matchingChatters;
 
-        final matchingChatters = chatStore.chatDetailsStore.chatUsers
-            .where((chatter) => chatter.contains(chatStore.textController.text
-                .split(' ')
-                .last
-                .replaceFirst('@', '')
-                .toLowerCase()))
-            .toList();
+        final isFullscreenOverlay =
+            chatStore.settings.fullScreen && context.isLandscape;
 
-        return Column(
+        final effectiveChatDelay = chatStore.settings.effectiveChatDelay;
+
+        // Check if chat delay is active (for indicator only, doesn't block input)
+        final hasChatDelay =
+            chatStore.settings.showVideo && effectiveChatDelay > 0;
+
+        const loginTooltipMessage = 'Log in to chat';
+
+        final bottomBarContent = Column(
           children: [
+            if (chatStore.replyingToMessage != null) ...[
+              const Divider(),
+              TextFieldTapRegion(
+                child: Container(
+                  height: 40,
+                  decoration: BoxDecoration(
+                    border: Border(
+                      left: BorderSide(
+                        color: Theme.of(context).colorScheme.secondary,
+                        width: 4,
+                      ),
+                    ),
+                  ),
+                  // Left: 8px so text aligns at 12px (4px border + 8px padding)
+                  // Right: 4px to give close button some breathing room
+                  padding: const EdgeInsets.only(left: 8, right: 4),
+                  alignment: Alignment.centerLeft,
+                  child: Row(
+                    children: [
+                      Expanded(
+                        child: Tooltip(
+                          message: chatStore.replyingToMessage!.message ?? '',
+                          preferBelow: false,
+                          child: Text.rich(
+                            TextSpan(
+                              children: chatStore.replyingToMessage!
+                                  .generateSpan(
+                                    context,
+                                    assetsStore: chatStore.assetsStore,
+                                    emoteScale: chatStore.settings.emoteScale,
+                                    badgeScale: chatStore.settings.badgeScale,
+                                    launchExternal:
+                                        chatStore.settings.launchUrlExternal,
+                                    timestamp: chatStore.settings.timestampType,
+                                    currentChannelId: chatStore.channelId,
+                                  ),
+                            ),
+                            maxLines: 1,
+                            overflow: TextOverflow.ellipsis,
+                            style: context.defaultTextStyle.copyWith(
+                              fontSize: chatStore.settings.fontSize,
+                            ),
+                          ),
+                        ),
+                      ),
+                      IconButton(
+                        tooltip: 'Cancel reply',
+                        visualDensity: VisualDensity.compact,
+                        onPressed: () => chatStore.replyingToMessage = null,
+                        icon: const Icon(Icons.close, size: 20),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+            // Wrap autocomplete sections with TextFieldTapRegion so taps
+            // on them don't trigger TextField's onTapOutside callback.
             if (chatStore.settings.autocomplete &&
                 chatStore.showEmoteAutocomplete &&
                 matchingEmotes.isNotEmpty) ...[
-              const Divider(
-                height: 1.0,
-                thickness: 1.0,
-              ),
-              SizedBox(
-                height: 50,
-                child: ListView.builder(
-                  padding: const EdgeInsets.symmetric(horizontal: 5.0),
-                  itemCount: matchingEmotes.length,
-                  scrollDirection: Axis.horizontal,
-                  itemBuilder: (context, index) => InkWell(
-                    onTap: () => chatStore.addEmote(matchingEmotes[index],
-                        autocompleteMode: true),
-                    child: Tooltip(
-                      message: matchingEmotes[index].name,
-                      preferBelow: false,
+              const Divider(),
+              TextFieldTapRegion(
+                child: SizedBox(
+                  height: 50,
+                  child: ListView.builder(
+                    padding: const EdgeInsets.all(4),
+                    itemCount: matchingEmotes.length,
+                    scrollDirection: Axis.horizontal,
+                    itemBuilder: (context, index) => InkWell(
+                      onTap: () => chatStore.addEmote(
+                        matchingEmotes[index],
+                        autocompleteMode: true,
+                      ),
+                      onLongPress: () {
+                        HapticFeedback.lightImpact();
+
+                        IRCMessage.showEmoteDetailsBottomSheet(
+                          context,
+                          emote: matchingEmotes[index],
+                          launchExternal: chatStore.settings.launchUrlExternal,
+                        );
+                      },
                       child: Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 5.0),
+                        padding: const EdgeInsets.symmetric(horizontal: 8),
                         child: Center(
                           child: FrostyCachedNetworkImage(
                             imageUrl: matchingEmotes[index].url,
                             useFade: false,
-                            height: matchingEmotes[index].height?.toDouble() ??
+                            height:
+                                matchingEmotes[index].height?.toDouble() ??
                                 defaultEmoteSize,
                             width: matchingEmotes[index].width?.toDouble(),
                           ),
@@ -92,108 +182,243 @@ class ChatBottomBar extends StatelessWidget {
             if (chatStore.settings.autocomplete &&
                 chatStore.showMentionAutocomplete &&
                 matchingChatters.isNotEmpty) ...[
-              const Divider(
-                height: 1.0,
-                thickness: 1.0,
-              ),
-              SizedBox(
-                height: 50,
-                child: ListView.builder(
-                  padding: const EdgeInsets.symmetric(horizontal: 5.0),
-                  itemCount: matchingChatters.length,
-                  scrollDirection: Axis.horizontal,
-                  itemBuilder: (context, index) => Button(
-                    color: Theme.of(context).colorScheme.secondary,
-                    onPressed: () {
-                      final split = chatStore.textController.text.split(' ')
-                        ..removeLast()
-                        ..add('@${matchingChatters[index]} ');
+              const Divider(),
+              TextFieldTapRegion(
+                child: SizedBox(
+                  height: 50,
+                  child: ListView.builder(
+                    padding: const EdgeInsets.all(4),
+                    itemCount: matchingChatters.length,
+                    scrollDirection: Axis.horizontal,
+                    itemBuilder: (context, index) => TextButton(
+                      style: TextButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(horizontal: 8),
+                      ),
+                      onPressed: () {
+                        final split = chatStore.textController.text.split(' ')
+                          ..removeLast()
+                          ..add('@${matchingChatters[index]} ');
 
-                      chatStore.textController.text = split.join(' ');
-                      chatStore.textController.selection =
-                          TextSelection.fromPosition(TextPosition(
-                              offset: chatStore.textController.text.length));
-                    },
-                    child: Text(matchingChatters[index]),
+                        chatStore.textController.text = split.join(' ');
+                        chatStore.textController.selection =
+                            TextSelection.fromPosition(
+                              TextPosition(
+                                offset: chatStore.textController.text.length,
+                              ),
+                            );
+                      },
+                      child: Text(matchingChatters[index]),
+                    ),
                   ),
                 ),
-              )
+              ),
             ],
             Padding(
-              padding: const EdgeInsets.fromLTRB(10.0, 10.0, 0.0, 10.0),
+              padding: const EdgeInsets.only(left: 12, top: 8, bottom: 8),
               child: Row(
                 children: [
                   if (!chatStore.expandChat &&
                       chatStore.settings.chatWidth < 0.3 &&
                       chatStore.settings.showVideo &&
-                      MediaQuery.of(context).orientation ==
-                          Orientation.landscape)
-                    IconButton(
-                      tooltip: 'Enter a message',
-                      onPressed: () {
-                        chatStore.expandChat = true;
-                        chatStore.textFieldFocusNode.requestFocus();
+                      context.isLandscape)
+                    Builder(
+                      builder: (context) {
+                        final isDisabled = !chatStore.auth.isLoggedIn;
+
+                        return GestureDetector(
+                          onTap: isDisabled
+                              ? () {
+                                  chatStore.updateNotification(
+                                    loginTooltipMessage,
+                                  );
+                                }
+                              : null,
+                          child: IconButton(
+                            tooltip: 'Enter a message',
+                            onPressed: isDisabled
+                                ? null
+                                : () {
+                                    chatStore.expandChat = true;
+                                    chatStore.safeRequestFocus();
+                                  },
+                            icon: const Icon(Icons.edit),
+                          ),
+                        );
                       },
-                      icon: const Icon(Icons.edit),
                     )
                   else
                     Expanded(
-                      child: TextField(
-                        textInputAction: TextInputAction.send,
-                        focusNode: chatStore.textFieldFocusNode,
-                        minLines: 1,
-                        maxLines: 5,
-                        enabled: chatStore.auth.isLoggedIn ? true : false,
-                        decoration: InputDecoration(
-                          contentPadding: const EdgeInsets.only(left: 15.0),
-                          prefixIcon: chatStore.settings.emoteMenuButtonOnLeft
-                              ? emoteMenuButton
-                              : null,
-                          suffixIcon: chatStore.settings.emoteMenuButtonOnLeft
-                              ? null
-                              : emoteMenuButton,
-                          hintMaxLines: 1,
-                          hintText: chatStore.auth.isLoggedIn
-                              ? 'Send a message ${chatStore.settings.chatDelay == 0 ? '' : '(${chatStore.settings.chatDelay.toInt()}s delay)'}'
-                              : 'Log in to chat',
-                        ),
-                        controller: chatStore.textController,
-                        onSubmitted: chatStore.sendMessage,
-                      ),
-                    ),
-                  if (chatStore.showSendButton &&
-                      (chatStore.settings.chatWidth >= 0.3 ||
-                          chatStore.expandChat ||
-                          MediaQuery.of(context).orientation ==
-                              Orientation.portrait))
-                    IconButton(
-                      tooltip: 'Send',
-                      icon: const Icon(Icons.send_rounded),
-                      onPressed: chatStore.auth.isLoggedIn
-                          ? () => chatStore
-                              .sendMessage(chatStore.textController.text)
-                          : null,
-                    )
-                  else
-                    IconButton(
-                      icon: Icon(Icons.adaptive.more_rounded),
-                      tooltip: 'More',
-                      onPressed: () => showModalBottomSheet(
-                        backgroundColor: Colors.transparent,
-                        isScrollControlled: true,
-                        context: context,
-                        builder: (_) => ChatDetails(
-                          chatDetailsStore: chatStore.chatDetailsStore,
-                          chatStore: chatStore,
-                          userLogin: chatStore.channelName,
-                        ),
+                      child: Observer(
+                        builder: (context) {
+                          final isLoggedIn = chatStore.auth.isLoggedIn;
+                          final isWaitingForAck = chatStore.isWaitingForAck;
+                          final isConnected = chatStore.isConnected;
+                          final hasConnected = chatStore.hasConnected;
+                          final isEnabled =
+                              isLoggedIn && !isWaitingForAck && isConnected;
+
+                          return GestureDetector(
+                            onTap: !isLoggedIn
+                                ? () {
+                                    chatStore.updateNotification(
+                                      loginTooltipMessage,
+                                    );
+                                  }
+                                : null,
+                            child: ExtendedTextField(
+                              textInputAction: TextInputAction.send,
+                              focusNode: chatStore.textFieldFocusNode,
+                              minLines: 1,
+                              maxLines: 3,
+                              enabled: isEnabled,
+                              specialTextSpanBuilder: EmoteTextSpanBuilder(
+                                emoteToObject:
+                                    chatStore.assetsStore.emoteToObject,
+                                userEmoteToObject:
+                                    chatStore.assetsStore.userEmoteToObject,
+                                emoteSize:
+                                    chatStore.settings.emoteScale *
+                                    defaultEmoteSize,
+                              ),
+                              decoration: InputDecoration(
+                                prefixIcon:
+                                    chatStore.settings.emoteMenuButtonOnLeft
+                                    ? emoteMenuButton
+                                    : null,
+                                suffixIcon: Row(
+                                  mainAxisSize: MainAxisSize.min,
+                                  spacing: 8,
+                                  children: [
+                                    if (!chatStore
+                                            .settings
+                                            .emoteMenuButtonOnLeft &&
+                                        emoteMenuButton != null)
+                                      emoteMenuButton,
+                                  ],
+                                ),
+                                hintMaxLines: 1,
+                                hintText: !isLoggedIn
+                                    ? loginTooltipMessage
+                                    : !isConnected
+                                    ? (hasConnected
+                                          ? 'Chat disconnected'
+                                          : 'Connecting...')
+                                    : isWaitingForAck
+                                    ? 'Sending...'
+                                    : chatStore.replyingToMessage != null
+                                    ? channelDisplayName != null
+                                        ? 'Reply in ${channelDisplayName!}'
+                                        : 'Reply'
+                                    : hasChatDelay
+                                    ? channelDisplayName != null
+                                        ? 'Chat in ${channelDisplayName!} (${effectiveChatDelay.toInt()}s delay)'
+                                        : 'Chat (${effectiveChatDelay.toInt()}s delay)'
+                                    : channelDisplayName != null
+                                    ? 'Chat in ${channelDisplayName!}'
+                                    : 'Chat',
+                              ),
+                              controller: chatStore.textController,
+                              onSubmitted: chatStore.sendMessage,
+                              onTapOutside: (_) {
+                                chatStore.textFieldFocusNode.unfocus();
+                              },
+                            ),
+                          );
+                        },
                       ),
                     ),
+                  TextFieldTapRegion(
+                    child:
+                        chatStore.showSendButton &&
+                            (chatStore.settings.chatWidth >= 0.3 ||
+                                chatStore.expandChat ||
+                                context.isPortrait)
+                        ? Observer(
+                            builder: (context) => IconButton(
+                              tooltip: chatStore.isWaitingForAck
+                                  ? 'Sending...'
+                                  : 'Send',
+                              icon: chatStore.isWaitingForAck
+                                  ? const SizedBox(
+                                      width: 20,
+                                      height: 20,
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 2,
+                                      ),
+                                    )
+                                  : const Icon(Icons.send_rounded),
+                              onPressed:
+                                  chatStore.auth.isLoggedIn &&
+                                      !chatStore.isWaitingForAck &&
+                                      chatStore.isConnected
+                                  ? () => chatStore.sendMessage(
+                                      chatStore.textController.text,
+                                    )
+                                  : null,
+                            ),
+                          )
+                        : IconButton(
+                            icon: Icon(Icons.adaptive.more_rounded),
+                            tooltip: 'More',
+                            onPressed: () =>
+                                showModalBottomSheetWithProperFocus(
+                                  isScrollControlled: true,
+                                  context: context,
+                                  builder: (_) => ChatDetails(
+                                    chatDetailsStore:
+                                        chatStore.chatDetailsStore,
+                                    chatStore: chatStore,
+                                    userLogin: chatStore.channelName,
+                                    onAddChat: onAddChat,
+                                  ),
+                                ),
+                          ),
+                  ),
                 ],
               ),
             ),
           ],
         );
+
+        // Don't add bottom padding when:
+        // - Emote menu is open: The emote menu provides its own bottom boundary
+        // - In horizontal landscape mode: System is in immersive mode and home
+        //   indicator is on the side (left/right), not the content bottom.
+        //   SafeArea handles left/right insets for the notch.
+        // Note: landscapeForceVerticalChat uses portrait layout in landscape
+        // orientation with normal (non-immersive) system UI, so it still needs
+        // bottom padding.
+        final isHorizontalLandscape =
+            context.isLandscape &&
+            !chatStore.settings.landscapeForceVerticalChat;
+        final needsBottomPadding =
+            !chatStore.assetsStore.showEmoteMenu && !isHorizontalLandscape;
+
+        // Measured once here; the list pads itself by this height so the bar
+        // never overlaps messages. Shared by both container branches below.
+        final measuredBar = MeasureSize(
+          onChange: (size) => chatStore.setBottomBarHeight(size.height),
+          child: bottomBarContent,
+        );
+
+        return isFullscreenOverlay
+            ? Padding(
+                padding: EdgeInsets.only(
+                  bottom: needsBottomPadding
+                      ? MediaQuery.of(context).padding.bottom
+                      : 0,
+                ),
+                child: measuredBar,
+              )
+            : BlurredContainer(
+                gradientDirection: GradientDirection.down,
+                padding: EdgeInsets.only(
+                  bottom: needsBottomPadding
+                      ? MediaQuery.of(context).padding.bottom
+                      : 0,
+                ),
+                child: measuredBar,
+              );
       },
     );
   }
diff --git a/lib/screens/channel/chat/widgets/chat_message.dart b/lib/screens/channel/chat/widgets/chat_message.dart
index 0ee4b72c..339254dc 100644
--- a/lib/screens/channel/chat/widgets/chat_message.dart
+++ b/lib/screens/channel/chat/widgets/chat_message.dart
@@ -1,84 +1,270 @@
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/apis/twitch_api.dart';
 import 'package:frosty/constants.dart';
 import 'package:frosty/models/irc.dart';
+import 'package:frosty/models/user.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
 import 'package:frosty/screens/channel/chat/widgets/chat_user_modal.dart';
+import 'package:frosty/screens/channel/chat/widgets/moderation_actions.dart';
+import 'package:frosty/screens/channel/chat/widgets/reply_thread.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:provider/provider.dart';
 
 class ChatMessage extends StatelessWidget {
   final IRCMessage ircMessage;
   final ChatStore chatStore;
   final bool isModal;
+  final bool forceTimestamp;
+  final bool showReplyHeader;
+  final bool isInReplyThread;
+
+  /// Override for merged chat view — provides combined channel profiles.
+  final Map<String, UserTwitch>? overrideChannelIdToUserTwitch;
+
+  /// Override for merged chat view — sets the active/send-target channel ID.
+  final String? overrideCurrentChannelId;
+
+  /// In merged mode, the active tab's ChatStore for notifications and emote
+  /// menu. Composer actions (reply/paste) use [onActivateSourceTab] to switch
+  /// to the source tab first, then operate on [chatStore] directly.
+  final ChatStore? inputChatStore;
+
+  /// In merged mode, switches the active tab to this message's source channel.
+  final VoidCallback? onActivateSourceTab;
 
   const ChatMessage({
-    Key? key,
+    super.key,
     required this.ircMessage,
     required this.chatStore,
     this.isModal = false,
-  }) : super(key: key);
+    this.forceTimestamp = false,
+    this.showReplyHeader = true,
+    this.isInReplyThread = false,
+    this.overrideChannelIdToUserTwitch,
+    this.overrideCurrentChannelId,
+    this.inputChatStore,
+    this.onActivateSourceTab,
+  });
+
+  void onTapName(BuildContext context) {
+    // Ignore if the message is a recent message in the modal bottom sheet.
+    if (isModal) return;
+
+    // Ignore if long-pressing own username.
+    if (ircMessage.user == null ||
+        ircMessage.user == chatStore.auth.user.details?.login) {
+      return;
+    }
+
+    showModalBottomSheetWithProperFocus(
+      isScrollControlled: true,
+      context: context,
+      builder: (context) => ChatUserModal(
+        chatStore: chatStore,
+        username: ircMessage.user!,
+        userId: ircMessage.tags['user-id']!,
+        displayName: ircMessage.tags['display-name']!,
+        onActivateSourceTab: onActivateSourceTab,
+      ),
+    );
+  }
+
+  void onTapPingedUser(BuildContext context, {required String nickname}) {
+    // Ignore if the message is a recent message in the modal bottom sheet.
+    if (isModal) return;
+
+    final twitchApi = context.read<TwitchApi>();
+    twitchApi.getUser(userLogin: nickname).then((user) {
+      if (context.mounted) {
+        showModalBottomSheetWithProperFocus(
+          isScrollControlled: true,
+          context: context,
+          builder: (context) => ChatUserModal(
+            chatStore: chatStore,
+            username: user.login,
+            userId: user.id,
+            displayName: user.displayName,
+            onActivateSourceTab: onActivateSourceTab,
+          ),
+        );
+      }
+    });
+  }
+
+  /// The store to use for notifications and emote menu in merged mode.
+  ChatStore get _effectiveInputStore => inputChatStore ?? chatStore;
+
+  Future<void> copyMessage() async {
+    await Clipboard.setData(ClipboardData(text: ircMessage.message ?? ''));
+
+    _effectiveInputStore.updateNotification('Message copied');
+  }
+
+  void onLongPressMessage(BuildContext context, TextStyle defaultTextStyle) {
+    HapticFeedback.lightImpact();
+
+    // Allow the full menu for live messages and for ones marked deleted/cleared
+    // by a moderation action — those keep their tags (user-id, id), so a
+    // moderator can still act on them (e.g. remove a timeout). Everything else
+    // (notices, system messages) just copies.
+    if (ircMessage.command != Command.privateMessage &&
+        ircMessage.command != Command.userState &&
+        ircMessage.command != Command.clearChat &&
+        ircMessage.command != Command.clearMessage) {
+      copyMessage();
+      return;
+    }
+
+    showModalBottomSheetWithProperFocus(
+      context: context,
+      isScrollControlled: true,
+      builder: (context) => ListView(
+        shrinkWrap: true,
+        primary: false,
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+            child: Text.rich(
+              TextSpan(
+                children: ircMessage.generateSpan(
+                  context,
+                  assetsStore: chatStore.assetsStore,
+                  emoteScale: chatStore.settings.emoteScale,
+                  badgeScale: chatStore.settings.badgeScale,
+                  launchExternal: chatStore.settings.launchUrlExternal,
+                  timestamp: chatStore.settings.timestampType,
+                  forceTimestamp: forceTimestamp,
+                  showHistoricalTimestamps:
+                      chatStore.settings.showHistoricalTimestamps,
+                  channelIdToUserTwitch:
+                      overrideChannelIdToUserTwitch ??
+                      chatStore.assetsStore.channelIdToUserTwitch,
+                  currentChannelId:
+                      overrideCurrentChannelId ?? chatStore.channelId,
+                ),
+                style: defaultTextStyle,
+              ),
+            ),
+          ),
+          const Divider(indent: 12, endIndent: 12),
+          ListTile(
+            onTap: () {
+              copyMessage();
+              Navigator.pop(context);
+            },
+            leading: const Icon(Icons.copy),
+            title: const Text('Copy message'),
+          ),
+          ListTile(
+            onTap: () async {
+              await copyMessage();
+
+              final effectiveChatDelay = chatStore.settings.effectiveChatDelay;
+
+              final hasChatDelay =
+                  chatStore.settings.showVideo && effectiveChatDelay > 0;
+
+              if (hasChatDelay) {
+                _effectiveInputStore.updateNotification(
+                  'Chatting is disabled due to message delay (${effectiveChatDelay.toInt()}s)',
+                );
+                if (context.mounted) {
+                  Navigator.pop(context);
+                }
+                return;
+              }
+
+              // In merged mode, switch to the source tab so the paste
+              // targets the correct channel's composer.
+              onActivateSourceTab?.call();
+
+              // Paste the copied message into the text controller
+              chatStore.textController.text = ircMessage.message ?? '';
+              chatStore.safeRequestFocus();
+              if (context.mounted) {
+                Navigator.pop(context);
+              }
+            },
+            leading: const Icon(Icons.content_paste),
+            title: const Text('Copy message and paste'),
+          ),
+          ListTile(
+            onTap: () {
+              // In merged mode, switch to the source tab so the reply
+              // targets the correct channel (reply-parent-msg-id is
+              // channel-scoped).
+              onActivateSourceTab?.call();
+
+              chatStore.replyingToMessage = ircMessage;
+              chatStore.safeRequestFocus();
+              Navigator.pop(context);
+            },
+            leading: const Icon(Icons.reply),
+            title: const Text('Reply to message'),
+          ),
+          if (ircMessage.tags['user-id'] != null)
+            ModerationActions(
+              chatStore: chatStore,
+              targetUserId: ircMessage.tags['user-id']!,
+              targetName:
+                  ircMessage.tags['display-name'] ?? ircMessage.user ?? '',
+              messageId: ircMessage.tags['id'],
+            ),
+        ],
+      ),
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
-    void onTapName() {
-      // Ignore if the message is a recent message in the modal bottom sheet.
-      if (isModal) return;
-
-      // Ignore if long-pressing own username.
-      if (ircMessage.user == null ||
-          ircMessage.user == chatStore.auth.user.details?.login) return;
-
-      showModalBottomSheet(
-        backgroundColor: Colors.transparent,
-        isScrollControlled: true,
-        context: context,
-        builder: (context) => ChatUserModal(
-          chatStore: chatStore,
-          username: ircMessage.user!,
-          userId: ircMessage.tags['user-id']!,
-          displayName: ircMessage.tags['display-name']!,
-        ),
-      );
-    }
-
-    Future<void> onLongPressMessage() async {
-      HapticFeedback.lightImpact();
-
-      await Clipboard.setData(ClipboardData(text: ircMessage.message));
-
-      chatStore.updateNotification('Message copied');
-    }
-
     final defaultTextStyle = DefaultTextStyle.of(context).style;
+    final messageHeaderIconSize =
+        defaultBadgeSize * chatStore.settings.badgeScale;
+    final messageHeaderTextColor = defaultTextStyle.color?.withValues(
+      alpha: 0.5,
+    );
+    const messageHeaderFontWeight = FontWeight.w600;
 
     return Observer(
       builder: (context) {
-        Color? color;
+        Color? highlightColor;
         final Widget renderMessage;
 
         switch (ircMessage.command) {
           case Command.privateMessage:
           case Command.userState:
-            // If user is being mentioned in the message, highlight it red.
-            if (ircMessage.mention == true) color = Colors.red.withOpacity(0.2);
-            if (chatStore.settings.highlightFirstTimeChatter &&
-                ircMessage.tags['first-msg'] == '1') {
-              color = Colors.green.withOpacity(0.2);
-            }
+            final shouldHighlightFirstMessage =
+                chatStore.settings.highlightFirstTimeChatter &&
+                ircMessage.tags['first-msg'] == '1';
+            final shouldHighlightMessage =
+                chatStore.settings.showUserNotices &&
+                ircMessage.tags['msg-id'] == 'highlighted-message';
 
             final messageSpan = Text.rich(
               TextSpan(
                 children: ircMessage.generateSpan(
-                  onTapName: onTapName,
+                  context,
+                  onTapName: () => onTapName(context),
+                  onTapPingedUser: (nickname) =>
+                      onTapPingedUser(context, nickname: nickname),
                   style: defaultTextStyle,
                   assetsStore: chatStore.assetsStore,
                   emoteScale: chatStore.settings.emoteScale,
                   badgeScale: chatStore.settings.badgeScale,
-                  useReadableColors: chatStore.settings.useReadableColors,
-                  isLightTheme:
-                      Theme.of(context).brightness == Brightness.light,
                   launchExternal: chatStore.settings.launchUrlExternal,
                   timestamp: chatStore.settings.timestampType,
+                  forceTimestamp: forceTimestamp,
+                  showHistoricalTimestamps:
+                      chatStore.settings.showHistoricalTimestamps,
+                  channelIdToUserTwitch:
+                      overrideChannelIdToUserTwitch ??
+                      chatStore.assetsStore.channelIdToUserTwitch,
+                  currentChannelId:
+                      overrideCurrentChannelId ?? chatStore.channelId,
                 ),
               ),
             );
@@ -87,52 +273,91 @@ class ChatMessage extends StatelessWidget {
             final replyUser = ircMessage.tags['reply-parent-display-name'];
             final replyBody = ircMessage.tags['reply-parent-msg-body'];
 
-            if ((replyUser != null && replyBody != null) ||
-                (chatStore.settings.highlightFirstTimeChatter &&
-                    ircMessage.tags['first-msg'] == '1')) {
-              renderMessage = Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    children: [
-                      Icon(
-                        replyUser != null && replyBody != null
-                            ? Icons.reply_rounded
-                            : Icons.new_releases_outlined,
-                        size: defaultBadgeSize * chatStore.settings.badgeScale,
-                        color: defaultTextStyle.color?.withOpacity(0.5),
-                        textDirection: TextDirection.rtl,
+            Widget? messageHeaderIcon;
+            Widget? messageHeader;
+            if (replyUser != null && replyBody != null && showReplyHeader) {
+              messageHeaderIcon = Icon(
+                Icons.chat_rounded,
+                size: messageHeaderIconSize,
+                color: messageHeaderTextColor,
+              );
+              messageHeader = GestureDetector(
+                onTap: isModal
+                    ? null
+                    : () => showModalBottomSheetWithProperFocus(
+                        context: context,
+                        builder: (context) {
+                          return ReplyThread(
+                            selectedMessage: ircMessage,
+                            chatStore: chatStore,
+                          );
+                        },
                       ),
-                      const SizedBox(width: 5.0),
-                      Flexible(
-                        child: replyUser != null && replyBody != null
-                            ? Tooltip(
-                                message: 'Replying to @$replyUser: $replyBody',
-                                preferBelow: false,
-                                triggerMode: TooltipTriggerMode.tap,
-                                showDuration: const Duration(seconds: 5),
-                                child: Text(
-                                  'Replying to @$replyUser: $replyBody',
-                                  maxLines: 1,
-                                  style: TextStyle(
-                                    overflow: TextOverflow.ellipsis,
-                                    color: defaultTextStyle.color
-                                        ?.withOpacity(0.5),
-                                  ),
-                                ),
-                              )
-                            : Text(
-                                'First time chatting',
-                                style: TextStyle(
-                                  fontWeight: FontWeight.w600,
-                                  color:
-                                      defaultTextStyle.color?.withOpacity(0.5),
-                                ),
-                              ),
+                child: Text.rich(
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                  TextSpan(
+                    children: [
+                      TextSpan(
+                        text: replyUser,
+                        style: TextStyle(
+                          fontWeight: FontWeight.w600,
+                          color: messageHeaderTextColor,
+                        ),
+                      ),
+                      TextSpan(
+                        text: ': $replyBody',
+                        style: TextStyle(color: messageHeaderTextColor),
                       ),
                     ],
                   ),
-                  const SizedBox(height: 5.0),
+                ),
+              );
+            } else if (shouldHighlightFirstMessage) {
+              highlightColor = context.frostyColors.highlightedMessage;
+              messageHeaderIcon = Icon(
+                Icons.auto_awesome_rounded,
+                size: messageHeaderIconSize,
+                color: messageHeaderTextColor,
+              );
+              messageHeader = Text(
+                'First message',
+                style: TextStyle(
+                  fontWeight: messageHeaderFontWeight,
+                  color: messageHeaderTextColor,
+                ),
+              );
+            } else if (shouldHighlightMessage) {
+              highlightColor = context.frostyColors.highlightedMessage;
+              messageHeader = Text(
+                'Highlighted message',
+                style: TextStyle(
+                  fontWeight: messageHeaderFontWeight,
+                  color: messageHeaderTextColor,
+                ),
+              );
+            }
+
+            // If user is being mentioned in the message, highlight it red.
+            if (ircMessage.mention == true) {
+              highlightColor = context.colorScheme.error;
+            }
+
+            if (messageHeader != null) {
+              renderMessage = Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                spacing: 4,
+                children: [
+                  if (messageHeaderIcon != null)
+                    Row(
+                      spacing: 4,
+                      children: [
+                        messageHeaderIcon,
+                        Flexible(child: messageHeader),
+                      ],
+                    )
+                  else
+                    messageHeader,
                   messageSpan,
                 ],
               );
@@ -147,41 +372,58 @@ class ChatMessage extends StatelessWidget {
             final banDuration = ircMessage.tags['ban-duration'];
 
             renderMessage = Opacity(
-              opacity: 0.4,
+              opacity: 0.5,
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
+                spacing: 4,
                 children: [
                   if (banDuration == null)
                     if (ircMessage.command == Command.clearMessage)
                       const Text(
                         'Message deleted',
-                        style: TextStyle(fontWeight: FontWeight.w600),
+                        style: TextStyle(fontWeight: messageHeaderFontWeight),
                       )
                     else
                       const Text(
                         'Permanently banned',
-                        style: TextStyle(fontWeight: FontWeight.w600),
+                        style: TextStyle(fontWeight: messageHeaderFontWeight),
                       )
                   else
                     Text(
                       'Timed out for $banDuration ${int.parse(banDuration) > 1 ? 'seconds' : 'second'}',
-                      style: const TextStyle(fontWeight: FontWeight.w600),
+                      style: const TextStyle(
+                        fontWeight: messageHeaderFontWeight,
+                      ),
                     ),
-                  const SizedBox(height: 5.0),
                   Text.rich(
                     TextSpan(
                       children: ircMessage.generateSpan(
-                        onTapName: onTapName,
+                        context,
+                        onTapName: () => onTapName(context),
                         style: defaultTextStyle,
                         assetsStore: chatStore.assetsStore,
                         emoteScale: chatStore.settings.emoteScale,
                         badgeScale: chatStore.settings.badgeScale,
-                        showMessage: chatStore.settings.showDeletedMessages,
-                        useReadableColors: chatStore.settings.useReadableColors,
-                        isLightTheme:
-                            Theme.of(context).brightness == Brightness.light,
+                        showMessage:
+                            chatStore.settings.showDeletedMessages ||
+                            chatStore.revealedMessageIds.contains(
+                              ircMessage.tags['id'],
+                            ),
+                        onTapDeletedMessage: () {
+                          if (ircMessage.tags['id'] != null) {
+                            chatStore.revealMessage(ircMessage.tags['id']!);
+                          }
+                        },
                         launchExternal: chatStore.settings.launchUrlExternal,
                         timestamp: chatStore.settings.timestampType,
+                        forceTimestamp: forceTimestamp,
+                        showHistoricalTimestamps:
+                            chatStore.settings.showHistoricalTimestamps,
+                        channelIdToUserTwitch:
+                            overrideChannelIdToUserTwitch ??
+                            chatStore.assetsStore.channelIdToUserTwitch,
+                        currentChannelId:
+                            overrideCurrentChannelId ?? chatStore.channelId,
                       ),
                     ),
                   ),
@@ -190,59 +432,134 @@ class ChatMessage extends StatelessWidget {
             );
             break;
           case Command.notice:
-            renderMessage = Text.rich(
-              TextSpan(text: ircMessage.message),
-              style: TextStyle(color: defaultTextStyle.color?.withOpacity(0.5)),
+            // Use tabular figures so countdown numbers don't shift horizontally
+            final noticeStyle = TextStyle(
+              color: messageHeaderTextColor,
+              fontFeatures: const [FontFeature.tabularFigures()],
             );
+            if (ircMessage.actionCallback != null &&
+                ircMessage.actionLabel != null) {
+              renderMessage = Text.rich(
+                TextSpan(
+                  children: [
+                    TextSpan(
+                      text: ircMessage.message ?? '',
+                      style: noticeStyle,
+                    ),
+                    TextSpan(text: ' '),
+                    TextSpan(
+                      text: ircMessage.actionLabel!,
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.primary,
+                        fontWeight: FontWeight.w600,
+                        decoration: TextDecoration.underline,
+                        decorationColor: Theme.of(context).colorScheme.primary,
+                      ),
+                      recognizer: TapGestureRecognizer()
+                        ..onTap = ircMessage.actionCallback,
+                    ),
+                  ],
+                ),
+              );
+            } else {
+              renderMessage = Text.rich(
+                TextSpan(text: ircMessage.message),
+                style: noticeStyle,
+              );
+            }
             break;
           case Command.userNotice:
             if (chatStore.settings.showUserNotices) {
-              color = Colors.deepPurple.withOpacity(0.2);
+              highlightColor = context.frostyColors.highlightedMessage;
+              Widget? messageHeaderIcon;
+              Widget? messageHeader;
+
+              if (ircMessage.tags.containsKey('system-msg')) {
+                final messageId = ircMessage.tags['msg-id'];
+                final isGift = messageId?.contains('gift') == true;
+                final isSub = messageId?.contains('sub') == true;
+                final isRaid = messageId?.contains('raid') == true;
+                final isPrime =
+                    ircMessage.tags['msg-param-sub-plan'] == 'Prime';
+
+                IconData? icon;
+                if (isGift) {
+                  icon = Icons.card_giftcard_rounded;
+                } else if (isSub) {
+                  icon = Icons.star_rounded;
+                } else if (isRaid) {
+                  icon = Icons.people_rounded;
+                } else if (isPrime) {
+                  icon = Icons.workspace_premium_rounded;
+                }
+
+                if (icon != null) {
+                  messageHeaderIcon = Icon(
+                    icon,
+                    size: messageHeaderIconSize,
+                    color: messageHeaderTextColor,
+                  );
+                }
+
+                messageHeader = Text(
+                  ircMessage.tags['system-msg']!,
+                  style: TextStyle(
+                    fontWeight: messageHeaderFontWeight,
+                    color: messageHeaderTextColor,
+                  ),
+                );
+              } else if (ircMessage.tags['msg-id'] == 'announcement') {
+                messageHeaderIcon = Icon(
+                  Icons.campaign_rounded,
+                  size: messageHeaderIconSize,
+                  color: messageHeaderTextColor,
+                );
+                messageHeader = Text(
+                  'Announcement',
+                  style: TextStyle(
+                    fontWeight: messageHeaderFontWeight,
+                    color: messageHeaderTextColor,
+                  ),
+                );
+              }
 
               renderMessage = Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
+                spacing: 4,
                 children: [
-                  if (ircMessage.tags.containsKey('system-msg'))
-                    Text(
-                      ircMessage.tags['system-msg']!,
-                      style: TextStyle(
-                          fontWeight: FontWeight.w600,
-                          color: defaultTextStyle.color?.withOpacity(0.5)),
-                    ),
-                  if (ircMessage.tags['msg-id'] == 'announcement')
+                  if (messageHeader != null)
                     Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      spacing: 4,
                       children: [
-                        Icon(
-                          Icons.announcement_outlined,
-                          size:
-                              defaultBadgeSize * chatStore.settings.badgeScale,
-                        ),
-                        const SizedBox(width: 5.0),
-                        const Text(
-                          'Announcement',
-                          style: TextStyle(fontWeight: FontWeight.w600),
-                        ),
+                        if (messageHeaderIcon != null) ...[messageHeaderIcon],
+                        Expanded(child: messageHeader),
                       ],
                     ),
-                  const SizedBox(height: 5.0),
-                  if (ircMessage.message != null)
+                  if (ircMessage.message != null) ...[
                     Text.rich(
                       TextSpan(
                         children: ircMessage.generateSpan(
-                          onTapName: onTapName,
+                          context,
+                          onTapName: () => onTapName(context),
                           style: defaultTextStyle,
                           assetsStore: chatStore.assetsStore,
                           emoteScale: chatStore.settings.emoteScale,
                           badgeScale: chatStore.settings.badgeScale,
-                          useReadableColors:
-                              chatStore.settings.useReadableColors,
-                          isLightTheme:
-                              Theme.of(context).brightness == Brightness.light,
                           launchExternal: chatStore.settings.launchUrlExternal,
                           timestamp: chatStore.settings.timestampType,
+                          forceTimestamp: forceTimestamp,
+                          showHistoricalTimestamps:
+                              chatStore.settings.showHistoricalTimestamps,
+                          channelIdToUserTwitch:
+                              overrideChannelIdToUserTwitch ??
+                              chatStore.assetsStore.channelIdToUserTwitch,
+                          currentChannelId:
+                              overrideCurrentChannelId ?? chatStore.channelId,
                         ),
                       ),
                     ),
+                  ],
                 ],
               );
             } else {
@@ -253,42 +570,83 @@ class ChatMessage extends StatelessWidget {
             renderMessage = const SizedBox();
         }
 
+        // Check if this is a reply message in reply thread context for indentation
+        final isReplyInThread =
+            isInReplyThread &&
+            ircMessage.tags['reply-parent-display-name'] != null &&
+            ircMessage.tags['reply-parent-msg-body'] != null;
+
+        // Add reply icon for messages in reply thread
+        final messageWithIcon = isReplyInThread
+            ? Row(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.only(right: 8.0, top: 2.0),
+                    child: Icon(
+                      Icons.subdirectory_arrow_right_rounded,
+                      size: 16,
+                      color: messageHeaderTextColor,
+                    ),
+                  ),
+                  Expanded(child: renderMessage),
+                ],
+              )
+            : renderMessage;
+
         final paddedMessage = Padding(
-          padding: EdgeInsets.symmetric(
-              vertical: chatStore.settings.messageSpacing / 2,
-              horizontal: 10.0),
-          child: renderMessage,
+          padding: EdgeInsets.only(
+            top: chatStore.settings.messageSpacing / 2,
+            bottom: chatStore.settings.messageSpacing / 2,
+            left: isReplyInThread ? 16 : (highlightColor == null ? 12 : 0),
+            right: highlightColor == null ? 12 : 0,
+          ),
+          child: messageWithIcon,
         );
 
         // Add a divider above the message if dividers are enabled.
         final dividedMessage = chatStore.settings.showChatMessageDividers
             ? Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  paddedMessage,
-                  const Divider(
-                    height: 1.0,
-                    thickness: 1.0,
-                  ),
-                ],
+                children: [paddedMessage, const Divider()],
               )
             : paddedMessage;
 
         // Color the message if the color has been set.
-        final coloredMessage = color == null
+        final coloredMessage = highlightColor == null
             ? dividedMessage
-            : ColoredBox(color: color, child: dividedMessage);
+            : Container(
+                padding: const EdgeInsets.only(left: 8, right: 12),
+                decoration: BoxDecoration(
+                  color: highlightColor.withValues(alpha: 0.1),
+                  border: Border(
+                    left: BorderSide(color: highlightColor, width: 4),
+                  ),
+                ),
+                child: dividedMessage,
+              );
 
-        return InkWell(
+        final shouldFade = chatStore.shouldFadeMessage(
+          sourceChannelId: ircMessage.sourceChannelId,
+          overrideCurrentChannelId: overrideCurrentChannelId,
+        );
+
+        final fadedMessage = shouldFade
+            ? Opacity(opacity: 0.55, child: coloredMessage)
+            : coloredMessage;
+
+        final finalMessage = InkWell(
           onTap: () {
             FocusScope.of(context).unfocus();
-            if (chatStore.assetsStore.showEmoteMenu) {
-              chatStore.assetsStore.showEmoteMenu = false;
+            if (_effectiveInputStore.assetsStore.showEmoteMenu) {
+              _effectiveInputStore.assetsStore.showEmoteMenu = false;
             }
           },
-          onLongPress: onLongPressMessage,
-          child: coloredMessage,
+          onLongPress: () => onLongPressMessage(context, defaultTextStyle),
+          child: fadedMessage,
         );
+
+        return finalMessage;
       },
     );
   }
diff --git a/lib/screens/channel/chat/widgets/chat_tabs.dart b/lib/screens/channel/chat/widgets/chat_tabs.dart
new file mode 100644
index 00000000..490ce0df
--- /dev/null
+++ b/lib/screens/channel/chat/widgets/chat_tabs.dart
@@ -0,0 +1,542 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/models/user.dart';
+import 'package:frosty/screens/channel/chat/chat.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_tabs_store.dart';
+import 'package:frosty/screens/channel/chat/widgets/add_chat_dialog.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/widgets/profile_picture.dart';
+
+/// Widget that displays multiple chat tabs with a tab bar.
+/// Wraps the existing Chat widget and manages tab switching.
+class ChatTabs extends StatelessWidget {
+  final ChatTabsStore chatTabsStore;
+  final EdgeInsetsGeometry? listPadding;
+
+  const ChatTabs({super.key, required this.chatTabsStore, this.listPadding});
+
+  Future<void> _handleAddChat(BuildContext context) async {
+    if (!chatTabsStore.canAddTab) {
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(
+          content: Text('Maximum 10 chats open'),
+          duration: Duration(seconds: 2),
+        ),
+      );
+      return;
+    }
+
+    final result = await AddChatSheet.show(context, chatTabsStore.twitchApi);
+
+    if (result != null) {
+      final added = chatTabsStore.addTab(
+        channelId: result.channelId,
+        channelLogin: result.channelLogin,
+        displayName: result.displayName,
+      );
+
+      if (!added && context.mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('Channel already open, switched to it'),
+            duration: Duration(seconds: 2),
+          ),
+        );
+      }
+    }
+  }
+
+  /// Wraps a tab bar item (a tab chip or a shared-chat bubble) with its
+  /// trailing gap and centering, keyed for the reorderable list.
+  Widget _wrapItem({required Key key, required bool isLast, required Widget child}) {
+    return Padding(
+      key: key,
+      padding: EdgeInsets.only(right: isLast ? 0 : 4),
+      child: Center(child: child),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Observer(
+      builder: (context) {
+        final tabs = chatTabsStore.tabs;
+        final activeIndex = chatTabsStore.activeTabIndex;
+        final activeStore = chatTabsStore.activeChatStore;
+        // Twitch native shared chat participants (excluding the active
+        // channel itself, which is already shown as its own tab chip).
+        final sharedChatParticipants = activeStore.isInSharedChatMode
+            ? activeStore.assetsStore.channelIdToUserTwitch.entries
+                .where((entry) => entry.key != activeStore.channelId)
+                .toList()
+            : const <MapEntry<String, UserTwitch>>[];
+        final showTabBar =
+            chatTabsStore.showTabBar || sharedChatParticipants.isNotEmpty;
+        final showMerge = tabs.where((t) => t.isActivated).length >= 2;
+
+        final tabBarHeight = showTabBar ? 48.0 : 0.0;
+        final topInset = listPadding?.resolve(TextDirection.ltr).top ?? 0;
+        final adjustedPadding = listPadding != null
+            ? listPadding!.add(EdgeInsets.only(top: tabBarHeight))
+            : EdgeInsets.only(top: tabBarHeight);
+
+        return PopScope(
+          canPop: Platform.isIOS,
+          onPopInvokedWithResult: (didPop, _) {
+            if (didPop) return;
+
+            // Android back gesture: dismiss overlays before navigating away.
+            final activeStore = chatTabsStore.activeChatStore;
+            if (activeStore.assetsStore.showEmoteMenu) {
+              activeStore.assetsStore.showEmoteMenu = false;
+              return;
+            }
+            if (activeStore.textFieldFocusNode.hasFocus) {
+              activeStore.unfocusInput();
+              return;
+            }
+            Navigator.of(context).pop();
+          },
+          child: Stack(
+            children: [
+              Positioned.fill(
+                child: chatTabsStore.mergedMode
+                    ? Chat(
+                        chatStore: chatTabsStore.activeChatStore,
+                        chatTabsStore: chatTabsStore,
+                        listPadding: adjustedPadding,
+                        onAddChat: () => _handleAddChat(context),
+                      )
+                    : IndexedStack(
+                        index: activeIndex,
+                        children: tabs.map((tabInfo) {
+                          if (tabInfo.chatStore == null) {
+                            return const SizedBox.shrink();
+                          }
+                          return Chat(
+                            key: ValueKey(tabInfo.channelId),
+                            chatStore: tabInfo.chatStore!,
+                            listPadding: adjustedPadding,
+                            onAddChat: () => _handleAddChat(context),
+                          );
+                        }).toList(),
+                      ),
+              ),
+              if (showTabBar)
+                Positioned(
+                  top: topInset,
+                  left: 0,
+                  right: 0,
+                  child: SizedBox(
+                    height: 48,
+                    child: Stack(
+                      children: [
+                        // Right-clip past the merge button so chips slide
+                        // under its left half then disappear.
+                        Positioned(
+                          left: 0,
+                          top: 0,
+                          bottom: 0,
+                          right: showMerge ? 33 : 0,
+                          child: ReorderableListView.builder(
+                            scrollDirection: Axis.horizontal,
+                            itemCount: tabs.length + sharedChatParticipants.length,
+                            padding: EdgeInsets.only(
+                              left: 12,
+                              right: showMerge ? 32 : 12,
+                            ),
+                            onReorderItem: (oldIndex, newIndex) {
+                              // Shared chat bubbles are trailing, fixed-order
+                              // items (not real tabs) — ignore any reorder
+                              // that touches them.
+                              if (oldIndex >= tabs.length ||
+                                  newIndex >= tabs.length) {
+                                return;
+                              }
+                              HapticFeedback.lightImpact();
+                              chatTabsStore.reorderTab(oldIndex, newIndex);
+                            },
+                            proxyDecorator: (child, index, animation) {
+                              return Material(
+                                color: Colors.transparent,
+                                child: child,
+                              );
+                            },
+                            itemBuilder: (context, index) {
+                              final isLast =
+                                  index ==
+                                  tabs.length +
+                                      sharedChatParticipants.length -
+                                      1;
+                              if (index < tabs.length) {
+                                final tabInfo = chatTabsStore.tabs[index];
+                                return _wrapItem(
+                                  key: ValueKey(tabInfo.channelId),
+                                  isLast: isLast,
+                                  child: _buildTab(context, index),
+                                );
+                              }
+
+                              final participant =
+                                  sharedChatParticipants[index - tabs.length];
+                              return _wrapItem(
+                                key: ValueKey('shared_${participant.key}'),
+                                isLast: isLast,
+                                child: _buildSharedChatBubble(
+                                  context,
+                                  participant.key,
+                                  participant.value,
+                                ),
+                              );
+                            },
+                          ),
+                        ),
+                        if (showMerge)
+                          Positioned(
+                            right: 12,
+                            top: 0,
+                            bottom: 0,
+                            child: Center(
+                              child: _buildMoreActionsMenu(context),
+                            ),
+                          ),
+                      ],
+                    ),
+                  ),
+                ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildMoreActionsMenu(BuildContext context) {
+    final settings = chatTabsStore.activeChatStore.settings;
+
+    return _AnchoredPopupMenu(
+      itemsBuilder: (close) => [
+        Observer(
+          builder: (_) => CheckboxMenuButton(
+            value: chatTabsStore.mergedMode,
+            onChanged: (_) {
+              HapticFeedback.selectionClick();
+              chatTabsStore.toggleMergedMode();
+            },
+            child: const Text('Merge chats'),
+          ),
+        ),
+        Observer(
+          builder: (_) => CheckboxMenuButton(
+            value: settings.focusCurrentChannel,
+            onChanged: (newValue) {
+              HapticFeedback.selectionClick();
+              settings.focusCurrentChannel = newValue ?? false;
+            },
+            child: const Text('Focus current channel'),
+          ),
+        ),
+      ],
+      anchorBuilder: (context, toggle) {
+        return IconButton.filledTonal(
+          icon: const Icon(Icons.more_vert, size: 18),
+          tooltip: 'Chat options',
+          visualDensity: VisualDensity.compact,
+          style: IconButton.styleFrom(
+            minimumSize: const Size(42, 42),
+            backgroundColor:
+                Theme.of(context).colorScheme.surfaceContainerHighest,
+          ),
+          onPressed: () {
+            HapticFeedback.selectionClick();
+            toggle();
+          },
+        );
+      },
+    );
+  }
+
+  Widget _buildTab(BuildContext context, int index) {
+    final tabInfo = chatTabsStore.tabs[index];
+    final isActive = index == chatTabsStore.activeTabIndex;
+    final isSecondary = !tabInfo.isPrimary;
+    final displayName = getReadableName(
+      tabInfo.displayName,
+      tabInfo.channelLogin,
+    );
+
+    return Observer(
+      builder: (context) {
+        final theme = Theme.of(context);
+        final isActivated = tabInfo.isActivated;
+        final hasUnread = chatTabsStore.hasUnreadMessages(index);
+        final dimmed = !isActivated || !(tabInfo.chatStore?.isConnected ?? false);
+
+        InputChip buildChip({VoidCallback? onDeleted}) => InputChip(
+              avatar: Badge(
+                smallSize: 8,
+                backgroundColor: theme.colorScheme.primary,
+                isLabelVisible: hasUnread,
+                child: Opacity(
+                  opacity: dimmed ? 0.5 : 1.0,
+                  child: ProfilePicture(
+                    userLogin: tabInfo.channelLogin,
+                    radius: 12,
+                  ),
+                ),
+              ),
+              label: Text(
+                displayName,
+                style: dimmed
+                    ? TextStyle(
+                        color: theme.textTheme.bodyMedium?.color
+                            ?.withValues(alpha: 0.5),
+                      )
+                    : null,
+              ),
+              selected: isActive,
+              showCheckmark: false,
+              visualDensity: VisualDensity.compact,
+              materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+              onPressed: () {
+                if (isActive) return;
+                HapticFeedback.selectionClick();
+                chatTabsStore.setActiveTab(index);
+              },
+              onDeleted: onDeleted,
+              deleteButtonTooltipMessage:
+                  onDeleted != null ? 'Tab options' : null,
+            );
+
+        if (!isSecondary) return buildChip();
+
+        return _AnchoredPopupMenu(
+          itemsBuilder: (close) => [
+            if (isActivated)
+              MenuItemButton(
+                leadingIcon: const Icon(Icons.power_off_rounded, size: 18),
+                child: const Text('Disconnect'),
+                onPressed: () {
+                  HapticFeedback.lightImpact();
+                  close();
+                  chatTabsStore.deactivateTab(index);
+                },
+              ),
+            MenuItemButton(
+              leadingIcon: Icon(
+                Icons.delete_outline_rounded,
+                size: 18,
+                color: theme.colorScheme.error,
+              ),
+              child: Text(
+                'Remove',
+                style: TextStyle(color: theme.colorScheme.error),
+              ),
+              onPressed: () {
+                HapticFeedback.lightImpact();
+                close();
+                chatTabsStore.removeTab(index);
+              },
+            ),
+          ],
+          anchorBuilder: (context, toggle) =>
+              buildChip(onDeleted: toggle),
+        );
+      },
+    );
+  }
+
+  /// Builds a bubble for a Twitch native shared chat participant channel.
+  /// Unlike manual tabs, these don't own a connection: tapping spotlights
+  /// the channel (unfades it, fading the rest — see [chat_message.dart]),
+  /// and the trailing menu hides/shows the channel's messages instead of
+  /// disconnecting/removing a tab.
+  Widget _buildSharedChatBubble(
+    BuildContext context,
+    String channelId,
+    UserTwitch user,
+  ) {
+    final activeStore = chatTabsStore.activeChatStore;
+    final displayName = getReadableName(user.displayName, user.login);
+
+    return Observer(
+      builder: (context) {
+        final theme = Theme.of(context);
+        final isFocused = activeStore.sharedChatBubbles.isFocused(channelId);
+        final isHidden = activeStore.sharedChatBubbles.isHidden(channelId);
+
+        InputChip buildChip({VoidCallback? onDeleted}) => InputChip(
+              avatar: Opacity(
+                opacity: isHidden ? 0.5 : 1.0,
+                child: ProfilePicture(userLogin: user.login, radius: 12),
+              ),
+              label: Text(
+                displayName,
+                style: isHidden
+                    ? TextStyle(
+                        color: theme.textTheme.bodyMedium?.color
+                            ?.withValues(alpha: 0.5),
+                      )
+                    : null,
+              ),
+              selected: isFocused,
+              showCheckmark: false,
+              visualDensity: VisualDensity.compact,
+              materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+              onPressed: () {
+                HapticFeedback.selectionClick();
+                activeStore.sharedChatBubbles.toggleFocus(channelId);
+              },
+              onDeleted: onDeleted,
+              deleteButtonTooltipMessage:
+                  onDeleted != null ? 'Channel options' : null,
+            );
+
+        return _AnchoredPopupMenu(
+          itemsBuilder: (close) => [
+            MenuItemButton(
+              leadingIcon: Icon(
+                isHidden
+                    ? Icons.visibility_rounded
+                    : Icons.visibility_off_rounded,
+                size: 18,
+              ),
+              child: Text(isHidden ? 'Show channel' : 'Hide channel'),
+              onPressed: () {
+                HapticFeedback.lightImpact();
+                close();
+                if (isHidden) {
+                  activeStore.sharedChatBubbles.show(channelId);
+                } else {
+                  activeStore.sharedChatBubbles.hide(channelId);
+                }
+              },
+            ),
+          ],
+          anchorBuilder: (context, toggle) => buildChip(onDeleted: toggle),
+        );
+      },
+    );
+  }
+}
+
+/// Lightweight popup menu anchored to a child widget. The menu's top-right
+/// aligns to the anchor's bottom-right via [CompositedTransformFollower] and
+/// fades + scales in from that corner. [MenuAnchor] doesn't expose an entry
+/// animation hook in this Flutter version, so we drive one ourselves.
+class _AnchoredPopupMenu extends StatefulWidget {
+  final Widget Function(BuildContext context, VoidCallback toggle)
+      anchorBuilder;
+  final List<Widget> Function(VoidCallback close) itemsBuilder;
+
+  const _AnchoredPopupMenu({
+    required this.anchorBuilder,
+    required this.itemsBuilder,
+  });
+
+  @override
+  State<_AnchoredPopupMenu> createState() => _AnchoredPopupMenuState();
+}
+
+class _AnchoredPopupMenuState extends State<_AnchoredPopupMenu>
+    with SingleTickerProviderStateMixin {
+  final _link = LayerLink();
+  final _portalCtrl = OverlayPortalController();
+  late final _anim = AnimationController(
+    duration: const Duration(milliseconds: 150),
+    reverseDuration: const Duration(milliseconds: 100),
+    vsync: this,
+  )..addStatusListener((status) {
+      if (status == AnimationStatus.dismissed && _portalCtrl.isShowing) {
+        _portalCtrl.hide();
+      }
+    });
+  late final _curve =
+      CurvedAnimation(parent: _anim, curve: Curves.easeOut);
+  late final _scale = Tween<double>(begin: 0.92, end: 1.0).animate(_curve);
+
+  @override
+  void dispose() {
+    _curve.dispose();
+    _anim.dispose();
+    super.dispose();
+  }
+
+  void _toggle() {
+    if (_portalCtrl.isShowing) {
+      _anim.reverse();
+    } else {
+      _portalCtrl.show();
+      _anim.forward();
+    }
+  }
+
+  void _close() {
+    if (_portalCtrl.isShowing) _anim.reverse();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return CompositedTransformTarget(
+      link: _link,
+      child: OverlayPortal(
+        controller: _portalCtrl,
+        overlayChildBuilder: (overlayContext) {
+          final theme = Theme.of(overlayContext);
+          return Stack(
+            children: [
+              Positioned.fill(
+                child: GestureDetector(
+                  behavior: HitTestBehavior.opaque,
+                  onTap: _close,
+                ),
+              ),
+              CompositedTransformFollower(
+                link: _link,
+                targetAnchor: Alignment.bottomRight,
+                followerAnchor: Alignment.topRight,
+                offset: const Offset(0, 4),
+                showWhenUnlinked: false,
+                child: FadeTransition(
+                  opacity: _anim,
+                  child: ScaleTransition(
+                    scale: _scale,
+                    alignment: Alignment.topRight,
+                    child: Material(
+                      color: theme.colorScheme.surface,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: const BorderRadius.all(
+                          Radius.circular(12),
+                        ),
+                        side: BorderSide(
+                          color: theme.colorScheme.outlineVariant
+                              .withValues(alpha: 0.5),
+                          width: 0.5,
+                        ),
+                      ),
+                      clipBehavior: Clip.antiAlias,
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 4),
+                        child: IntrinsicWidth(
+                          child: Column(
+                            mainAxisSize: MainAxisSize.min,
+                            crossAxisAlignment: CrossAxisAlignment.stretch,
+                            children: widget.itemsBuilder(_close),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          );
+        },
+        child: widget.anchorBuilder(context, _toggle),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/channel/chat/widgets/chat_user_modal.dart b/lib/screens/channel/chat/widgets/chat_user_modal.dart
index ae7765ca..6cb2e55a 100644
--- a/lib/screens/channel/chat/widgets/chat_user_modal.dart
+++ b/lib/screens/channel/chat/widgets/chat_user_modal.dart
@@ -1,28 +1,30 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:frosty/constants.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
 import 'package:frosty/screens/channel/chat/widgets/chat_message.dart';
+import 'package:frosty/screens/channel/chat/widgets/moderation_actions.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
 import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/block_report_modal.dart';
-import 'package:frosty/widgets/bottom_sheet.dart';
-import 'package:frosty/widgets/button.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
 import 'package:frosty/widgets/profile_picture.dart';
-import 'package:frosty/widgets/section_header.dart';
+import 'package:frosty/widgets/user_actions_modal.dart';
 
 class ChatUserModal extends StatefulWidget {
   final ChatStore chatStore;
   final String username;
   final String displayName;
   final String userId;
+  final VoidCallback? onActivateSourceTab;
 
   const ChatUserModal({
-    Key? key,
+    super.key,
     required this.chatStore,
     required this.username,
     required this.displayName,
     required this.userId,
-  }) : super(key: key);
+    this.onActivateSourceTab,
+  });
 
   @override
   State<ChatUserModal> createState() => _ChatUserModalState();
@@ -31,96 +33,109 @@ class ChatUserModal extends StatefulWidget {
 class _ChatUserModalState extends State<ChatUserModal> {
   @override
   Widget build(BuildContext context) {
-    final name = regexEnglish.hasMatch(widget.displayName)
-        ? widget.displayName
-        : '${widget.displayName} (${widget.username})';
+    final name = getReadableName(widget.displayName, widget.username);
 
-    return FrostyBottomSheet(
-      child: SizedBox(
-        height: MediaQuery.of(context).size.height * 0.5,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            ListTile(
-              contentPadding: const EdgeInsets.all(10.0),
-              leading: ProfilePicture(
-                userLogin: widget.username,
-              ),
-              title: Row(
-                children: [
-                  Flexible(
-                    child: Tooltip(
-                      message: name,
-                      child: Text(
-                        name,
-                        overflow: TextOverflow.ellipsis,
-                        style: const TextStyle(fontWeight: FontWeight.bold),
+    return SizedBox(
+      height: MediaQuery.of(context).size.height * 0.5,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          ListTile(
+            contentPadding: const EdgeInsets.fromLTRB(12, 0, 12, 0),
+            leading: ProfilePicture(userLogin: widget.username),
+            title: Row(
+              children: [
+                Flexible(
+                  child: Tooltip(
+                    message: name,
+                    child: Text(
+                      name,
+                      overflow: TextOverflow.ellipsis,
+                      style: const TextStyle(fontWeight: FontWeight.bold),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+            trailing: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                if (widget.chatStore.auth.isLoggedIn)
+                  IconButton(
+                    tooltip: 'Reply',
+                    onPressed: () {
+                      widget.onActivateSourceTab?.call();
+                      widget.chatStore.textController.text =
+                          '@${widget.username} ';
+                      Navigator.pop(context);
+                      widget.chatStore.safeRequestFocus();
+                    },
+                    icon: const Icon(Icons.reply_rounded),
+                  ),
+                IconButton(
+                  tooltip: 'More',
+                  onPressed: () => showModalBottomSheetWithProperFocus(
+                    context: context,
+                    builder: (context) => UserActionsModal(
+                      authStore: widget.chatStore.auth,
+                      name: name,
+                      userLogin: widget.username,
+                      userId: widget.userId,
+                      // Moderator actions for this user (no messageId → no
+                      // Delete); renders nothing for non-moderators.
+                      moderationActions: ModerationActions(
+                        chatStore: widget.chatStore,
+                        targetUserId: widget.userId,
+                        targetName: name,
                       ),
                     ),
                   ),
-                ],
-              ),
-              trailing: widget.chatStore.auth.isLoggedIn
-                  ? Button(
-                      padding: const EdgeInsets.symmetric(horizontal: 15.0),
-                      onPressed: () {
-                        widget.chatStore.textController.text =
-                            '@${widget.username} ';
-                        Navigator.pop(context);
-                        widget.chatStore.textFieldFocusNode.requestFocus();
-                      },
-                      child: const Text('Reply'),
-                    )
-                  : null,
-              onTap: () => showModalBottomSheet(
-                backgroundColor: Colors.transparent,
-                context: context,
-                builder: (context) => BlockReportModal(
-                  authStore: widget.chatStore.auth,
-                  name: name,
-                  userLogin: widget.username,
-                  userId: widget.userId,
+                  icon: Icon(Icons.adaptive.more_rounded),
                 ),
-              ),
+              ],
             ),
-            const SectionHeader(
-              'Recent messages',
-              padding: EdgeInsets.all(10.0),
-            ),
-            Expanded(
-              child: Observer(
-                builder: (context) {
-                  final userMessages = widget.chatStore.messages.reversed
-                      .where((message) => message.user == widget.username)
-                      .toList();
+          ),
+          const Divider(indent: 12, endIndent: 12),
+          Expanded(
+            child: Observer(
+              builder: (context) {
+                final userMessages = widget.chatStore.messages.reversed
+                    .where((message) => message.user == widget.username)
+                    .toList();
 
-                  if (userMessages.isEmpty) {
-                    return const AlertMessage(message: 'No recent messages');
-                  }
+                if (userMessages.isEmpty) {
+                  return const AlertMessage(message: 'No recent messages');
+                }
 
-                  return MediaQuery(
-                    data: MediaQuery.of(context).copyWith(
-                        textScaleFactor:
-                            widget.chatStore.settings.messageScale),
-                    child: DefaultTextStyle(
-                      style: DefaultTextStyle.of(context).style.copyWith(
-                          fontSize: widget.chatStore.settings.fontSize),
+                return MediaQuery(
+                  data: MediaQuery.of(context).copyWith(
+                    textScaler: TextScaler.linear(
+                      widget.chatStore.settings.messageScale,
+                    ),
+                  ),
+                  child: DefaultTextStyle(
+                    style: DefaultTextStyle.of(context).style.copyWith(
+                      fontSize: widget.chatStore.settings.fontSize,
+                    ),
+                    child: FrostyScrollbar(
                       child: ListView.builder(
                         reverse: true,
+                        primary: false,
                         itemCount: userMessages.length,
                         itemBuilder: (context, index) => ChatMessage(
                           ircMessage: userMessages[index],
                           chatStore: widget.chatStore,
                           isModal: true,
+                          forceTimestamp: true,
                         ),
                       ),
                     ),
-                  );
-                },
-              ),
-            )
-          ],
-        ),
+                  ),
+                );
+              },
+            ),
+          ),
+        ],
       ),
     );
   }
diff --git a/lib/screens/channel/chat/widgets/moderation_actions.dart b/lib/screens/channel/chat/widgets/moderation_actions.dart
new file mode 100644
index 00000000..390100c6
--- /dev/null
+++ b/lib/screens/channel/chat/widgets/moderation_actions.dart
@@ -0,0 +1,212 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
+import 'package:frosty/screens/onboarding/login_webview.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+
+/// Moderator actions (delete / timeout / ban, plus unban) for [targetUserId],
+/// reused by the message long-press menu and the user panel.
+///
+/// Renders nothing unless the viewer can moderate the channel, or should see
+/// an opt-in row when IRC/broadcaster hints mod capability without OAuth scopes.
+/// [messageId] enables the per-message Delete action; omit it (e.g. the user
+/// panel, which isn't tied to one message) to hide Delete. The unban action
+/// only appears when the user is currently banned/timed-out (seen via CLEARCHAT).
+class ModerationActions extends StatelessWidget {
+  final ChatStore chatStore;
+  final String targetUserId;
+
+  /// Display name used in confirmation notifications.
+  final String targetName;
+
+  /// The message to delete; null hides the Delete action.
+  final String? messageId;
+
+  const ModerationActions({
+    super.key,
+    required this.chatStore,
+    required this.targetUserId,
+    required this.targetName,
+    this.messageId,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Observer(
+      builder: (context) {
+        final auth = chatStore.auth;
+        final hasModScopes = auth.hasModeratorScopes;
+
+        if (hasModScopes) {
+          if (auth.user.canPerformModeratorActions(chatStore.channelId)) {
+            return _actionsColumn(context);
+          }
+          return const SizedBox.shrink();
+        }
+
+        // IRC/broadcaster is a CTA hint only — not authority to call Helix.
+        // Read userState.mod only on the no-scopes path so USERSTATE acks do
+        // not rebuild this sheet while real actions are already available.
+        final isBroadcaster = auth.user.details?.id == chatStore.channelId;
+        final ircModHint = chatStore.userState.mod;
+        if (isBroadcaster || ircModHint) {
+          return _enableModeratorToolsRow(context, auth);
+        }
+
+        return const SizedBox.shrink();
+      },
+    );
+  }
+
+  Widget _enableModeratorToolsRow(BuildContext context, AuthStore auth) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        const Divider(),
+        ListTile(
+          onTap: () {
+            Navigator.pop(context);
+            // Use the root navigator after closing the sheet.
+            openEnableModeratorTools(auth);
+          },
+          leading: const Icon(Icons.shield_outlined),
+          title: const Text('Enable moderator tools…'),
+          subtitle: const Text(
+            'Authorize Twitch permissions to delete, timeout, and ban.',
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _actionsColumn(BuildContext context) {
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        const Divider(),
+        // Compact one-row punitive actions, ordered least- to most-destructive.
+        Padding(
+          padding: const EdgeInsets.fromLTRB(12, 4, 12, 8),
+          child: Row(
+            children: [
+              if (messageId != null) ...[
+                Expanded(
+                  child: _button(
+                    Icons.delete_outline,
+                    'Delete',
+                    () => _run(context, _delete),
+                  ),
+                ),
+                const SizedBox(width: 8),
+              ],
+              Expanded(
+                child: _button(
+                  Icons.timer_outlined,
+                  'Timeout 10min',
+                  () => _run(context, _timeout),
+                ),
+              ),
+              const SizedBox(width: 8),
+              Expanded(
+                child: _button(
+                  Icons.block,
+                  'Ban',
+                  () => _run(context, _ban),
+                ),
+              ),
+            ],
+          ),
+        ),
+        // Recovery action, separate from the punitive row to avoid mistaps and
+        // only shown when the user is actually banned/timed-out.
+        if (chatStore.isUserBannedOrTimedOut(targetUserId))
+          ListTile(
+            onTap: () => _run(context, _unban),
+            leading: const Icon(Icons.lock_open_rounded),
+            title: const Text('Remove ban or timeout'),
+          ),
+      ],
+    );
+  }
+
+  /// Compact icon-over-label button.
+  Widget _button(IconData icon, String label, VoidCallback onTap) {
+    return OutlinedButton(
+      onPressed: onTap,
+      style: OutlinedButton.styleFrom(
+        padding: const EdgeInsets.symmetric(vertical: 10),
+      ),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(icon, size: 20),
+          const SizedBox(height: 4),
+          FittedBox(
+            fit: BoxFit.scaleDown,
+            child: Text(label, style: const TextStyle(fontSize: 12)),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// Closes the sheet, then runs [action], surfacing Twitch's reason on failure.
+  Future<void> _run(
+    BuildContext context,
+    Future<void> Function() action,
+  ) async {
+    Navigator.pop(context);
+    try {
+      await action();
+    } on ApiException catch (e) {
+      chatStore.updateNotification(e.message);
+    }
+  }
+
+  Future<void> _delete() async {
+    final success = await chatStore.auth.user.deleteMessage(
+      broadcasterId: chatStore.channelId,
+      messageId: messageId!,
+    );
+    chatStore.updateNotification(
+      success ? 'Message deleted' : 'Failed to delete message',
+    );
+  }
+
+  Future<void> _timeout() async {
+    final success = await chatStore.auth.user.banOrTimeoutUser(
+      broadcasterId: chatStore.channelId,
+      userIdToBan: targetUserId,
+      duration: 600, // 10 minutes
+    );
+    chatStore.updateNotification(
+      success
+          ? '$targetName timed out for 10 minutes.'
+          : 'Failed to timeout user',
+    );
+  }
+
+  Future<void> _ban() async {
+    final success = await chatStore.auth.user.banOrTimeoutUser(
+      broadcasterId: chatStore.channelId,
+      userIdToBan: targetUserId,
+    );
+    chatStore.updateNotification(
+      success ? '$targetName banned.' : 'Failed to ban user',
+    );
+  }
+
+  Future<void> _unban() async {
+    final success = await chatStore.auth.user.unbanUser(
+      broadcasterId: chatStore.channelId,
+      userIdToUnban: targetUserId,
+    );
+    if (success) chatStore.clearUserBanState(targetUserId);
+    chatStore.updateNotification(
+      success
+          ? 'Removed ban/timeout for $targetName.'
+          : 'Failed to remove ban or timeout',
+    );
+  }
+}
diff --git a/lib/screens/channel/chat/widgets/reply_thread.dart b/lib/screens/channel/chat/widgets/reply_thread.dart
new file mode 100644
index 00000000..7dc83394
--- /dev/null
+++ b/lib/screens/channel/chat/widgets/reply_thread.dart
@@ -0,0 +1,98 @@
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/models/irc.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
+import 'package:frosty/screens/channel/chat/widgets/chat_message.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
+import 'package:frosty/widgets/section_header.dart';
+
+class ReplyThread extends StatelessWidget {
+  final IRCMessage selectedMessage;
+  final ChatStore chatStore;
+
+  const ReplyThread({
+    super.key,
+    required this.selectedMessage,
+    required this.chatStore,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final replyParent = chatStore.messages.firstWhereOrNull(
+      (message) =>
+          message.tags['id'] == selectedMessage.tags['reply-parent-msg-id'],
+    );
+
+    final replyDisplayName = selectedMessage.tags['reply-parent-display-name'];
+    final replyUserLogin = selectedMessage.tags['reply-parent-user-login'];
+    final replyBody = selectedMessage.tags['reply-parent-msg-body'];
+
+    final replyName = replyUserLogin != null
+        ? getReadableName(replyDisplayName!, replyUserLogin)
+        : replyDisplayName;
+
+    return SizedBox(
+      height: MediaQuery.of(context).size.height * 0.5,
+      child: Observer(
+        builder: (context) {
+          return MediaQuery(
+            data: MediaQuery.of(context).copyWith(
+              textScaler: TextScaler.linear(chatStore.settings.messageScale),
+            ),
+            child: DefaultTextStyle(
+              style: DefaultTextStyle.of(
+                context,
+              ).style.copyWith(fontSize: chatStore.settings.fontSize),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  const SectionHeader(
+                    'Replies',
+                    isFirst: true,
+                    padding: EdgeInsets.fromLTRB(12, 0, 12, 8),
+                  ),
+                  if (replyParent != null)
+                    ChatMessage(ircMessage: replyParent, chatStore: chatStore)
+                  else
+                    Padding(
+                      padding: const EdgeInsets.fromLTRB(12, 0, 12, 8),
+                      child: Text(
+                        '$replyName: $replyBody',
+                        style: const TextStyle(fontWeight: FontWeight.w600),
+                      ),
+                    ),
+                  Flexible(
+                    child: FrostyScrollbar(
+                      child: ListView(
+                        primary: false,
+                        children: chatStore.messages
+                            .where(
+                              (message) =>
+                                  message.tags['reply-parent-msg-id'] ==
+                                  selectedMessage.tags['reply-parent-msg-id'],
+                            )
+                            .map(
+                              (message) => ChatMessage(
+                                isModal: true,
+                                showReplyHeader: false,
+                                isInReplyThread: true,
+                                ircMessage: message,
+                                chatStore: chatStore,
+                              ),
+                            )
+                            .toList(),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/screens/channel/video/channel_info_header.dart b/lib/screens/channel/video/channel_info_header.dart
new file mode 100644
index 00000000..0cf77aa2
--- /dev/null
+++ b/lib/screens/channel/video/channel_info_header.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/channel/video/stream_info_bar.dart';
+import 'package:frosty/screens/channel/video/video_player_interface.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/widgets/follow_button.dart';
+
+/// Channel metadata + follow control shown under the player (portrait).
+class ChannelInfoHeader extends StatelessWidget {
+  final VideoPlayerInterface videoStore;
+  final AuthStore authStore;
+  final String userId;
+  final String displayName;
+  final bool isInSharedChatMode;
+
+  const ChannelInfoHeader({
+    super.key,
+    required this.videoStore,
+    required this.authStore,
+    required this.userId,
+    required this.displayName,
+    this.isInSharedChatMode = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Material(
+      color: Theme.of(context).scaffoldBackgroundColor,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(12, 8, 12, 8),
+        child: Observer(
+          builder: (context) {
+            final streamInfo = videoStore.streamInfo;
+            final offline = streamInfo == null;
+
+            return Row(
+              spacing: 8,
+              children: [
+                Expanded(
+                  child: StreamInfoBar(
+                    streamInfo: streamInfo,
+                    offlineChannelInfo: videoStore.offlineChannelInfo,
+                    displayName: displayName,
+                    isCompact: true,
+                    isOffline: offline,
+                    isInSharedChatMode: isInSharedChatMode,
+                    showTextShadows: false,
+                    tooltipTriggerMode: TooltipTriggerMode.longPress,
+                  ),
+                ),
+                FollowButton(
+                  authStore: authStore,
+                  userId: userId,
+                  displayName: displayName,
+                ),
+              ],
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/channel/video/chat_latency_sync.dart b/lib/screens/channel/video/chat_latency_sync.dart
new file mode 100644
index 00000000..0b5ff544
--- /dev/null
+++ b/lib/screens/channel/video/chat_latency_sync.dart
@@ -0,0 +1,32 @@
+import 'package:frosty/screens/channel/video/video_timing_constants.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+
+/// Single owner of `SettingsStore.syncedChatDelay` writes from the video
+/// player stores. Previously both stores poked the setting directly,
+/// making settings an ad-hoc event bus between video and chat.
+class ChatLatencySync {
+  ChatLatencySync({required this.settingsStore});
+
+  final SettingsStore settingsStore;
+
+  /// Reset the delay to zero on stream transitions (channel enter, stream
+  /// end, chat-only toggle, etc). No-op when auto-sync is disabled.
+  void reset() {
+    if (settingsStore.autoSyncChatDelay) {
+      settingsStore.syncedChatDelay = 0.0;
+    }
+  }
+
+  /// Push a fresh video-latency measurement. Only writes when drift from
+  /// the current value exceeds the tolerance, to avoid thrashing the chat
+  /// delay countdown on minor fluctuations.
+  void report(double latencySeconds) {
+    if (!settingsStore.autoSyncChatDelay) return;
+    final current = settingsStore.syncedChatDelay;
+    if (current == 0 ||
+        (latencySeconds - current).abs() >
+            VideoTimingConstants.chatSyncDriftToleranceSeconds) {
+      settingsStore.syncedChatDelay = latencySeconds;
+    }
+  }
+}
diff --git a/lib/screens/channel/video/native_video.dart b/lib/screens/channel/video/native_video.dart
new file mode 100644
index 00000000..78c51f52
--- /dev/null
+++ b/lib/screens/channel/video/native_video.dart
@@ -0,0 +1,106 @@
+import 'package:better_native_video_player/better_native_video_player.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/channel/video/native_video_store.dart';
+
+/// Native video player widget backed by AVPlayerViewController (iOS)
+/// and ExoPlayer (Android).
+class NativeVideo extends StatelessWidget {
+  final NativeVideoStore nativeVideoStore;
+
+  const NativeVideo({super.key, required this.nativeVideoStore});
+
+  @override
+  Widget build(BuildContext context) {
+    return Observer(
+      builder: (context) {
+        final controller = nativeVideoStore.controller;
+        final error = nativeVideoStore.error;
+
+        final isOffline =
+            !nativeVideoStore.loading &&
+            nativeVideoStore.streamInfo == null &&
+            error == null;
+
+        return ColoredBox(
+          color: Colors.black,
+          child: Stack(
+            children: [
+              if (controller != null && !isOffline)
+                NativeVideoPlayer(
+                  key: ObjectKey(controller),
+                  controller: controller,
+                ),
+              if (controller != null && !nativeVideoStore.hasPlayedOnce && !isOffline)
+                const ColoredBox(
+                  color: Colors.black,
+                  child: SizedBox.expand(),
+                ),
+              if (error != null)
+                Align(
+                  alignment: const Alignment(0, 0.3),
+                  child: Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 32),
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Icon(
+                          Icons.error_outline_rounded,
+                          color: Colors.amber.withValues(alpha: 0.7),
+                          size: 32,
+                        ),
+                        const SizedBox(height: 10),
+                        Text(
+                          error,
+                          style: const TextStyle(
+                            color: Colors.white60,
+                            fontSize: 13,
+                            height: 1.4,
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              if (isOffline)
+                const Center(
+                  child: Icon(
+                    Icons.tv_off_rounded,
+                    color: Colors.white24,
+                    size: 32,
+                  ),
+                ),
+              if (nativeVideoStore.isAudioOnlyMode && !isOffline)
+                const ColoredBox(
+                  color: Colors.black,
+                  child: SizedBox.expand(
+                    child: Center(
+                    child: Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Icon(
+                          Icons.headphones_rounded,
+                          color: Colors.white24,
+                          size: 32,
+                        ),
+                        SizedBox(height: 8),
+                        Text(
+                          'Audio Only',
+                          style: TextStyle(
+                            color: Colors.white24,
+                            fontSize: 13,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  ),
+                ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/screens/channel/video/native_video_player_interface.dart b/lib/screens/channel/video/native_video_player_interface.dart
new file mode 100644
index 00000000..a01e34ec
--- /dev/null
+++ b/lib/screens/channel/video/native_video_player_interface.dart
@@ -0,0 +1,8 @@
+import 'package:frosty/screens/channel/video/video_player_interface.dart';
+
+/// Capabilities that only the native player can meaningfully support.
+/// Callers that need these must type-check against this interface.
+abstract class NativeVideoPlayerInterface extends VideoPlayerInterface {
+  /// Whether the current quality is an HLS audio-only variant.
+  bool get isAudioOnlyMode;
+}
diff --git a/lib/screens/channel/video/native_video_store.dart b/lib/screens/channel/video/native_video_store.dart
new file mode 100644
index 00000000..31077620
--- /dev/null
+++ b/lib/screens/channel/video/native_video_store.dart
@@ -0,0 +1,1469 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:better_native_video_player/better_native_video_player.dart';
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_ad_solutions.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/constants.dart';
+import 'package:frosty/models/channel.dart';
+import 'package:frosty/models/playback_access_token.dart';
+import 'package:frosty/models/stream.dart';
+import 'package:frosty/screens/channel/video/chat_latency_sync.dart';
+import 'package:frosty/screens/channel/video/native_video_player_interface.dart';
+import 'package:frosty/screens/channel/video/playback_error_recovery.dart';
+import 'package:frosty/screens/channel/video/stream_info_poller.dart';
+import 'package:frosty/screens/channel/video/video_timing_constants.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:mobx/mobx.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:simple_pip_mode/simple_pip.dart';
+
+part 'native_video_store.g.dart';
+
+class NativeVideoStore = NativeVideoStoreBase with _$NativeVideoStore;
+
+abstract class NativeVideoStoreBase
+    with Store
+    implements NativeVideoPlayerInterface {
+  static int _nextId = 0;
+  static const _legacyWebViewInSettings =
+      'the legacy WebView player in Settings';
+
+  @override
+  final String userLogin;
+  final String userId;
+  final String displayName;
+  final TwitchApi twitchApi;
+  final TwitchGqlApi twitchGqlApi;
+  final AuthStore authStore;
+
+  @override
+  final SettingsStore settingsStore;
+
+  @readonly
+  NativeVideoPlayerController? _controller;
+
+  Timer? _overlayTimer;
+  Timer? _latencyTimer;
+  Timer? _stallRecoveryTimer;
+  Timer? _streamInfoTimer;
+  var _stallRecoveryAttempt = 0;
+  var _isStalled = false;
+  Timer? _initRetryTimer;
+  Timer? _healthyPlaybackTimer;
+  DateTime? _lastRefreshTime;
+  bool _overlayWasVisibleBeforePip = true;
+  var _userPaused = false;
+
+  String? _profileImageUrl;
+  var _manualPipRequested = false;
+  var _lastPipWasAutomatic = false;
+  List<NativeVideoPlayerQuality> _qualityObjects = [];
+  var _firstTimeSettingQuality = true;
+  int? _pendingQualityIndex;
+  var _disposed = false;
+  var _initializing = true;
+  var _initInFlight = false;
+  var _controllerInitialized = false;
+  var _totalRefreshAttempts = 0;
+  var _highLatencyCount = 0;
+
+  /// Timestamp of the most recent transition into `_onPlaying`. A subsequent
+  /// stall that arrives inside [VideoTimingConstants.shortPlayWindow] counts
+  /// as a bounce; repeated bounces surface a tailored CDN-trouble error.
+  DateTime? _lastPlayingStart;
+  int _shortPlayBounceCount = 0;
+  var _isQualitySwitching = false;
+  Timer? _qualitySwitchGraceTimer;
+
+  /// Set when an automatic refresh was suppressed because the user had
+  /// paused (e.g. the playback session expired mid-pause). Consumed by
+  /// [handlePausePlay] to refresh instead of playing a dead session.
+  var _pendingRefreshOnResume = false;
+  var _initGeneration = 0;
+  static final _bareResolutionRe = RegExp(r'^(\d+)p$');
+
+  final _pip = SimplePip();
+  late final ChatLatencySync _chatLatencySync =
+      ChatLatencySync(settingsStore: settingsStore);
+  late final StreamInfoPoller _streamInfoPoller = StreamInfoPoller(
+    twitchApi: twitchApi,
+    userLogin: userLogin,
+    userId: userId,
+  );
+  ReactionDisposer? _disposeAndroidAutoPipReaction;
+  ReactionDisposer? _disposeVideoModeReaction;
+
+  /// Cached SimplePip.isAutoPipAvailable result. Populated by the Android
+  /// auto-PiP reaction on first run; reused by dispose to avoid a redundant
+  /// platform-channel call.
+  bool? _autoPipAvailable;
+
+  StreamSubscription<bool>? _pipSub;
+  StreamSubscription<List<NativeVideoPlayerQuality>>? _qualitiesSub;
+  StreamSubscription<bool>? _adBreakSub;
+
+  /// True while a server-stitched ad break is playing (native player detects
+  /// twitch-stitched-ad dateranges). Latency readings and play/buffer
+  /// transitions are unreliable during ads, so recovery and chat sync are
+  /// suspended rather than burning refresh attempts on ad-induced noise.
+  var _isAdBreakActive = false;
+
+  /// True after we swapped to a TwitchAdSolutions backup player-type URL.
+  var _usingAdBackup = false;
+
+  /// Serializes ad-break URL swaps so overlapping adBreakStream events don't
+  /// race loadUrl calls.
+  var _adSwapInFlight = false;
+
+  late final TwitchAdFreePlayback _adFreePlayback =
+      TwitchAdFreePlayback(twitchGqlApi);
+
+  @readonly
+  var _loading = true;
+
+  /// Whether ad blocking is actively avoiding/replacing an ad pod.
+  @readonly
+  var _blockingAds = false;
+
+  /// Exposes [_blockingAds] via [VideoPlayerInterface.isBlockingAds]
+  /// (must live in the hand-written store — build_runner will strip a
+  /// hand-patched override from the `.g.dart`).
+  @override
+  bool get isBlockingAds => _blockingAds;
+
+  @readonly
+  var _paused = true;
+
+  @readonly
+  var _hasPlayedOnce = false;
+
+  @readonly
+  var _overlayVisible = true;
+
+  @readonly
+  StreamTwitch? _streamInfo;
+
+  @readonly
+  Channel? _offlineChannelInfo;
+
+  @readonly
+  var _availableStreamQualities = <String>[];
+
+  /// Qualities that exist for this stream but require a subscription
+  /// (parsed from the playback token's restricted_bitrates).
+  @readonly
+  var _restrictedStreamQualities = <String>[];
+
+  @readonly
+  var _streamQualityIndex = 0;
+
+  @override
+  @computed
+  String get streamQuality =>
+      _availableStreamQualities.elementAtOrNull(_streamQualityIndex) ?? 'Auto';
+
+  @readonly
+  String? _latency;
+
+  @readonly
+  var _isInPipMode = false;
+
+  @readonly
+  var _isAudioOnlyMode = false;
+
+  @readonly
+  String? _error;
+
+  NativeVideoStoreBase({
+    required this.userLogin,
+    required this.userId,
+    required this.displayName,
+    required this.twitchApi,
+    required this.twitchGqlApi,
+    required this.authStore,
+    required this.settingsStore,
+  }) {
+    _chatLatencySync.reset();
+    _scheduleOverlayHide();
+    updateStreamInfo();
+    _startStreamInfoTimer();
+
+    // Skip eager init in chat-only mode — `play()` is what activates the
+    // iOS audio session, so without it nothing is allocated.
+    if (settingsStore.showVideo) {
+      _controller = _createController();
+      _initPlayer();
+    } else {
+      _loading = false;
+      _initializing = false;
+    }
+
+    // `pause()` alone leaves the audio session, PiP controller, and URL
+    // session alive on iOS, which blocks low-power sleep states. Full
+    // dispose is the only path that deactivates the audio session.
+    _disposeVideoModeReaction = reaction(
+      (_) => settingsStore.showVideo,
+      (showVideo) {
+        if (!showVideo) {
+          _disposeController();
+          _resetPlayerStateForChatOnly();
+        } else if (_controller == null) {
+          _initFreshController();
+        }
+      },
+    );
+
+    if (Platform.isAndroid) {
+      // Explicit reaction on showVideo only (vs autorun, which re-runs on any
+      // observable the closure happens to read). Caches the auto-PiP
+      // availability check — it doesn't change within a session.
+      _disposeAndroidAutoPipReaction = reaction(
+        (_) => settingsStore.showVideo,
+        (showVideo) async {
+          _autoPipAvailable ??= await SimplePip.isAutoPipAvailable;
+          if (_disposed || !_autoPipAvailable!) return;
+          if (showVideo) {
+            _pip.setAutoPipMode();
+          } else {
+            _pip.setAutoPipMode(autoEnter: false);
+          }
+        },
+        fireImmediately: true,
+      );
+    }
+  }
+
+  NativeVideoPlayerController _createController() {
+    final controller = NativeVideoPlayerController(
+      id: _nextId++,
+      autoPlay: true,
+      showNativeControls: false,
+      mediaInfo: NativeVideoPlayerMediaInfo(
+        title: displayName,
+        subtitle: 'Frosty — Twitch',
+        artworkUrl: _profileImageUrl,
+      ),
+    );
+    controller.addActivityListener(_onPlayerActivity);
+    return controller;
+  }
+
+  /// Pushes the channel's Now Playing metadata (lock screen / control center)
+  /// to the native player using the cached profile image.
+  void _applyNowPlayingMediaInfo() {
+    if (_disposed || _controller == null) return;
+    _controller!.setMediaInfo(NativeVideoPlayerMediaInfo(
+      title: displayName,
+      subtitle: _streamInfo?.title ?? 'Twitch',
+      artworkUrl: _profileImageUrl,
+    ));
+  }
+
+  @action
+  Future<void> _initPlayer() async {
+    if (_initInFlight) return;
+    _initInFlight = true;
+    final generation = _initGeneration;
+    try {
+      // Fetch profile image URL for Now Playing artwork (fire-and-forget).
+      // _initPlayer re-runs on every hard refresh and chat-only toggle, so
+      // skip the Helix call once the URL is cached.
+      if (_profileImageUrl != null) {
+        _applyNowPlayingMediaInfo();
+      } else {
+        twitchApi.getUser(id: userId).then((user) {
+          _profileImageUrl = user.profileImageUrl;
+          _applyNowPlayingMediaInfo();
+        }).catchError((e) {
+          debugPrint('NativeVideoStore: profile image fetch failed: $e');
+        });
+      }
+
+      await _controller!.initialize();
+      if (_disposed || generation != _initGeneration) {
+        // Don't reset _initInFlight here — a newer generation's _initPlayer
+        // may already own the flag. Only the current generation should touch it.
+        return;
+      }
+
+      _adBreakSub = _controller!.adBreakStream.listen((isActive) {
+        _isAdBreakActive = isActive;
+        debugPrint(
+          'NativeVideoStore: ad break ${isActive ? 'started' : 'ended'}',
+        );
+        if (!settingsStore.blockTwitchAds) {
+          runInAction(() => _blockingAds = false);
+          return;
+        }
+        // Fire-and-forget: swap stream URL per TwitchAdSolutions backup path.
+        unawaited(_onAdBreakChanged(isActive));
+      });
+
+      _pipSub = _controller!.isPipEnabledStream.listen((isPip) {
+        runInAction(() {
+          // iOS-only bookkeeping: track whether PiP was triggered by gesture
+          // (auto) or button (manual). Must run before _setPipActive mutates
+          // _isInPipMode.
+          if (isPip && !_isInPipMode) {
+            _lastPipWasAutomatic = !_manualPipRequested;
+            _manualPipRequested = false;
+          } else if (!isPip && _isInPipMode) {
+            _lastPipWasAutomatic = false;
+          }
+          _setPipActive(isPip);
+        });
+      });
+
+      _qualitiesSub = _controller!.qualitiesStream.listen((qualities) {
+        runInAction(() {
+          // Filter out the plugin's auto entry (we add our own) and deduplicate.
+          final seen = <String>{};
+          final filtered = qualities
+              .where((q) => !q.isAuto && seen.add(q.label))
+              .toList();
+
+          // Remove bare "{height}p" entries when a fps-suffixed version
+          // (e.g. "160p30") exists at the same height. The bare entry is
+          // typically a duplicate HLS variant with missing FRAME-RATE that
+          // causes frozen video when selected.
+          final labels = filtered.map((q) => q.label).toSet();
+          filtered.removeWhere((q) {
+            final bare = _bareResolutionRe.firstMatch(q.label);
+            if (bare == null) return false;
+            final height = bare.group(1)!;
+            return labels.any(
+              (l) => l != q.label && l.startsWith('${height}p'),
+            );
+          });
+
+          // Reverse so highest quality comes first.
+          _qualityObjects = filtered.reversed.toList();
+          _availableStreamQualities = [
+            'Auto',
+            ..._qualityObjects.map((q) => q.label),
+          ];
+
+          if (_firstTimeSettingQuality && qualities.isNotEmpty) {
+            _firstTimeSettingQuality = false;
+            if (settingsStore.defaultToHighestQuality) {
+              _queueOrApplyInitialQualityIndex(1);
+            } else {
+              SharedPreferences.getInstance().then((prefs) {
+                if (_disposed || _pendingQualityIndex != null) return;
+                final lastQuality =
+                    prefs.getString(lastStreamQualityKey(userLogin));
+                if (lastQuality == null) return;
+                final index = _availableStreamQualities.indexOf(lastQuality);
+                if (index != -1) {
+                  runInAction(() => _queueOrApplyInitialQualityIndex(index));
+                }
+              }).catchError((e) {
+                debugPrint('NativeVideoStore: failed to read last quality: $e');
+              });
+            }
+          }
+        });
+      });
+
+      _controllerInitialized = true;
+    } catch (e, stackTrace) {
+      if (_disposed || generation != _initGeneration) return;
+      _initInFlight = false;
+      await _handleLoadError(e, stackTrace, generation);
+      return;
+    }
+    _initInFlight = false;
+    await _runLoadStream(generation);
+  }
+
+  /// Wraps `_loadStream` with shared success/error handling. On success,
+  /// clears `_error`; on failure, delegates to `_handleLoadError` for retry
+  /// scheduling or error display. Used by both first-time init and refresh.
+  Future<void> _runLoadStream(int generation) async {
+    try {
+      await _loadStream(generation);
+      if (_disposed || generation != _initGeneration) return;
+      runInAction(() {
+        _error = null;
+      });
+    } catch (e, stackTrace) {
+      if (_disposed || generation != _initGeneration) return;
+      await _handleLoadError(e, stackTrace, generation);
+    }
+  }
+
+  /// Fetches a fresh playback token, builds the HLS URL, and loads it into
+  /// the (already-initialized) controller. Used by both first-time init and
+  /// user-initiated refresh (light refresh reuses the same AVPlayer via
+  /// replaceCurrentItem internally, per Apple's HLS recovery guidance).
+  Future<void> _loadStream(int generation) async {
+    // Use web cookie token (works with web Client-ID) for ad-free playback.
+    final authToken = authStore.gqlToken;
+    late final String hlsUrl;
+    late final PlaybackAccessToken token;
+    try {
+      if (settingsStore.blockTwitchAds) {
+        final resolved = await _adFreePlayback.resolvePrimary(
+          login: userLogin,
+          authToken: authToken,
+        );
+        hlsUrl = resolved.url;
+        token = resolved.token;
+        debugPrint(
+          'NativeVideoStore: adblock primary '
+          'playerType=${resolved.playerType}',
+        );
+      } else {
+        token = await twitchGqlApi.getPlaybackAccessToken(
+          login: userLogin,
+          authToken: authToken,
+        );
+        hlsUrl = twitchGqlApi.buildHlsUrl(login: userLogin, token: token);
+      }
+    } catch (e) {
+      if (authToken != null) {
+        debugPrint('NativeVideoStore: auth token failed, retrying without: $e');
+        if (e is UnauthorizedException) {
+          // Twitch rejected the web session token — unlink it so the UI
+          // reflects the true state and future loads skip this request.
+          authStore.invalidateGqlToken();
+        }
+        if (settingsStore.blockTwitchAds) {
+          final resolved = await _adFreePlayback.resolvePrimary(
+            login: userLogin,
+          );
+          hlsUrl = resolved.url;
+          token = resolved.token;
+        } else {
+          token = await twitchGqlApi.getPlaybackAccessToken(login: userLogin);
+          hlsUrl = twitchGqlApi.buildHlsUrl(login: userLogin, token: token);
+        }
+      } else {
+        rethrow;
+      }
+    }
+
+    if (_disposed || generation != _initGeneration || !settingsStore.showVideo) {
+      return;
+    }
+    runInAction(() {
+      _restrictedStreamQualities = token.restrictedQualities;
+      _usingAdBackup = false;
+      _blockingAds = false;
+    });
+
+    await _controller!.loadUrl(
+      url: hlsUrl,
+      headers: TwitchGqlApi.playbackHttpHeaders,
+    );
+    if (_disposed || generation != _initGeneration || !settingsStore.showVideo) {
+      return;
+    }
+    await _controller!.configureForLivePlayback();
+    _startLatencyPolling();
+  }
+
+  /// TwitchAdSolutions backup swap when the native player reports a stitched
+  /// ad break; restores the primary (popout) URL when the break ends.
+  Future<void> _onAdBreakChanged(bool isActive) async {
+    if (_disposed || !settingsStore.blockTwitchAds || _controller == null) {
+      return;
+    }
+    if (_adSwapInFlight) return;
+    _adSwapInFlight = true;
+    final generation = _initGeneration;
+    try {
+      if (isActive) {
+        runInAction(() => _blockingAds = true);
+        final resolved = await _adFreePlayback.resolveBackup(
+          login: userLogin,
+          authToken: authStore.gqlToken,
+        );
+        if (_disposed || generation != _initGeneration) return;
+        debugPrint(
+          'NativeVideoStore: blocking ads via '
+          'playerType=${resolved.playerType}',
+        );
+        await _controller!.loadUrl(
+          url: resolved.url,
+          headers: TwitchGqlApi.playbackHttpHeaders,
+        );
+        if (_disposed || generation != _initGeneration) return;
+        await _controller!.configureForLivePlayback();
+        runInAction(() {
+          _usingAdBackup = true;
+          _restrictedStreamQualities = resolved.token.restrictedQualities;
+        });
+      } else if (_usingAdBackup) {
+        debugPrint('NativeVideoStore: ad break ended, restoring primary');
+        final resolved = await _adFreePlayback.resolvePrimary(
+          login: userLogin,
+          authToken: authStore.gqlToken,
+        );
+        if (_disposed || generation != _initGeneration) return;
+        await _controller!.loadUrl(
+          url: resolved.url,
+          headers: TwitchGqlApi.playbackHttpHeaders,
+        );
+        if (_disposed || generation != _initGeneration) return;
+        await _controller!.configureForLivePlayback();
+        runInAction(() {
+          _usingAdBackup = false;
+          _blockingAds = false;
+          _restrictedStreamQualities = resolved.token.restrictedQualities;
+        });
+      } else {
+        runInAction(() => _blockingAds = false);
+      }
+    } catch (e) {
+      debugPrint('NativeVideoStore: adblock swap failed: $e');
+      runInAction(() => _blockingAds = _isAdBreakActive || _usingAdBackup);
+    } finally {
+      _adSwapInFlight = false;
+    }
+  }
+
+  /// Shared error handler for both `_initPlayer` and `_reloadCurrentController`.
+  /// Checks stream liveness, auto-retries if CDN is still serving stale
+  /// manifests, or surfaces the error with the overlay visible.
+  Future<void> _handleLoadError(
+    Object e,
+    StackTrace stackTrace,
+    int generation,
+  ) async {
+    _initializing = false;
+    // Wait for stream info so we can distinguish "offline" from "broken".
+    await updateStreamInfo(forceUpdate: true);
+    if (_disposed || generation != _initGeneration) return;
+    debugPrint('NativeVideoStore load error: $e');
+    if (_streamInfo != null) {
+      _recordNativePlaybackError(
+        e,
+        stackTrace,
+        'Native video load failed',
+        information: [
+          'channel=$userLogin',
+          'attempt=$_totalRefreshAttempts',
+        ],
+      );
+    }
+
+    // Auto-retry if the stream is live — the CDN may still be serving
+    // stale manifests right after a stream crash.
+    if (_streamInfo != null &&
+        _totalRefreshAttempts < VideoTimingConstants.maxRefreshAttempts) {
+      _totalRefreshAttempts++;
+      debugPrint(
+        'NativeVideoStore: auto-retrying load '
+        '(attempt $_totalRefreshAttempts/${VideoTimingConstants.maxRefreshAttempts})',
+      );
+      _initRetryTimer?.cancel();
+      _initRetryTimer = Timer(VideoTimingConstants.initRetryDelay, () {
+        if (!_disposed && generation == _initGeneration) {
+          _handleRefresh(userInitiated: false);
+        }
+      });
+      return;
+    }
+
+    runInAction(() {
+      _loading = false;
+      _paused = true;
+      // Only show the error if the stream is actually live — an offline
+      // channel is expected to fail here and the overlay handles it.
+      if (_streamInfo != null) {
+        _showErrorOverlay(
+          'Native player failed to load. Try $_legacyWebViewInSettings.',
+        );
+      }
+    });
+  }
+
+  /// Light refresh — reloads the stream URL on the existing controller.
+  /// Skips platform view recreation, audio session churn, and subscription
+  /// teardown. Per Apple's WWDC 2017 guidance, this is the preferred
+  /// pattern: new AVPlayerItem via `replaceCurrentItem` on existing AVPlayer.
+  @action
+  Future<void> _reloadCurrentController() => _runLoadStream(_initGeneration);
+
+  void _onPlayerActivity(PlayerActivityEvent event) {
+    runInAction(() {
+      switch (event.state) {
+        case PlayerActivityState.playing:
+          _onPlaying();
+        case PlayerActivityState.buffering:
+        case PlayerActivityState.loading:
+          _onBufferingOrLoading(event.state);
+        case PlayerActivityState.error:
+          _onPlayerError(event.data);
+        case PlayerActivityState.paused:
+        case PlayerActivityState.stopped:
+        case PlayerActivityState.completed:
+        case PlayerActivityState.idle:
+          _onPaused();
+        default:
+          break;
+      }
+    });
+  }
+
+  /// Keeps the Android PiP window's play/pause remote action in sync with
+  /// actual playback. Without this the button is stuck on whatever glyph the
+  /// `mediaOnlyPause` layout started with, and `onPipAction` — which toggles
+  /// blind — then does the opposite of what the button shows.
+  void _syncPipPlaybackState({required bool isPlaying}) {
+    if (!Platform.isAndroid) return;
+    _pip.setIsPlaying(isPlaying);
+  }
+
+  void _onPlaying() {
+    _loading = false;
+    _paused = false;
+    _syncPipPlaybackState(isPlaying: true);
+    _isStalled = false;
+    _hasPlayedOnce = true;
+    _initializing = false;
+    _isQualitySwitching = false;
+    _stallRecoveryTimer?.cancel();
+    _stallRecoveryAttempt = 0;
+    _lastPlayingStart = DateTime.now();
+    _scheduleHealthyPlaybackRecoveryReset(_lastPlayingStart!);
+    if (_pendingQualityIndex != null) {
+      final index = _pendingQualityIndex!;
+      _pendingQualityIndex = null;
+      _setStreamQualityIndex(index);
+    }
+    _updateLatency();
+  }
+
+  void _onBufferingOrLoading(PlayerActivityState state) {
+    if (!_isQualitySwitching && !_hasPlayedOnce) {
+      _loading = true;
+    }
+    // Track mid-stream stalls separately from initial loading. With
+    // automaticallyWaitsToMinimizeStalling = false, AVPlayer silently drops
+    // rate to 0 when the buffer empties. The stall timer needs this flag
+    // to engage recovery on those stalls.
+    if (_hasPlayedOnce && !_isQualitySwitching) {
+      _isStalled = true;
+      // Ad-pod entry/exit produces short play/buffer bounces that would
+      // otherwise count toward the CDN-trouble error heuristic.
+      if (!_isAdBreakActive) _recordShortPlayBounceIfNeeded();
+    }
+    // Clear _initializing on the first buffering event so the stall
+    // recovery timer isn't permanently blocked during init stalls.
+    if (_initializing && state == PlayerActivityState.buffering) {
+      _initializing = false;
+    }
+    if (!_userPaused && !_initializing) _startStallRecoveryTimer();
+  }
+
+  void _onPlayerError(Map<String, dynamic>? eventData) {
+    _loading = false;
+    _paused = true;
+    _syncPipPlaybackState(isPlaying: false);
+    _isStalled = false;
+    _initializing = false;
+    _isQualitySwitching = false;
+    _stallRecoveryTimer?.cancel();
+    final errorMessage =
+        eventData?['message'] as String? ??
+        'Playback error. Try refreshing or switch to $_legacyWebViewInSettings.';
+    final errorCode = eventData?['code'] as String?;
+    final statusCode = eventData?['statusCode'] as int?;
+
+    if (errorCode == 'mediaServicesWereReset') {
+      _handleMediaServicesReset(errorMessage);
+      return;
+    }
+
+    // Mid-stream failures (expired HLS session, ExoPlayer "Source error"
+    // after screen-off / network switch, CDN blips). A fresh token + reload
+    // usually fixes these — only pin the Reload overlay once retries are
+    // spent. 4xx refreshes immediately; network/source waits briefly so the
+    // interface can come back.
+    if (shouldAutoRecoverFromPlayerError(
+      refreshCapReached: _refreshCapReached(),
+      errorCode: errorCode,
+    )) {
+      if (_userPaused) {
+        // Don't yank a user-paused stream back to life — the refresh would
+        // reload with autoplay. Defer until they resume.
+        _pendingRefreshOnResume = true;
+        return;
+      }
+      final attempt = _totalRefreshAttempts + 1;
+      final delay = playerErrorRetryDelay(statusCode: statusCode);
+      debugPrint(
+        'NativeVideoStore: player error'
+        '${statusCode != null ? ' (HTTP $statusCode)' : ''}'
+        '${errorMessage.isNotEmpty ? ' — $errorMessage' : ''}, '
+        'auto-refresh in ${delay.inMilliseconds}ms '
+        '(attempt $attempt/${VideoTimingConstants.maxRefreshAttempts})',
+      );
+      _totalRefreshAttempts = attempt;
+      _loading = true;
+      _error = null;
+      _initRetryTimer?.cancel();
+      final generation = _initGeneration;
+      if (delay == Duration.zero) {
+        _handleRefresh(userInitiated: false);
+      } else {
+        _initRetryTimer = Timer(delay, () {
+          if (_disposed || generation != _initGeneration) return;
+          // _handleRefresh parks behind _pendingRefreshOnResume when paused.
+          _handleRefresh(userInitiated: false);
+        });
+      }
+      return;
+    }
+
+    // Check stream liveness before showing the error — an offline channel
+    // is expected to 404 and the overlay handles it.
+    final generation = _initGeneration;
+    updateStreamInfo(forceUpdate: true).then((_) {
+      if (_disposed || generation != _initGeneration) return;
+      runInAction(() {
+        if (_streamInfo != null) {
+          _recordNativePlaybackError(
+            StateError(errorMessage),
+            StackTrace.current,
+            'Native video player error',
+            information: [
+              'channel=$userLogin',
+              if (errorCode != null) 'code=$errorCode',
+              if (statusCode != null) 'statusCode=$statusCode',
+            ],
+          );
+          _showErrorOverlay(errorMessage);
+        }
+      });
+    });
+  }
+
+  /// Surfaces [message] on the video overlay and pins it (cancels auto-hide).
+  /// Must be called inside an action context.
+  void _showErrorOverlay(String message) {
+    _error = message;
+    _overlayVisible = true;
+    _overlayTimer?.cancel();
+  }
+
+  void _recordNativePlaybackError(
+    Object error,
+    StackTrace stackTrace,
+    String reason, {
+    List<Object> information = const [],
+  }) {
+    try {
+      FirebaseCrashlytics.instance.recordError(
+        error,
+        stackTrace,
+        reason: reason,
+        information: information,
+      );
+    } catch (_) {
+      // Firebase may not be initialized (e.g., in tests).
+    }
+  }
+
+  void _handleMediaServicesReset(String errorMessage) {
+    if (_refreshCapReached()) {
+      runInAction(() {
+        _disposeController();
+        _loading = false;
+        _paused = true;
+        _isStalled = false;
+        _initializing = false;
+        _isQualitySwitching = false;
+        _showErrorOverlay(errorMessage);
+      });
+      return;
+    }
+
+    if (_userPaused) {
+      // The player is orphaned either way, but don't auto-resume a stream
+      // the user paused — rebuild when they tap play.
+      _disposeController();
+      _pendingRefreshOnResume = true;
+      return;
+    }
+
+    _totalRefreshAttempts++;
+    debugPrint(
+      'NativeVideoStore: media services reset, rebuilding player '
+      '(attempt $_totalRefreshAttempts/${VideoTimingConstants.maxRefreshAttempts})',
+    );
+    _disposeController();
+    unawaited(_handleRefresh(userInitiated: false));
+  }
+
+  bool _refreshCapReached() =>
+      _totalRefreshAttempts >= VideoTimingConstants.maxRefreshAttempts;
+
+  void _onPaused() {
+    _healthyPlaybackTimer?.cancel();
+    _paused = true;
+    _syncPipPlaybackState(isPlaying: false);
+    _isStalled = false;
+    _isQualitySwitching = false;
+    _stallRecoveryTimer?.cancel();
+
+    // If the player auto-paused during startup/buffering before playing once,
+    // and the user didn't explicitly pause it, force resume and trigger recovery.
+    if (!_userPaused && !_hasPlayedOnce && !_initializing && _error == null) {
+      debugPrint('NativeVideoStore: auto-paused before first play, triggering play');
+      _controller?.play();
+      _startStallRecoveryTimer();
+    }
+  }
+
+  void _startStallRecoveryTimer() {
+    _stallRecoveryTimer?.cancel();
+    _stallRecoveryTimer = Timer(
+      VideoTimingConstants.stallDetectionDelay,
+      _runStallRecovery,
+    );
+  }
+
+  Future<void> _runStallRecovery() async {
+    if (_disposed ||
+        (!_loading && !_isStalled) ||
+        _userPaused ||
+        _initializing) {
+      return;
+    }
+
+    // Note: recovery deliberately does NOT defer during ad breaks. Ad-pod
+    // transition glitches resolve well inside the 8s stall window, attempt-1
+    // recovery (seek to edge + play) is harmless mid-pod, and the native
+    // ad-break flag can freeze at true when paused (the time observer that
+    // re-evaluates it stops firing) — gating recovery on it deadlocks the
+    // player into a permanent pause.
+
+    // When a stream ends the HLS server stops serving segments, causing
+    // the player to stall indefinitely. Skip recovery if the stream is
+    // offline — the overlay handles that state.
+    await updateStreamInfo(forceUpdate: true);
+    if (_disposed || _streamInfo == null) return;
+
+    _stallRecoveryAttempt++;
+
+    if (_stallRecoveryAttempt <= 1) {
+      _recoverBySeekingToLiveEdge();
+    } else if (_refreshCapReached()) {
+      _showStallError();
+    } else if (_backoffDelayRemaining() > Duration.zero) {
+      // Still within the exponential backoff window — re-arm and try again.
+      debugPrint('NativeVideoStore: refresh backoff pending, re-arming timer');
+      _startStallRecoveryTimer();
+    } else {
+      _recoverByFullRefresh();
+    }
+  }
+
+  void _recoverBySeekingToLiveEdge() {
+    debugPrint('NativeVideoStore: stall detected, seeking to live edge');
+    _controller?.seekToLiveEdge();
+    _controller?.play();
+    _startStallRecoveryTimer();
+  }
+
+  void _showStallError() {
+    debugPrint('NativeVideoStore: max recovery attempts reached');
+    final bouncing = _shortPlayBounceCount >=
+        VideoTimingConstants.shortPlayLoopThreshold;
+    runInAction(() {
+      _loading = false;
+      _showErrorOverlay(
+        bouncing
+            ? 'Twitch is having trouble with this channel right now. Try again in a moment, or switch to $_legacyWebViewInSettings.'
+            : 'Stream stalled. Try refreshing or switch to $_legacyWebViewInSettings.',
+      );
+    });
+  }
+
+  /// If a stall arrives within [shortPlayWindow] of the last `_onPlaying`,
+  /// count it as a bounce. Three bounces in a row flips the stall-error
+  /// message to the CDN-trouble variant.
+  void _recordShortPlayBounceIfNeeded() {
+    _healthyPlaybackTimer?.cancel();
+    final start = _lastPlayingStart;
+    if (start == null) return;
+    final elapsed = DateTime.now().difference(start);
+    if (elapsed <= VideoTimingConstants.shortPlayWindow) {
+      _shortPlayBounceCount++;
+    } else {
+      _shortPlayBounceCount = 0;
+    }
+    _lastPlayingStart = null;
+  }
+
+  void _scheduleHealthyPlaybackRecoveryReset(DateTime playingStartedAt) {
+    _healthyPlaybackTimer?.cancel();
+    _healthyPlaybackTimer = Timer(VideoTimingConstants.shortPlayWindow, () {
+      if (_disposed ||
+          _isStalled ||
+          _lastPlayingStart != playingStartedAt) {
+        return;
+      }
+      runInAction(() {
+        _totalRefreshAttempts = 0;
+        _shortPlayBounceCount = 0;
+        _lastPlayingStart = null;
+      });
+    });
+  }
+
+  /// How long to wait before the next stall-recovery full refresh, based on
+  /// how many have already fired. Returns zero once enough time has elapsed
+  /// since the last refresh, or when no refresh has happened yet.
+  Duration _backoffDelayRemaining() {
+    if (_lastRefreshTime == null) return Duration.zero;
+    final idx = _totalRefreshAttempts
+        .clamp(0, VideoTimingConstants.refreshBackoff.length - 1);
+    final required = VideoTimingConstants.refreshBackoff[idx];
+    final elapsed = DateTime.now().difference(_lastRefreshTime!);
+    final remaining = required - elapsed;
+    return remaining > Duration.zero ? remaining : Duration.zero;
+  }
+
+  void _recoverByFullRefresh() {
+    _totalRefreshAttempts++;
+    debugPrint(
+      'NativeVideoStore: stall persists, refreshing player '
+      '(attempt $_totalRefreshAttempts/${VideoTimingConstants.maxRefreshAttempts})',
+    );
+    _handleRefresh(userInitiated: false);
+  }
+
+  void _startStreamInfoTimer() {
+    _streamInfoTimer?.cancel();
+    _streamInfoTimer = Timer.periodic(
+      VideoTimingConstants.nativeStreamInfoInterval,
+      (_) => _pollStreamInfoAndRecoverIfNeeded(),
+    );
+  }
+
+  void _stopStreamInfoTimer() {
+    _streamInfoTimer?.cancel();
+    _streamInfoTimer = null;
+  }
+
+  Future<void> _pollStreamInfoAndRecoverIfNeeded() async {
+    if (_disposed) return;
+    final wasOffline = _streamInfo == null;
+    await updateStreamInfo(forceUpdate: true);
+    if (_disposed) return;
+
+    if (wasOffline && _streamInfo != null && settingsStore.showVideo && !_userPaused) {
+      debugPrint(
+        'NativeVideoStore: stream detected back online, auto-refreshing',
+      );
+      _handleRefresh(userInitiated: false);
+    }
+  }
+
+  void _startLatencyPolling() {
+    _latencyTimer?.cancel();
+    _updateLatency();
+    _latencyTimer = Timer.periodic(
+      VideoTimingConstants.latencyPollingInterval,
+      (_) => _updateLatency(),
+    );
+  }
+
+  Future<void> _updateLatency() async {
+    // Program-date-time readings jump around during stitched ad breaks —
+    // skip the poll entirely (display, recovery, and chat sync all resume
+    // on the next tick after the break ends).
+    if (_isAdBreakActive) return;
+
+    final seconds = await _controller?.getLatencyToLive();
+    if (_disposed || seconds == null) return;
+    final rounded = seconds.round();
+
+    // Auto-recover when latency climbs too high (e.g. stream glitch,
+    // temporary network issue). Normal live latency is under ~15s;
+    // 30s+ means the player fell behind and needs intervention.
+    // Intentionally skips the latency display update and chat delay
+    // sync — both are stale at this point and will refresh after recovery.
+    if (rounded >= VideoTimingConstants.highLatencyThresholdSeconds &&
+        !_paused &&
+        !_loading &&
+        !_userPaused) {
+      _highLatencyCount++;
+      // Still high after several interventions — the reading can't be
+      // trusted (device clock skew) or the device genuinely can't keep up.
+      // Either way, looping seeks/refreshes forever makes playback worse.
+      // The counter survives refreshes and only resets on a healthy
+      // reading, so a persistent condition stops recovery permanently.
+      if (_highLatencyCount >
+          VideoTimingConstants.maxHighLatencyRecoveries) {
+        return;
+      }
+      if (_isInPipMode || _highLatencyCount == 1) {
+        // During PiP, only seek to live edge — handleRefresh() disposes
+        // the controller which kills PiP.
+        debugPrint(
+          'NativeVideoStore: high latency (${rounded}s), seeking to live edge',
+        );
+        _controller?.seekToLiveEdge();
+        _controller?.play();
+      } else if (!_refreshCapReached() &&
+          _backoffDelayRemaining() == Duration.zero) {
+        debugPrint(
+          'NativeVideoStore: latency still high (${rounded}s), refreshing '
+          '(attempt ${_totalRefreshAttempts + 1}/${VideoTimingConstants.maxRefreshAttempts})',
+        );
+        _totalRefreshAttempts++;
+        _handleRefresh(userInitiated: false);
+      }
+      // Within the refresh cap/backoff window — wait for the next poll.
+      return;
+    }
+    _highLatencyCount = 0;
+
+    final newLatency = '${rounded}s';
+    if (newLatency != _latency) {
+      runInAction(() {
+        _latency = newLatency;
+      });
+    }
+
+    // Skip chat sync when the player isn't actively progressing against
+    // the live edge — a stall/pause leaves the live edge racing ahead and
+    // would inflate syncedChatDelay unbounded.
+    if (_paused || _loading || _userPaused || _isStalled) return;
+    _chatLatencySync.report(seconds);
+  }
+
+  void _scheduleOverlayHide([
+    Duration delay = VideoTimingConstants.overlayAutoHide,
+  ]) {
+    _overlayTimer?.cancel();
+
+    if (_isInPipMode) {
+      runInAction(() => _overlayVisible = true);
+      return;
+    }
+
+    _overlayTimer = Timer(delay, () {
+      if (_isInPipMode) return;
+      runInAction(() {
+        _overlayVisible = false;
+      });
+    });
+  }
+
+  @override
+  @action
+  void handleVideoTap() {
+    if (_isInPipMode) {
+      _overlayVisible = true;
+      return;
+    }
+
+    _overlayTimer?.cancel();
+
+    if (_overlayVisible) {
+      _overlayVisible = false;
+    } else {
+      updateStreamInfo(forceUpdate: true);
+      _overlayVisible = true;
+      _scheduleOverlayHide();
+    }
+  }
+
+  @override
+  void handlePausePlay() {
+    if (_pendingRefreshOnResume) {
+      // The playback session died while user-paused (token expiry, media
+      // services reset) — playing the dead session would no-op or error.
+      _pendingRefreshOnResume = false;
+      _handleRefresh(userInitiated: false);
+      return;
+    }
+    if (_controller == null) return;
+    if (_paused) {
+      _userPaused = false;
+      _controller!.play();
+    } else {
+      _userPaused = true;
+      _controller!.pause();
+    }
+  }
+
+  @override
+  @action
+  void handleToggleOverlay() {
+    if (settingsStore.toggleableOverlay) {
+      HapticFeedback.mediumImpact();
+      settingsStore.showOverlay = !settingsStore.showOverlay;
+
+      if (settingsStore.showOverlay) {
+        _overlayVisible = true;
+        _scheduleOverlayHide(VideoTimingConstants.overlayQuickHide);
+      }
+    }
+  }
+
+  @override
+  @action
+  Future<void> handleRefresh() => _handleRefresh(userInitiated: true);
+
+  Future<void> _handleRefresh({required bool userInitiated}) {
+    // Auto-recovery must never resume a stream the user paused — park the
+    // refresh until they tap play (handlePausePlay consumes the flag). The
+    // error paths set the flag themselves to preserve attempt counters;
+    // this guard covers every other producer (e.g. the init-retry timer).
+    if (!userInitiated && _userPaused) {
+      _pendingRefreshOnResume = true;
+      return Future<void>.value();
+    }
+
+    if (userInitiated) HapticFeedback.lightImpact();
+
+    final wasControllerInitialized = _controllerInitialized;
+    runInAction(() {
+      // Reset recovery cap, cooldown, and bounce counter on user-initiated
+      // refresh (error was shown). Stall recovery calls this with
+      // _error == null, preserving the cap.
+      if (userInitiated && _error != null) {
+        _totalRefreshAttempts = 0;
+        _shortPlayBounceCount = 0;
+      }
+      _lastRefreshTime = DateTime.now();
+      // PiP state is preserved here: the light path reuses the controller
+      // (flags must stay in sync with the native player) and the hard path
+      // resets it via _disposeController below. _highLatencyCount survives
+      // so the latency-recovery cap can stop a persistent loop; it resets
+      // on the next healthy reading.
+      _resetPlayerStateCommon(
+        preservePipState: true,
+        preserveHighLatencyCount: true,
+      );
+      _loading = true;
+      _initializing = true;
+      _initGeneration++;
+
+      _overlayTimer?.cancel();
+      _scheduleOverlayHide();
+      _latencyTimer?.cancel();
+      _stallRecoveryTimer?.cancel();
+      _initRetryTimer?.cancel();
+      _healthyPlaybackTimer?.cancel();
+
+      if (wasControllerInitialized) return;
+
+      // Hard refresh: controller isn't ready (init in progress or failed).
+      // Tear down and rebuild from scratch.
+      _isInPipMode = false;
+      _lastPipWasAutomatic = false;
+      _manualPipRequested = false;
+      _overlayWasVisibleBeforePip = true;
+      _disposeController();
+      _controller = _createController();
+    });
+
+    if (wasControllerInitialized) {
+      // Light refresh: reload stream on existing controller. PiP state is
+      // intentionally preserved — the controller is reused, so its observable
+      // PiP flags must stay in sync with the native player.
+      unawaited(_reloadCurrentController());
+    } else {
+      unawaited(_initPlayer());
+    }
+    unawaited(updateStreamInfo());
+    return Future<void>.value();
+  }
+
+  @override
+  void requestPictureInPicture() {
+    if (Platform.isAndroid) {
+      // autoEnter for future background transitions is managed by the showVideo
+      // reaction (setAutoPipMode) — don't also pass it here.
+      _pip.enterPipMode();
+    } else {
+      // Skip manual PiP if the last session was auto-triggered (swipe gesture).
+      // Entering manual PiP right after auto-PiP causes gray window artifacts
+      // because the two PiP systems (AVPlayerViewController vs custom controller)
+      // conflict on the same player.
+      if (_lastPipWasAutomatic) return;
+      _manualPipRequested = true;
+      _controller?.enterPictureInPicture();
+    }
+  }
+
+  @override
+  @action
+  void togglePictureInPicture() {
+    if (_isInPipMode) {
+      // iOS has a programmatic exit; Android does not — the user must close
+      // the PiP window themselves, so the toggle is a no-op there.
+      if (Platform.isIOS) _controller?.exitPictureInPicture();
+      return;
+    }
+    requestPictureInPicture();
+  }
+
+  @override
+  @action
+  Future<void> updateStreamQualities() async {
+    // Qualities are populated automatically via qualitiesStream.
+  }
+
+  @override
+  @action
+  Future<void> setStreamQuality(String quality) async {
+    final index = _availableStreamQualities.indexOf(quality);
+    if (index == -1) return;
+    await _setStreamQualityIndex(index);
+  }
+
+  @action
+  Future<void> _setStreamQualityIndex(int index) async {
+    _streamQualityIndex = index;
+    final controller = _controller;
+    if (controller == null) return;
+
+    _isQualitySwitching = true;
+    // A resolution-only switch never interrupts playback, so no play/pause
+    // event arrives to clear the flag — expire it after a grace window or
+    // it sticks for the session and disables stall classification.
+    _qualitySwitchGraceTimer?.cancel();
+    _qualitySwitchGraceTimer = Timer(
+      VideoTimingConstants.qualitySwitchGrace,
+      () {
+        if (_disposed) return;
+        runInAction(() => _isQualitySwitching = false);
+      },
+    );
+
+    if (index == 0) {
+      // 'Auto' — reset to adaptive quality
+      await controller.setQuality(NativeVideoPlayerQuality.auto());
+    } else {
+      final qualityIndex = index - 1;
+      if (qualityIndex >= 0 && qualityIndex < _qualityObjects.length) {
+        await controller.setQuality(_qualityObjects[qualityIndex]);
+      }
+    }
+
+    // The controller can be disposed or replaced during the platform call
+    // (user backs out, chat-only toggle, media services reset).
+    if (_disposed || !identical(controller, _controller)) return;
+
+    // Toggle background PiP based on audio-only mode.
+    // Only call when the mode actually changes to avoid unnecessary
+    // method channel round-trips on every quality switch.
+    final quality = index == 0
+        ? null
+        : _qualityObjects.elementAtOrNull(index - 1);
+    final isAudioOnly =
+        quality != null && quality.width == 0 && quality.height == 0;
+    if (isAudioOnly != _isAudioOnlyMode) {
+      _isAudioOnlyMode = isAudioOnly;
+      if (Platform.isIOS) {
+        if (isAudioOnly) {
+          controller.disableAutomaticInlinePip();
+        } else {
+          controller.enableAutomaticInlinePip();
+        }
+      } else if (Platform.isAndroid && _autoPipAvailable == true) {
+        if (isAudioOnly) {
+          _pip.setAutoPipMode(autoEnter: false);
+        } else if (settingsStore.showVideo) {
+          _pip.setAutoPipMode();
+        }
+      }
+    }
+  }
+
+  void _queueOrApplyInitialQualityIndex(int index) {
+    if (_hasPlayedOnce) {
+      unawaited(_setStreamQualityIndex(index));
+    } else {
+      _pendingQualityIndex = index;
+    }
+  }
+
+  @override
+  @action
+  Future<void> updateStreamInfo({bool forceUpdate = false}) async {
+    final result = await _streamInfoPoller.fetch(forceUpdate: forceUpdate);
+    if (_disposed || result == null) return;
+    runInAction(() {
+      if (result.stream != null) {
+        _streamInfo = result.stream;
+        _offlineChannelInfo = null;
+        return;
+      }
+      if (result.offlineChannel == null) {
+        return;
+      }
+      _overlayTimer?.cancel();
+      _latencyTimer?.cancel();
+      _stallRecoveryTimer?.cancel();
+      _healthyPlaybackTimer?.cancel();
+      _loading = false;
+      _latency = null;
+      _streamInfo = null;
+      _offlineChannelInfo = result.offlineChannel;
+      // Confirmed offline (transient errors returned above) — flush the
+      // chat delay since there's no video to sync against.
+      _chatLatencySync.reset();
+    });
+  }
+
+  @override
+  @action
+  void handleAppResume() {
+    if (_isInPipMode) return;
+    _highLatencyCount = 0;
+    updateStreamInfo(forceUpdate: true);
+
+    if (_userPaused || _initializing) return;
+
+    // After screen-off / a network drop the native player is often in an
+    // error state (ExoPlayer "Source error"). play() alone cannot revive a
+    // dead session — refresh like the Reload button would.
+    if (_error != null ||
+        _pendingRefreshOnResume ||
+        _controller == null ||
+        !_controllerInitialized) {
+      _pendingRefreshOnResume = false;
+      unawaited(_handleRefresh(userInitiated: false));
+      return;
+    }
+
+    _controller!.play();
+  }
+
+  @override
+  @action
+  void handleAndroidPipChanged(bool isInPip) => _setPipActive(isInPip);
+
+  /// Shared PiP enter/exit overlay state machine, driven by the Android
+  /// activity callback and the iOS controller's PiP stream.
+  void _setPipActive(bool isInPip) {
+    if (isInPip && !_isInPipMode) {
+      _overlayWasVisibleBeforePip = _overlayVisible;
+      _isInPipMode = true;
+      _overlayTimer?.cancel();
+      _overlayVisible = true;
+    } else if (!isInPip && _isInPipMode) {
+      _isInPipMode = false;
+      if (_overlayWasVisibleBeforePip) {
+        _scheduleOverlayHide();
+      } else {
+        _overlayVisible = false;
+      }
+    }
+  }
+
+  @override
+  @action
+  void dispose() {
+    _disposed = true;
+
+    if (Platform.isAndroid && _autoPipAvailable == true) {
+      _pip.setAutoPipMode(autoEnter: false);
+    }
+
+    _overlayTimer?.cancel();
+    _stopStreamInfoTimer();
+    _disposeAndroidAutoPipReaction?.call();
+    _disposeVideoModeReaction?.call();
+    _disposeController();
+  }
+
+  /// Tears down the native player and all of its observers. Releases the
+  /// `AVPlayer`, deactivates the audio session (when this is the last player
+  /// alive), and stops the PiP controller. Safe to call when no controller
+  /// has been created.
+  void _disposeController() {
+    _latencyTimer?.cancel();
+    _stallRecoveryTimer?.cancel();
+    _initRetryTimer?.cancel();
+    _healthyPlaybackTimer?.cancel();
+    _qualitySwitchGraceTimer?.cancel();
+    _pipSub?.cancel();
+    _pipSub = null;
+    _qualitiesSub?.cancel();
+    _qualitiesSub = null;
+    _adBreakSub?.cancel();
+    _adBreakSub = null;
+    _controller?.removeActivityListener(_onPlayerActivity);
+    _controller?.dispose();
+    _controller = null;
+    _controllerInitialized = false;
+    _initInFlight = false;
+    _initGeneration++;
+  }
+
+  /// Resets the observable fields that have the same target value across
+  /// "torn down for chat-only" and "fresh controller about to load". Caller
+  /// sets the few fields that differ (`_loading`, `_initializing`).
+  void _resetPlayerStateCommon({
+    bool preservePipState = false,
+    bool preserveHighLatencyCount = false,
+  }) {
+    _hasPlayedOnce = false;
+    _userPaused = false;
+    _pendingRefreshOnResume = false;
+    _paused = true;
+    _isStalled = false;
+    _isAdBreakActive = false;
+    _usingAdBackup = false;
+    _blockingAds = false;
+    _adSwapInFlight = false;
+    _restrictedStreamQualities = [];
+    _isQualitySwitching = false;
+    _isAudioOnlyMode = false;
+    _stallRecoveryAttempt = 0;
+    if (!preserveHighLatencyCount) _highLatencyCount = 0;
+    _firstTimeSettingQuality = true;
+    _pendingQualityIndex = null;
+    _streamQualityIndex = 0;
+    _availableStreamQualities = [];
+    _qualityObjects = [];
+    _latency = null;
+    _error = null;
+    if (!preservePipState) {
+      _isInPipMode = false;
+      _lastPipWasAutomatic = false;
+      _manualPipRequested = false;
+      _overlayWasVisibleBeforePip = true;
+    }
+  }
+
+  /// Resets observable display state after [_disposeController] so the UI
+  /// reflects "no active player". Called only when entering chat-only mode;
+  /// final disposal skips this since the store is being torn down.
+  @action
+  void _resetPlayerStateForChatOnly() {
+    _resetPlayerStateCommon();
+    _loading = false;
+    _initializing = false;
+    _chatLatencySync.reset();
+  }
+
+  /// Builds a brand new controller and kicks off `_initPlayer`. Used when
+  /// the user toggles back to video mode after a chat-only stretch.
+  @action
+  void _initFreshController() {
+    _resetPlayerStateCommon();
+    _loading = true;
+    _initializing = true;
+    _controller = _createController();
+    _initPlayer();
+  }
+}
diff --git a/lib/screens/channel/video/native_video_store.g.dart b/lib/screens/channel/video/native_video_store.g.dart
new file mode 100644
index 00000000..afce5344
--- /dev/null
+++ b/lib/screens/channel/video/native_video_store.g.dart
@@ -0,0 +1,517 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'native_video_store.dart';
+
+// **************************************************************************
+// StoreGenerator
+// **************************************************************************
+
+// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
+
+mixin _$NativeVideoStore on NativeVideoStoreBase, Store {
+  Computed<String>? _$streamQualityComputed;
+
+  @override
+  String get streamQuality => (_$streamQualityComputed ??= Computed<String>(
+    () => super.streamQuality,
+    name: 'NativeVideoStoreBase.streamQuality',
+  )).value;
+
+  late final _$_controllerAtom = Atom(
+    name: 'NativeVideoStoreBase._controller',
+    context: context,
+  );
+
+  NativeVideoPlayerController? get controller {
+    _$_controllerAtom.reportRead();
+    return super._controller;
+  }
+
+  @override
+  NativeVideoPlayerController? get _controller => controller;
+
+  @override
+  set _controller(NativeVideoPlayerController? value) {
+    _$_controllerAtom.reportWrite(value, super._controller, () {
+      super._controller = value;
+    });
+  }
+
+  late final _$_loadingAtom = Atom(
+    name: 'NativeVideoStoreBase._loading',
+    context: context,
+  );
+
+  bool get loading {
+    _$_loadingAtom.reportRead();
+    return super._loading;
+  }
+
+  @override
+  bool get _loading => loading;
+
+  @override
+  set _loading(bool value) {
+    _$_loadingAtom.reportWrite(value, super._loading, () {
+      super._loading = value;
+    });
+  }
+
+  late final _$_blockingAdsAtom = Atom(
+    name: 'NativeVideoStoreBase._blockingAds',
+    context: context,
+  );
+
+  bool get blockingAds {
+    _$_blockingAdsAtom.reportRead();
+    return super._blockingAds;
+  }
+
+  @override
+  bool get _blockingAds => blockingAds;
+
+  @override
+  set _blockingAds(bool value) {
+    _$_blockingAdsAtom.reportWrite(value, super._blockingAds, () {
+      super._blockingAds = value;
+    });
+  }
+
+  late final _$_pausedAtom = Atom(
+    name: 'NativeVideoStoreBase._paused',
+    context: context,
+  );
+
+  bool get paused {
+    _$_pausedAtom.reportRead();
+    return super._paused;
+  }
+
+  @override
+  bool get _paused => paused;
+
+  @override
+  set _paused(bool value) {
+    _$_pausedAtom.reportWrite(value, super._paused, () {
+      super._paused = value;
+    });
+  }
+
+  late final _$_hasPlayedOnceAtom = Atom(
+    name: 'NativeVideoStoreBase._hasPlayedOnce',
+    context: context,
+  );
+
+  bool get hasPlayedOnce {
+    _$_hasPlayedOnceAtom.reportRead();
+    return super._hasPlayedOnce;
+  }
+
+  @override
+  bool get _hasPlayedOnce => hasPlayedOnce;
+
+  @override
+  set _hasPlayedOnce(bool value) {
+    _$_hasPlayedOnceAtom.reportWrite(value, super._hasPlayedOnce, () {
+      super._hasPlayedOnce = value;
+    });
+  }
+
+  late final _$_overlayVisibleAtom = Atom(
+    name: 'NativeVideoStoreBase._overlayVisible',
+    context: context,
+  );
+
+  bool get overlayVisible {
+    _$_overlayVisibleAtom.reportRead();
+    return super._overlayVisible;
+  }
+
+  @override
+  bool get _overlayVisible => overlayVisible;
+
+  @override
+  set _overlayVisible(bool value) {
+    _$_overlayVisibleAtom.reportWrite(value, super._overlayVisible, () {
+      super._overlayVisible = value;
+    });
+  }
+
+  late final _$_streamInfoAtom = Atom(
+    name: 'NativeVideoStoreBase._streamInfo',
+    context: context,
+  );
+
+  StreamTwitch? get streamInfo {
+    _$_streamInfoAtom.reportRead();
+    return super._streamInfo;
+  }
+
+  @override
+  StreamTwitch? get _streamInfo => streamInfo;
+
+  @override
+  set _streamInfo(StreamTwitch? value) {
+    _$_streamInfoAtom.reportWrite(value, super._streamInfo, () {
+      super._streamInfo = value;
+    });
+  }
+
+  late final _$_offlineChannelInfoAtom = Atom(
+    name: 'NativeVideoStoreBase._offlineChannelInfo',
+    context: context,
+  );
+
+  Channel? get offlineChannelInfo {
+    _$_offlineChannelInfoAtom.reportRead();
+    return super._offlineChannelInfo;
+  }
+
+  @override
+  Channel? get _offlineChannelInfo => offlineChannelInfo;
+
+  @override
+  set _offlineChannelInfo(Channel? value) {
+    _$_offlineChannelInfoAtom.reportWrite(value, super._offlineChannelInfo, () {
+      super._offlineChannelInfo = value;
+    });
+  }
+
+  late final _$_availableStreamQualitiesAtom = Atom(
+    name: 'NativeVideoStoreBase._availableStreamQualities',
+    context: context,
+  );
+
+  List<String> get availableStreamQualities {
+    _$_availableStreamQualitiesAtom.reportRead();
+    return super._availableStreamQualities;
+  }
+
+  @override
+  List<String> get _availableStreamQualities => availableStreamQualities;
+
+  @override
+  set _availableStreamQualities(List<String> value) {
+    _$_availableStreamQualitiesAtom.reportWrite(
+      value,
+      super._availableStreamQualities,
+      () {
+        super._availableStreamQualities = value;
+      },
+    );
+  }
+
+  late final _$_restrictedStreamQualitiesAtom = Atom(
+    name: 'NativeVideoStoreBase._restrictedStreamQualities',
+    context: context,
+  );
+
+  List<String> get restrictedStreamQualities {
+    _$_restrictedStreamQualitiesAtom.reportRead();
+    return super._restrictedStreamQualities;
+  }
+
+  @override
+  List<String> get _restrictedStreamQualities => restrictedStreamQualities;
+
+  @override
+  set _restrictedStreamQualities(List<String> value) {
+    _$_restrictedStreamQualitiesAtom.reportWrite(
+      value,
+      super._restrictedStreamQualities,
+      () {
+        super._restrictedStreamQualities = value;
+      },
+    );
+  }
+
+  late final _$_streamQualityIndexAtom = Atom(
+    name: 'NativeVideoStoreBase._streamQualityIndex',
+    context: context,
+  );
+
+  int get streamQualityIndex {
+    _$_streamQualityIndexAtom.reportRead();
+    return super._streamQualityIndex;
+  }
+
+  @override
+  int get _streamQualityIndex => streamQualityIndex;
+
+  @override
+  set _streamQualityIndex(int value) {
+    _$_streamQualityIndexAtom.reportWrite(value, super._streamQualityIndex, () {
+      super._streamQualityIndex = value;
+    });
+  }
+
+  late final _$_latencyAtom = Atom(
+    name: 'NativeVideoStoreBase._latency',
+    context: context,
+  );
+
+  String? get latency {
+    _$_latencyAtom.reportRead();
+    return super._latency;
+  }
+
+  @override
+  String? get _latency => latency;
+
+  @override
+  set _latency(String? value) {
+    _$_latencyAtom.reportWrite(value, super._latency, () {
+      super._latency = value;
+    });
+  }
+
+  late final _$_isInPipModeAtom = Atom(
+    name: 'NativeVideoStoreBase._isInPipMode',
+    context: context,
+  );
+
+  bool get isInPipMode {
+    _$_isInPipModeAtom.reportRead();
+    return super._isInPipMode;
+  }
+
+  @override
+  bool get _isInPipMode => isInPipMode;
+
+  @override
+  set _isInPipMode(bool value) {
+    _$_isInPipModeAtom.reportWrite(value, super._isInPipMode, () {
+      super._isInPipMode = value;
+    });
+  }
+
+  late final _$_isAudioOnlyModeAtom = Atom(
+    name: 'NativeVideoStoreBase._isAudioOnlyMode',
+    context: context,
+  );
+
+  bool get isAudioOnlyMode {
+    _$_isAudioOnlyModeAtom.reportRead();
+    return super._isAudioOnlyMode;
+  }
+
+  @override
+  bool get _isAudioOnlyMode => isAudioOnlyMode;
+
+  @override
+  set _isAudioOnlyMode(bool value) {
+    _$_isAudioOnlyModeAtom.reportWrite(value, super._isAudioOnlyMode, () {
+      super._isAudioOnlyMode = value;
+    });
+  }
+
+  late final _$_errorAtom = Atom(
+    name: 'NativeVideoStoreBase._error',
+    context: context,
+  );
+
+  String? get error {
+    _$_errorAtom.reportRead();
+    return super._error;
+  }
+
+  @override
+  String? get _error => error;
+
+  @override
+  set _error(String? value) {
+    _$_errorAtom.reportWrite(value, super._error, () {
+      super._error = value;
+    });
+  }
+
+  late final _$_initPlayerAsyncAction = AsyncAction(
+    'NativeVideoStoreBase._initPlayer',
+    context: context,
+  );
+
+  @override
+  Future<void> _initPlayer() {
+    return _$_initPlayerAsyncAction.run(() => super._initPlayer());
+  }
+
+  late final _$updateStreamQualitiesAsyncAction = AsyncAction(
+    'NativeVideoStoreBase.updateStreamQualities',
+    context: context,
+  );
+
+  @override
+  Future<void> updateStreamQualities() {
+    return _$updateStreamQualitiesAsyncAction.run(
+      () => super.updateStreamQualities(),
+    );
+  }
+
+  late final _$setStreamQualityAsyncAction = AsyncAction(
+    'NativeVideoStoreBase.setStreamQuality',
+    context: context,
+  );
+
+  @override
+  Future<void> setStreamQuality(String quality) {
+    return _$setStreamQualityAsyncAction.run(
+      () => super.setStreamQuality(quality),
+    );
+  }
+
+  late final _$_setStreamQualityIndexAsyncAction = AsyncAction(
+    'NativeVideoStoreBase._setStreamQualityIndex',
+    context: context,
+  );
+
+  @override
+  Future<void> _setStreamQualityIndex(int index) {
+    return _$_setStreamQualityIndexAsyncAction.run(
+      () => super._setStreamQualityIndex(index),
+    );
+  }
+
+  late final _$updateStreamInfoAsyncAction = AsyncAction(
+    'NativeVideoStoreBase.updateStreamInfo',
+    context: context,
+  );
+
+  @override
+  Future<void> updateStreamInfo({bool forceUpdate = false}) {
+    return _$updateStreamInfoAsyncAction.run(
+      () => super.updateStreamInfo(forceUpdate: forceUpdate),
+    );
+  }
+
+  late final _$NativeVideoStoreBaseActionController = ActionController(
+    name: 'NativeVideoStoreBase',
+    context: context,
+  );
+
+  @override
+  Future<void> _reloadCurrentController() {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase._reloadCurrentController',
+    );
+    try {
+      return super._reloadCurrentController();
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void handleVideoTap() {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase.handleVideoTap',
+    );
+    try {
+      return super.handleVideoTap();
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void handleToggleOverlay() {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase.handleToggleOverlay',
+    );
+    try {
+      return super.handleToggleOverlay();
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  Future<void> handleRefresh() {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase.handleRefresh',
+    );
+    try {
+      return super.handleRefresh();
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void togglePictureInPicture() {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase.togglePictureInPicture',
+    );
+    try {
+      return super.togglePictureInPicture();
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void handleAppResume() {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase.handleAppResume',
+    );
+    try {
+      return super.handleAppResume();
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void handleAndroidPipChanged(bool isInPip) {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase.handleAndroidPipChanged',
+    );
+    try {
+      return super.handleAndroidPipChanged(isInPip);
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void dispose() {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase.dispose',
+    );
+    try {
+      return super.dispose();
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void _resetPlayerStateForChatOnly() {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase._resetPlayerStateForChatOnly',
+    );
+    try {
+      return super._resetPlayerStateForChatOnly();
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void _initFreshController() {
+    final _$actionInfo = _$NativeVideoStoreBaseActionController.startAction(
+      name: 'NativeVideoStoreBase._initFreshController',
+    );
+    try {
+      return super._initFreshController();
+    } finally {
+      _$NativeVideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  String toString() {
+    return '''
+streamQuality: ${streamQuality}
+    ''';
+  }
+}
diff --git a/lib/screens/channel/video/playback_error_recovery.dart b/lib/screens/channel/video/playback_error_recovery.dart
new file mode 100644
index 00000000..72b83815
--- /dev/null
+++ b/lib/screens/channel/video/playback_error_recovery.dart
@@ -0,0 +1,27 @@
+import 'package:frosty/screens/channel/video/video_timing_constants.dart';
+
+/// Whether [NativeVideoStore] should auto-refresh after a mid-stream player
+/// error instead of pinning the Reload overlay.
+///
+/// ExoPlayer's "Source error" (screen-off / network switch) arrives without a
+/// status code, so callers must not rely on 4xx alone. [mediaServicesWereReset]
+/// has its own dispose+rebuild path and is excluded here.
+bool shouldAutoRecoverFromPlayerError({
+  required bool refreshCapReached,
+  String? errorCode,
+}) {
+  if (refreshCapReached) return false;
+  if (errorCode == 'mediaServicesWereReset') return false;
+  return true;
+}
+
+/// Delay before an automatic refresh for [statusCode].
+///
+/// Token/CDN 4xx can refresh immediately; network/source failures get a short
+/// pause so the interface can come back after a switch or screen wake.
+Duration playerErrorRetryDelay({int? statusCode}) {
+  if (statusCode != null && statusCode >= 400 && statusCode < 500) {
+    return Duration.zero;
+  }
+  return VideoTimingConstants.initRetryDelay;
+}
diff --git a/lib/screens/channel/video/stream_info_bar.dart b/lib/screens/channel/video/stream_info_bar.dart
new file mode 100644
index 00000000..580acfd0
--- /dev/null
+++ b/lib/screens/channel/video/stream_info_bar.dart
@@ -0,0 +1,337 @@
+import 'package:flutter/material.dart';
+import 'package:frosty/models/channel.dart';
+import 'package:frosty/models/stream.dart';
+import 'package:frosty/screens/home/top/categories/category_streams.dart';
+import 'package:frosty/theme.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/widgets/live_indicator.dart';
+import 'package:frosty/widgets/profile_picture.dart';
+import 'package:frosty/widgets/uptime.dart';
+import 'package:intl/intl.dart';
+
+class StreamInfoBar extends StatelessWidget {
+  final StreamTwitch? streamInfo;
+  final Channel? offlineChannelInfo;
+  final bool showCategory;
+  final bool tappableCategory;
+  final bool showUptime;
+  final bool showViewerCount;
+  final bool showOfflineIndicator;
+  final EdgeInsets padding;
+  final TooltipTriggerMode tooltipTriggerMode;
+  final Color? textColor;
+  final bool isCompact;
+  final bool isInSharedChatMode;
+  final bool isOffline;
+  final bool showTextShadows;
+  final String? displayName;
+
+  const StreamInfoBar({
+    super.key,
+    this.streamInfo,
+    this.offlineChannelInfo,
+    this.showCategory = true,
+    this.tappableCategory = true,
+    this.showUptime = true,
+    this.showViewerCount = true,
+    this.showOfflineIndicator = true,
+    this.padding = EdgeInsets.zero,
+    this.tooltipTriggerMode = TooltipTriggerMode.tap,
+    this.textColor,
+    this.isCompact = false,
+    this.isInSharedChatMode = false,
+    this.isOffline = false,
+    this.showTextShadows = true,
+    this.displayName,
+  });
+
+
+  TextStyle _getBaseTextStyle(
+    BuildContext context,
+    double fontSize,
+    FontWeight fontWeight,
+  ) {
+    return context.textTheme.bodyMedium?.copyWith(
+          fontSize: fontSize,
+          fontWeight: fontWeight,
+          color: textColor,
+          shadows: showTextShadows ? kOverlayShadow : null,
+        ) ??
+        const TextStyle();
+  }
+
+  TextStyle _getSecondaryTextStyle(BuildContext context, double fontSize) {
+    return context.textTheme.bodyMedium?.copyWith(
+          fontSize: fontSize,
+          fontWeight: FontWeight.w500,
+          color:
+              textColor?.withValues(alpha: 0.7) ??
+              context.bodySmallColor?.withValues(alpha: 0.7),
+          shadows: showTextShadows ? kOverlayShadow : null,
+        ) ??
+        const TextStyle();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final streamTitle = isOffline
+        ? (offlineChannelInfo?.title.trim() ?? '')
+        : (streamInfo?.title.trim() ?? '');
+    final streamerName = isOffline
+        ? getReadableName(
+            offlineChannelInfo?.broadcasterName.isNotEmpty == true
+                ? offlineChannelInfo?.broadcasterName ?? ''
+                : displayName ?? '',
+            offlineChannelInfo?.broadcasterLogin ?? '',
+          )
+        : getReadableName(
+            streamInfo?.userName ?? '',
+            streamInfo?.userLogin ?? '',
+          );
+    final secondLineSize = isCompact ? 13.0 : 14.0;
+
+    return Padding(
+      padding: padding,
+      child: Row(
+        spacing: 8,
+        children: [
+          Container(
+            decoration: isInSharedChatMode
+                ? BoxDecoration(
+                    shape: BoxShape.circle,
+                    border: Border.all(
+                      color: Theme.of(context).colorScheme.primary,
+                      width: 2,
+                    ),
+                  )
+                : null,
+            child: Padding(
+              padding: isInSharedChatMode
+                  ? const EdgeInsets.all(1.5)
+                  : EdgeInsets.zero,
+              child: ProfilePicture(
+                userLogin: isOffline
+                    ? (offlineChannelInfo?.broadcasterLogin.isNotEmpty == true
+                          ? offlineChannelInfo?.broadcasterLogin ?? ''
+                          : displayName ?? '')
+                    : (streamInfo?.userLogin ?? ''),
+                radius: 16,
+              ),
+            ),
+          ),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                // Top row: Streamer name + stream title
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.baseline,
+                  textBaseline: TextBaseline.alphabetic,
+                  spacing: 4,
+                  children: [
+                    Tooltip(
+                      message: streamerName,
+                      triggerMode: tooltipTriggerMode,
+                      child: Text(
+                        streamerName,
+                        style: _getBaseTextStyle(context, 14, FontWeight.w600),
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    if (streamTitle.isNotEmpty) ...[
+                      Flexible(
+                        child: Tooltip(
+                          message: streamTitle,
+                          triggerMode: tooltipTriggerMode,
+                          child: Text(
+                            streamTitle,
+                            style: _getSecondaryTextStyle(context, 14),
+                            overflow: TextOverflow.ellipsis,
+                            maxLines: 1,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ],
+                ),
+                // Bottom row: Live indicator, uptime, viewer count, game name or Offline text
+                if (isOffline ||
+                    (!isOffline && showUptime) ||
+                    (!isOffline && showViewerCount) ||
+                    (showCategory &&
+                        (isOffline
+                            ? (offlineChannelInfo?.gameName.isNotEmpty ?? false)
+                            : (streamInfo?.gameName.isNotEmpty ?? false)))) ...[
+                  Row(
+                    children: [
+                      if (isOffline && showOfflineIndicator) ...[
+                        Text(
+                          'Offline',
+                          style: _getSecondaryTextStyle(
+                            context,
+                            secondLineSize,
+                          ),
+                        ),
+                      ],
+                      if (isOffline &&
+                          showCategory &&
+                          (offlineChannelInfo?.gameName.isNotEmpty ??
+                              false)) ...[
+                        if (showOfflineIndicator) const SizedBox(width: 8),
+                        Icon(
+                          Icons.gamepad,
+                          size: secondLineSize,
+                          color: (textColor ?? context.bodySmallColor)
+                              ?.withValues(alpha: 0.7),
+                          shadows: kOverlayShadow,
+                        ),
+                        const SizedBox(width: 4),
+                        Flexible(
+                          child: Tooltip(
+                            message: offlineChannelInfo?.gameName ?? '',
+                            triggerMode: tooltipTriggerMode,
+                            child: tappableCategory
+                                ? GestureDetector(
+                                    onDoubleTap: () {
+                                      if (offlineChannelInfo
+                                              ?.gameId
+                                              .isNotEmpty ??
+                                          false) {
+                                        Navigator.push(
+                                          context,
+                                          MaterialPageRoute(
+                                            settings: const RouteSettings(name: CategoryStreams.routeName),
+                                            builder: (context) =>
+                                                CategoryStreams(
+                                                  categoryId:
+                                                      offlineChannelInfo
+                                                          ?.gameId ??
+                                                      '',
+                                                ),
+                                          ),
+                                        );
+                                      }
+                                    },
+                                    child: Text(
+                                      offlineChannelInfo?.gameName ?? '',
+                                      style: _getSecondaryTextStyle(
+                                        context,
+                                        secondLineSize,
+                                      ),
+                                      overflow: TextOverflow.ellipsis,
+                                    ),
+                                  )
+                                : Text(
+                                    offlineChannelInfo?.gameName ?? '',
+                                    style: _getSecondaryTextStyle(
+                                      context,
+                                      secondLineSize,
+                                    ),
+                                    overflow: TextOverflow.ellipsis,
+                                  ),
+                          ),
+                        ),
+                      ] else ...[
+                        if (!isOffline && (showUptime || showViewerCount)) ...[
+                          const LiveIndicator(),
+                          const SizedBox(width: 6),
+                        ],
+                        if (!isOffline && showUptime) ...[
+                          Uptime(
+                            startTime:
+                                streamInfo?.startedAt ??
+                                DateTime.now().toIso8601String(),
+                            style: _getBaseTextStyle(
+                              context,
+                              secondLineSize,
+                              FontWeight.w500,
+                            ),
+                          ),
+                          if (!isOffline && showViewerCount)
+                            const SizedBox(width: 8),
+                        ],
+                        if (!isOffline && showViewerCount) ...[
+                          Icon(
+                            Icons.visibility,
+                            size: secondLineSize,
+                            color: textColor ?? context.bodySmallColor,
+                            shadows: kOverlayShadow,
+                          ),
+                          const SizedBox(width: 4),
+                          Text(
+                            NumberFormat().format(streamInfo?.viewerCount ?? 0),
+                            style: _getBaseTextStyle(
+                              context,
+                              secondLineSize,
+                              FontWeight.w500,
+                            ),
+                          ),
+                        ],
+                        if (!isOffline &&
+                            showCategory &&
+                            (streamInfo?.gameName.isNotEmpty ?? false) &&
+                            (showUptime || showViewerCount)) ...[
+                          const SizedBox(width: 8),
+                        ],
+                        if (!isOffline &&
+                            showCategory &&
+                            (streamInfo?.gameName.isNotEmpty ?? false)) ...[
+                          Icon(
+                            Icons.gamepad,
+                            size: secondLineSize,
+                            color: textColor ?? context.bodySmallColor,
+                            shadows: kOverlayShadow,
+                          ),
+                          const SizedBox(width: 4),
+                          Flexible(
+                            child: Tooltip(
+                              message: streamInfo?.gameName ?? '',
+                              triggerMode: tooltipTriggerMode,
+                              child: tappableCategory
+                                  ? GestureDetector(
+                                      onDoubleTap: () => Navigator.push(
+                                        context,
+                                        MaterialPageRoute(
+                                          settings: const RouteSettings(name: CategoryStreams.routeName),
+                                          builder: (context) => CategoryStreams(
+                                            categoryId:
+                                                streamInfo?.gameId ?? '',
+                                          ),
+                                        ),
+                                      ),
+                                      child: Text(
+                                        streamInfo?.gameName ?? '',
+                                        style: _getBaseTextStyle(
+                                          context,
+                                          secondLineSize,
+                                          FontWeight.w500,
+                                        ),
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                    )
+                                  : Text(
+                                      streamInfo?.gameName ?? '',
+                                      style: _getBaseTextStyle(
+                                        context,
+                                        secondLineSize,
+                                        FontWeight.w500,
+                                      ),
+                                      overflow: TextOverflow.ellipsis,
+                                    ),
+                            ),
+                          ),
+                        ],
+                      ],
+                    ],
+                  ),
+                ],
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/screens/channel/video/stream_info_poller.dart b/lib/screens/channel/video/stream_info_poller.dart
new file mode 100644
index 00000000..5917ffed
--- /dev/null
+++ b/lib/screens/channel/video/stream_info_poller.dart
@@ -0,0 +1,86 @@
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/models/channel.dart';
+import 'package:frosty/models/stream.dart';
+import 'package:frosty/screens/channel/video/video_timing_constants.dart';
+
+/// Snapshot of a channel's live state.
+class StreamInfoResult {
+  const StreamInfoResult({this.stream, this.offlineChannel});
+
+  /// Non-null when the channel is currently live.
+  final StreamTwitch? stream;
+
+  /// Non-null when the channel is confirmed offline (channel metadata fetched
+  /// successfully but no live stream). Both fields null means the fetch
+  /// failed entirely (network error, etc.).
+  final Channel? offlineChannel;
+}
+
+/// Debounced, deduplicated Twitch stream-info fetcher shared by both video
+/// stores. Each store still owns its observable `_streamInfo` /
+/// `_offlineChannelInfo` fields and decides how to react to the result.
+class StreamInfoPoller {
+  StreamInfoPoller({
+    required this.twitchApi,
+    required this.userLogin,
+    required this.userId,
+  });
+
+  final TwitchApi twitchApi;
+  final String userLogin;
+  final String userId;
+
+  DateTime? _lastUpdate;
+  Future<StreamInfoResult>? _inFlight;
+
+  /// Fetches the latest stream info, returning `null` if the call was
+  /// debounced (caller should skip updating state). Concurrent calls await
+  /// the in-flight request instead of issuing a new one.
+  Future<StreamInfoResult?> fetch({bool forceUpdate = false}) async {
+    final pending = _inFlight;
+    if (pending != null) return pending;
+
+    final now = DateTime.now();
+    if (!forceUpdate && _lastUpdate != null) {
+      if (now.difference(_lastUpdate!) <
+          VideoTimingConstants.streamInfoDebounce) {
+        return null;
+      }
+    }
+
+    _lastUpdate = now;
+    final request = _runFetch();
+    _inFlight = request;
+    try {
+      return await request;
+    } finally {
+      if (identical(_inFlight, request)) _inFlight = null;
+    }
+  }
+
+  Future<StreamInfoResult> _runFetch() async {
+    try {
+      final info = await twitchApi.getStream(userLogin: userLogin);
+      return StreamInfoResult(stream: info);
+    } catch (_) {
+      // Helix can transiently drop a live stream from /streams (or 500 on
+      // one endpoint while others succeed). A false "confirmed offline"
+      // tears down latency polling and chat delay on healthy playback, so
+      // require a second failed check before falling back to /channels.
+      try {
+        await Future<void>.delayed(
+          VideoTimingConstants.offlineConfirmationDelay,
+        );
+        final info = await twitchApi.getStream(userLogin: userLogin);
+        return StreamInfoResult(stream: info);
+      } catch (_) {
+        try {
+          final channel = await twitchApi.getChannel(userId: userId);
+          return StreamInfoResult(offlineChannel: channel);
+        } catch (_) {
+          return const StreamInfoResult();
+        }
+      }
+    }
+  }
+}
diff --git a/lib/screens/channel/video/video.dart b/lib/screens/channel/video/video.dart
index 60ff16ce..fa9cc703 100644
--- a/lib/screens/channel/video/video.dart
+++ b/lib/screens/channel/video/video.dart
@@ -4,15 +4,13 @@ import 'package:flutter/material.dart';
 import 'package:frosty/screens/channel/video/video_store.dart';
 import 'package:simple_pip_mode/simple_pip.dart';
 import 'package:webview_flutter/webview_flutter.dart';
+import 'package:webview_flutter_android/webview_flutter_android.dart';
 
 /// Creates a [WebView] widget that shows a channel's video stream.
 class Video extends StatefulWidget {
   final VideoStore videoStore;
 
-  const Video({
-    Key? key,
-    required this.videoStore,
-  }) : super(key: key);
+  const Video({super.key, required this.videoStore});
 
   @override
   State<Video> createState() => _VideoState();
@@ -22,38 +20,50 @@ class _VideoState extends State<Video> with WidgetsBindingObserver {
   @override
   void initState() {
     super.initState();
+    if (widget.videoStore.settingsStore.showVideo) {
+      widget.videoStore.videoWebViewController.loadRequest(
+        Uri.parse(widget.videoStore.videoUrl),
+      );
+    }
     WidgetsBinding.instance.addObserver(this);
   }
 
   @override
   Future<void> didChangeAppLifecycleState(
-      AppLifecycleState lifecycleState) async {
+    AppLifecycleState lifecycleState,
+  ) async {
     if (Platform.isAndroid &&
         !await SimplePip.isAutoPipAvailable &&
-        lifecycleState == AppLifecycleState.inactive) {
+        lifecycleState == AppLifecycleState.inactive &&
+        widget.videoStore.settingsStore.showVideo) {
       widget.videoStore.requestPictureInPicture();
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    return WebView(
-      backgroundColor: Colors.black,
-      initialUrl: widget.videoStore.videoUrl,
-      javascriptMode: JavascriptMode.unrestricted,
-      allowsInlineMediaPlayback: true,
-      initialMediaPlaybackPolicy: AutoMediaPlaybackPolicy.always_allow,
-      onWebViewCreated: (controller) =>
-          widget.videoStore.controller = controller,
-      onPageFinished: (string) => widget.videoStore.initVideo(),
-      navigationDelegate: widget.videoStore.handleNavigation,
-      javascriptChannels: widget.videoStore.javascriptChannels,
-    );
+    if (WebViewPlatform.instance is AndroidWebViewPlatform) {
+      return WebViewWidget.fromPlatformCreationParams(
+        params: AndroidWebViewWidgetCreationParams(
+          controller: widget.videoStore.videoWebViewController.platform,
+          displayWithHybridComposition:
+              !widget.videoStore.settingsStore.useTextureRendering,
+        ),
+      );
+    } else {
+      return WebViewWidget(
+        controller: widget.videoStore.videoWebViewController,
+      );
+    }
   }
 
   @override
   void dispose() {
     WidgetsBinding.instance.removeObserver(this);
+    widget.videoStore.videoWebViewController.loadRequest(
+      Uri.parse('about:blank'),
+    );
+
     super.dispose();
   }
 }
diff --git a/lib/screens/channel/video/video_bar.dart b/lib/screens/channel/video/video_bar.dart
deleted file mode 100644
index 2080573c..00000000
--- a/lib/screens/channel/video/video_bar.dart
+++ /dev/null
@@ -1,117 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:frosty/constants.dart';
-import 'package:frosty/models/stream.dart';
-import 'package:frosty/screens/home/top/categories/category_streams.dart';
-import 'package:frosty/widgets/profile_picture.dart';
-
-class VideoBar extends StatelessWidget {
-  final StreamTwitch streamInfo;
-  final bool showCategory;
-  final bool tappableCategory;
-  final Color? titleTextColor;
-  final Color? subtitleTextColor;
-  final FontWeight? subtitleTextWeight;
-
-  const VideoBar({
-    Key? key,
-    required this.streamInfo,
-    this.showCategory = true,
-    this.tappableCategory = true,
-    this.titleTextColor,
-    this.subtitleTextColor,
-    this.subtitleTextWeight,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final streamTitle = streamInfo.title.trim();
-    final category =
-        streamInfo.gameName.isNotEmpty ? streamInfo.gameName : 'No Category';
-
-    final streamerName = regexEnglish.hasMatch(streamInfo.userName)
-        ? streamInfo.userName
-        : '${streamInfo.userName} (${streamInfo.userLogin})';
-
-    return Padding(
-      padding: const EdgeInsets.all(10),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          ProfilePicture(userLogin: streamInfo.userLogin),
-          const SizedBox(width: 10.0),
-          Flexible(
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Tooltip(
-                  message: 'Streamer: $streamerName',
-                  showDuration: const Duration(seconds: 3),
-                  child: Text(
-                    streamerName,
-                    overflow: TextOverflow.ellipsis,
-                    style: TextStyle(
-                      fontWeight: FontWeight.w600,
-                      fontSize: 16,
-                      color: titleTextColor,
-                    ),
-                  ),
-                ),
-                const SizedBox(height: 5.0),
-                Tooltip(
-                  message: 'Title: ${streamInfo.title.trim()}',
-                  showDuration: const Duration(seconds: 5),
-                  child: Text(
-                    streamTitle,
-                    overflow: TextOverflow.ellipsis,
-                    style: TextStyle(
-                      color: subtitleTextColor ??
-                          Theme.of(context)
-                              .colorScheme
-                              .onSurface
-                              .withOpacity(0.8),
-                      fontWeight: subtitleTextWeight,
-                    ),
-                  ),
-                ),
-                if (showCategory) ...[
-                  const SizedBox(height: 5.0),
-                  InkWell(
-                    onTap: tappableCategory && streamInfo.gameName.isNotEmpty
-                        ? () => Navigator.push(
-                              context,
-                              MaterialPageRoute(
-                                builder: (context) => CategoryStreams(
-                                  categoryName: streamInfo.gameName,
-                                  categoryId: streamInfo.gameId,
-                                ),
-                              ),
-                            )
-                        : null,
-                    child: Tooltip(
-                      message:
-                          'Category: ${streamInfo.gameName.isNotEmpty ? streamInfo.gameName : 'None'}',
-                      showDuration: const Duration(seconds: 3),
-                      child: Text(
-                        category,
-                        overflow: TextOverflow.ellipsis,
-                        style: TextStyle(
-                          color: subtitleTextColor ??
-                              Theme.of(context)
-                                  .colorScheme
-                                  .onSurface
-                                  .withOpacity(0.8),
-                          fontWeight: subtitleTextWeight,
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/screens/channel/video/video_overlay.dart b/lib/screens/channel/video/video_overlay.dart
index c5968f05..f3589112 100644
--- a/lib/screens/channel/video/video_overlay.dart
+++ b/lib/screens/channel/video/video_overlay.dart
@@ -1,34 +1,65 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/constants.dart';
 import 'package:frosty/screens/channel/chat/details/chat_users_list.dart';
 import 'package:frosty/screens/channel/chat/stores/chat_store.dart';
-import 'package:frosty/screens/channel/video/video_bar.dart';
-import 'package:frosty/screens/channel/video/video_store.dart';
-import 'package:frosty/widgets/bottom_sheet.dart';
+import 'package:frosty/screens/channel/video/native_video_store.dart';
+import 'package:frosty/screens/channel/video/stream_info_bar.dart';
+import 'package:frosty/screens/channel/video/video_player_interface.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/theme.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/live_indicator.dart';
+import 'package:frosty/widgets/section_header.dart';
 import 'package:frosty/widgets/uptime.dart';
 import 'package:intl/intl.dart';
+import 'package:native_device_orientation/native_device_orientation.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 /// Creates a widget containing controls which enable interactions with an underlying [Video] widget.
 class VideoOverlay extends StatelessWidget {
-  final VideoStore videoStore;
+  final VideoPlayerInterface videoStore;
   final ChatStore chatStore;
+  final SettingsStore settingsStore;
 
   const VideoOverlay({
-    Key? key,
+    super.key,
     required this.videoStore,
     required this.chatStore,
-  }) : super(key: key);
+    required this.settingsStore,
+  });
+
+  static BoxDecoration _overlayGradient({required bool fromTop}) =>
+      BoxDecoration(
+        gradient: LinearGradient(
+          begin: fromTop ? Alignment.topCenter : Alignment.bottomCenter,
+          end: fromTop ? Alignment.bottomCenter : Alignment.topCenter,
+          colors: const [
+            Colors.black,
+            Color.fromRGBO(0, 0, 0, 0.78),
+            Color.fromRGBO(0, 0, 0, 0.48),
+            Color.fromRGBO(0, 0, 0, 0.12),
+            Colors.transparent,
+          ],
+          stops: const [0.0, 0.25, 0.5, 0.8, 1.0],
+        ),
+      );
 
   @override
   Widget build(BuildContext context) {
-    final orientation = MediaQuery.of(context).orientation;
+    final surfaceColor = context.frostyColors.overlayOnSurface;
 
     final backButton = IconButton(
       tooltip: 'Back',
       icon: Icon(
         Icons.adaptive.arrow_back_rounded,
-        color: Colors.white,
+        color: surfaceColor,
+        shadows: kOverlayShadow,
       ),
       onPressed: Navigator.of(context).pop,
     );
@@ -41,233 +72,482 @@ class VideoOverlay extends StatelessWidget {
         onPressed: () => videoStore.settingsStore.fullScreenChatOverlay =
             !videoStore.settingsStore.fullScreenChatOverlay,
         icon: videoStore.settingsStore.fullScreenChatOverlay
-            ? const Icon(Icons.chat_rounded)
-            : const Icon(Icons.chat_outlined),
-        color: Colors.white,
+            ? Icon(Icons.chat_rounded, shadows: kOverlayShadow)
+            : Icon(Icons.chat_outlined, shadows: kOverlayShadow),
+        color: surfaceColor,
       ),
     );
 
+    final videoSettingsButton = IconButton(
+      icon: Icon(Icons.settings, shadows: kOverlayShadow),
+      color: surfaceColor,
+      onPressed: () {
+        videoStore.updateStreamQualities();
+        showModalBottomSheetWithProperFocus(
+          context: context,
+          builder: (context) => Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const SectionHeader(
+                'Quality',
+                padding: EdgeInsets.fromLTRB(16, 0, 16, 8),
+                isFirst: true,
+              ),
+              Flexible(
+                child: Observer(
+                  builder: (context) => ListView(
+                    shrinkWrap: true,
+                    primary: false,
+                    children: [
+                      ...videoStore.availableStreamQualities.map(
+                        (quality) => ListTile(
+                          trailing: videoStore.streamQuality == quality
+                              ? const Icon(Icons.check_rounded)
+                              : null,
+                          title: Text(quality),
+                          onTap: () {
+                            videoStore.setStreamQuality(quality);
+                            SharedPreferences.getInstance().then(
+                              (prefs) => prefs.setString(
+                                lastStreamQualityKey(videoStore.userLogin),
+                                quality,
+                              ),
+                            );
+                            Navigator.pop(context);
+                          },
+                        ),
+                      ),
+                      // Qualities the broadcaster offers only to subscribers
+                      // (from the playback token's restricted_bitrates).
+                      ...videoStore.restrictedStreamQualities.map(
+                        (quality) => ListTile(
+                          enabled: false,
+                          title: Text(quality),
+                          subtitle: const Text('Subscribers only'),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+        );
+      },
+    );
+
     final refreshButton = Tooltip(
       message: 'Refresh',
       preferBelow: false,
       child: IconButton(
-        icon: const Icon(
+        icon: Icon(
           Icons.refresh_rounded,
-          color: Colors.white,
+          color: surfaceColor,
+          shadows: kOverlayShadow,
         ),
         onPressed: videoStore.handleRefresh,
       ),
     );
 
-    final fullScreenButton = Tooltip(
-      message: videoStore.settingsStore.fullScreen
-          ? 'Exit fullscreen mode'
-          : 'Enter fullscreen mode',
-      preferBelow: false,
-      child: IconButton(
-        icon: Icon(
-          videoStore.settingsStore.fullScreen
-              ? Icons.fullscreen_exit_rounded
-              : Icons.fullscreen_rounded,
-          color: Colors.white,
+    final fullScreenButton = Observer(
+      builder: (_) => Tooltip(
+        message: videoStore.settingsStore.fullScreen
+            ? 'Exit fullscreen mode'
+            : 'Enter fullscreen mode',
+        preferBelow: false,
+        child: IconButton(
+          icon: Icon(
+            videoStore.settingsStore.fullScreen
+                ? Icons.fullscreen_exit_rounded
+                : Icons.fullscreen_rounded,
+            color: surfaceColor,
+            shadows: kOverlayShadow,
+          ),
+          onPressed: () => videoStore.settingsStore.fullScreen =
+              !videoStore.settingsStore.fullScreen,
         ),
-        onPressed: () => videoStore.settingsStore.fullScreen =
-            !videoStore.settingsStore.fullScreen,
       ),
     );
 
     final rotateButton = Tooltip(
-      message: orientation == Orientation.portrait
+      message: context.isPortrait
           ? 'Enter landscape mode'
           : 'Exit landscape mode',
       preferBelow: false,
       child: IconButton(
-        icon: const Icon(
+        icon: Icon(
           Icons.screen_rotation_rounded,
-          color: Colors.white,
+          color: surfaceColor,
+          shadows: kOverlayShadow,
         ),
-        onPressed: () {
-          if (orientation == Orientation.portrait) {
-            SystemChrome.setPreferredOrientations([
-              DeviceOrientation.landscapeLeft,
-              DeviceOrientation.landscapeRight,
-            ]);
+        onPressed: () async {
+          if (context.isPortrait) {
+            // Detect physical device tilt to rotate to optimal orientation
+            final physicalOrientation =
+                await NativeDeviceOrientationCommunicator().orientation(
+                  useSensor: true,
+                );
+
+            // Map native orientation to Flutter's DeviceOrientation
+            // iOS: native landscapeLeft = notch left, needs swap to Flutter's landscapeRight
+            // Android: direct mapping works correctly
+            final needsSwap = Platform.isIOS;
+
+            if (physicalOrientation == NativeDeviceOrientation.landscapeLeft) {
+              SystemChrome.setPreferredOrientations([
+                needsSwap
+                    ? DeviceOrientation.landscapeRight
+                    : DeviceOrientation.landscapeLeft,
+              ]);
+            } else if (physicalOrientation ==
+                NativeDeviceOrientation.landscapeRight) {
+              SystemChrome.setPreferredOrientations([
+                needsSwap
+                    ? DeviceOrientation.landscapeLeft
+                    : DeviceOrientation.landscapeRight,
+              ]);
+            } else {
+              // Not tilted to landscape yet, allow both
+              SystemChrome.setPreferredOrientations([
+                DeviceOrientation.landscapeLeft,
+                DeviceOrientation.landscapeRight,
+              ]);
+            }
           } else {
-            SystemChrome.setPreferredOrientations(
-                [DeviceOrientation.portraitUp]);
+            SystemChrome.setPreferredOrientations([
+              DeviceOrientation.portraitUp,
+            ]);
             SystemChrome.setPreferredOrientations([]);
           }
         },
       ),
     );
 
-    final streamInfo = videoStore.streamInfo;
-    if (streamInfo == null) {
-      return Stack(
-        children: [
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              backButton,
-              const Spacer(),
-              if (videoStore.settingsStore.fullScreen &&
-                  orientation == Orientation.landscape)
-                chatOverlayButton,
-            ],
-          ),
-          Align(
-            alignment: Alignment.bottomRight,
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                refreshButton,
-                if (!videoStore.isIPad) rotateButton,
-                if (orientation == Orientation.landscape) fullScreenButton,
-              ],
-            ),
-          ),
-        ],
-      );
-    }
-
     return Observer(
       builder: (context) {
-        return Stack(
-          children: [
-            Row(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                backButton,
-                if (orientation == Orientation.landscape)
-                  Expanded(
-                    child: VideoBar(
-                      streamInfo: streamInfo,
-                      titleTextColor: Colors.white,
-                      subtitleTextColor: Colors.white,
-                      subtitleTextWeight: FontWeight.w500,
-                    ),
-                  ),
-                if (videoStore.settingsStore.fullScreen &&
-                    orientation == Orientation.landscape)
-                  chatOverlayButton,
-              ],
-            ),
-            Center(
-              child: Tooltip(
-                message: videoStore.paused ? 'Play' : 'Pause',
-                preferBelow: false,
-                child: IconButton(
-                  iconSize: 50.0,
-                  icon: Icon(
-                    videoStore.paused
-                        ? Icons.play_arrow_rounded
-                        : Icons.pause_rounded,
-                    color: Colors.white,
-                  ),
-                  onPressed: videoStore.handlePausePlay,
-                ),
+        final streamInfo = videoStore.streamInfo;
+        final offlineChannelInfo = videoStore.offlineChannelInfo;
+
+        final topGradient = _overlayGradient(fromTop: true);
+        final bottomGradient = _overlayGradient(fromTop: false);
+
+        if (streamInfo == null) {
+          return Stack(
+            children: [
+              // Top gradient behind top cluster
+              Positioned(
+                top: 0,
+                left: 0,
+                right: 0,
+                height: 100, // Covers top area around controls (extended)
+                child: Container(decoration: topGradient),
               ),
-            ),
-            Align(
-              alignment: Alignment.bottomLeft,
-              child: Row(
-                crossAxisAlignment: CrossAxisAlignment.end,
+              // Bottom gradient behind bottom cluster
+              Positioned(
+                bottom: 0,
+                left: 0,
+                right: 0,
+                height: 80, // Covers bottom area around controls
+                child: Container(decoration: bottomGradient),
+              ),
+              // Content
+              Stack(
                 children: [
-                  Expanded(
-                    child: Padding(
-                      padding: const EdgeInsets.only(left: 10.0, bottom: 12.0),
-                      child: Row(
-                        children: [
-                          Tooltip(
-                            message: 'Stream uptime',
-                            preferBelow: false,
-                            child: Row(
-                              children: [
-                                const Padding(
-                                  padding: EdgeInsets.all(2.0),
-                                  child: Icon(
-                                    Icons.circle,
-                                    color: Colors.red,
-                                    size: 10,
+                  Row(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 8),
+                          child: Row(
+                            children: [
+                              backButton,
+                              if (offlineChannelInfo != null)
+                                Flexible(
+                                  child: StreamInfoBar(
+                                    offlineChannelInfo: offlineChannelInfo,
+                                    displayName: chatStore.displayName,
+                                    showUptime: false,
+                                    showViewerCount: false,
+                                    textColor: surfaceColor,
+                                    isOffline: true,
+                                    isInSharedChatMode:
+                                        chatStore.isInSharedChatMode,
                                   ),
                                 ),
-                                const SizedBox(width: 3.0),
-                                Uptime(
-                                  startTime: streamInfo.startedAt,
-                                  style: const TextStyle(
-                                    color: Colors.white,
-                                    fontWeight: FontWeight.w500,
-                                  ),
-                                ),
-                              ],
-                            ),
+                            ],
                           ),
-                          const SizedBox(width: 10),
-                          Tooltip(
-                            message: 'Viewer count',
-                            preferBelow: false,
-                            child: GestureDetector(
-                              onTap: () => showModalBottomSheet(
-                                backgroundColor: Colors.transparent,
-                                isScrollControlled: true,
-                                context: context,
-                                builder: (context) => FrostyBottomSheet(
-                                  child: SizedBox(
-                                    height: MediaQuery.of(context).size.height *
-                                        0.8,
-                                    child: GestureDetector(
-                                      onTap: FocusScope.of(context).unfocus,
-                                      child: ChattersList(
-                                        chatDetailsStore:
-                                            chatStore.chatDetailsStore,
-                                        chatStore: chatStore,
-                                        userLogin: streamInfo.userLogin,
-                                      ),
-                                    ),
-                                  ),
-                                ),
-                              ),
-                              child: Row(
-                                children: [
-                                  const Icon(
-                                    Icons.visibility,
-                                    size: 14,
-                                    color: Colors.white,
-                                  ),
-                                  const SizedBox(width: 5),
-                                  Text(
-                                    NumberFormat().format(
-                                        videoStore.streamInfo?.viewerCount),
-                                    style: const TextStyle(
-                                      color: Colors.white,
-                                      fontWeight: FontWeight.w500,
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ),
-                          ),
-                        ],
+                        ),
                       ),
+                      if (videoStore.settingsStore.fullScreen &&
+                          context.isLandscape)
+                        chatOverlayButton,
+                    ],
+                  ),
+                  Align(
+                    alignment: Alignment.bottomRight,
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.end,
+                      children: [
+                        refreshButton,
+                        // On iPad, hide the rotate button on the overlay
+                        // Flutter doesn't allow programmatic rotation on iPad unless multitasking is disabled.
+                        if (!isIPad()) rotateButton,
+                        if (context.isLandscape) fullScreenButton,
+                      ],
                     ),
                   ),
-                  Tooltip(
-                    message: 'Enter picture-in-picture',
-                    preferBelow: false,
-                    child: IconButton(
-                      icon: const Icon(
-                        Icons.picture_in_picture_alt_rounded,
-                        color: Colors.white,
-                      ),
-                      onPressed: videoStore.requestPictureInPicture,
-                    ),
-                  ),
-                  refreshButton,
-                  if (!videoStore.isIPad) rotateButton,
-                  if (orientation == Orientation.landscape) fullScreenButton,
                 ],
               ),
-            )
+            ],
+          );
+        }
+
+        return Stack(
+          children: [
+            // Top gradient behind top cluster
+            Positioned(
+              top: 0,
+              left: 0,
+              right: 0,
+              height: 100, // Covers top area around controls (extended)
+              child: Container(decoration: topGradient),
+            ),
+            // Bottom gradient behind bottom cluster
+            Positioned(
+              bottom: 0,
+              left: 0,
+              right: 0,
+              height: 80, // Covers bottom area around controls
+              child: Container(decoration: bottomGradient),
+            ),
+            if (videoStore.isBlockingAds)
+              Positioned(
+                top: 8,
+                left: 8,
+                child: IgnorePointer(
+                  child: DecoratedBox(
+                    decoration: BoxDecoration(
+                      color: Colors.black.withValues(alpha: 0.8),
+                    ),
+                    child: const Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 8, vertical: 5),
+                      child: Text(
+                        'Blocking ads',
+                        style: TextStyle(color: Colors.white, fontSize: 12),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            // Content
+            Stack(
+              children: [
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 8),
+                        child: Row(
+                          children: [
+                            backButton,
+                            Flexible(
+                              child: Observer(
+                                builder: (context) => StreamInfoBar(
+                                  streamInfo: streamInfo,
+                                  showUptime: false,
+                                  showViewerCount: false,
+                                  textColor: surfaceColor,
+                                  isInSharedChatMode:
+                                      chatStore.isInSharedChatMode,
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                    if (videoStore.settingsStore.fullScreen &&
+                        context.isLandscape)
+                      chatOverlayButton,
+                    if (!Platform.isIOS ||
+                        isIPad() ||
+                        videoStore is NativeVideoStore)
+                      videoSettingsButton,
+                  ],
+                ),
+                if (!videoStore.loading)
+                  Center(
+                    child: Tooltip(
+                      message: videoStore.paused ? 'Play' : 'Pause',
+                      preferBelow: false,
+                      child: IconButton(
+                        iconSize: 56,
+                        icon: Icon(
+                          videoStore.paused
+                              ? Icons.play_arrow_rounded
+                              : Icons.pause_rounded,
+                          color: surfaceColor,
+                          shadows: [
+                            Shadow(
+                              offset: const Offset(0, 3),
+                              blurRadius: 8,
+                              color: Colors.black.withValues(alpha: 0.6),
+                            ),
+                          ],
+                        ),
+                        onPressed: videoStore.handlePausePlay,
+                      ),
+                    ),
+                  ),
+                Align(
+                  alignment: Alignment.bottomLeft,
+                  child: Row(
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Expanded(
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 12,
+                            vertical: 10,
+                          ),
+                          child: Row(
+                            spacing: 8,
+                            children: [
+                              Tooltip(
+                                message: 'Stream uptime',
+                                preferBelow: false,
+                                triggerMode: TooltipTriggerMode.tap,
+                                child: Row(
+                                  spacing: 6,
+                                  children: [
+                                    const LiveIndicator(),
+                                    Uptime(
+                                      startTime: streamInfo.startedAt,
+                                      style: TextStyle(
+                                        color: surfaceColor,
+                                        fontWeight: FontWeight.w500,
+                                        shadows: kOverlayShadow,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              Tooltip(
+                                message: 'Viewer count',
+                                preferBelow: false,
+                                child: GestureDetector(
+                                  onTap: () =>
+                                      showModalBottomSheetWithProperFocus(
+                                        isScrollControlled: true,
+                                        context: context,
+                                        builder: (context) => GestureDetector(
+                                          onTap: FocusScope.of(context).unfocus,
+                                          child: ChattersList(
+                                            chatDetailsStore:
+                                                chatStore.chatDetailsStore,
+                                            chatStore: chatStore,
+                                            userLogin: streamInfo.userLogin,
+                                          ),
+                                        ),
+                                      ),
+                                  child: Row(
+                                    spacing: 4,
+                                    children: [
+                                      Icon(
+                                        Icons.visibility,
+                                        size: 14,
+                                        shadows: kOverlayShadow,
+                                        color: surfaceColor,
+                                      ),
+                                      Text(
+                                        NumberFormat().format(
+                                          videoStore.streamInfo?.viewerCount,
+                                        ),
+                                        style: TextStyle(
+                                          color: surfaceColor,
+                                          fontWeight: FontWeight.w500,
+                                          fontFeatures: const [
+                                            FontFeature.tabularFigures(),
+                                          ],
+                                          shadows: kOverlayShadow,
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ),
+                              if (settingsStore.showLatency)
+                                Tooltip(
+                                  message: 'Latency to broadcaster',
+                                  preferBelow: false,
+                                  triggerMode: TooltipTriggerMode.tap,
+                                  child: Row(
+                                    spacing: 4,
+                                    children: [
+                                      Icon(
+                                        Icons.speed_rounded,
+                                        size: 14,
+                                        color: surfaceColor,
+                                        shadows: kOverlayShadow,
+                                      ),
+                                      Observer(
+                                        builder: (context) => Text(
+                                          videoStore.latency ?? '—',
+                                          style: TextStyle(
+                                            color: surfaceColor,
+                                            fontWeight: FontWeight.w500,
+                                            fontFeatures: const [
+                                              FontFeature.tabularFigures(),
+                                            ],
+                                            shadows: kOverlayShadow,
+                                          ),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                            ],
+                          ),
+                        ),
+                      ),
+                      Builder(
+                        builder: (_) {
+                          // On iOS, show toggle behavior. On Android, always show enter PiP.
+                          final isIOS = Platform.isIOS;
+                          final showExitState = isIOS && videoStore.isInPipMode;
+
+                          return Tooltip(
+                            message: showExitState
+                                ? 'Exit picture-in-picture'
+                                : 'Enter picture-in-picture',
+                            preferBelow: false,
+                            child: IconButton(
+                              icon: Icon(
+                                showExitState
+                                    ? Icons.picture_in_picture_alt_outlined
+                                    : Icons.picture_in_picture_alt_rounded,
+                                color: surfaceColor,
+                                shadows: kOverlayShadow,
+                              ),
+                              onPressed: videoStore.togglePictureInPicture,
+                            ),
+                          );
+                        },
+                      ),
+                      refreshButton,
+                      // On iPad, hide the rotate button on the overlay
+                      // Flutter doesn't allow programmatic rotation on iPad unless multitasking is disabled.
+                      if (!isIPad()) rotateButton,
+                      if (context.isLandscape) fullScreenButton,
+                    ],
+                  ),
+                ),
+              ],
+            ),
           ],
         );
       },
diff --git a/lib/screens/channel/video/video_player_interface.dart b/lib/screens/channel/video/video_player_interface.dart
new file mode 100644
index 00000000..e8dd75d0
--- /dev/null
+++ b/lib/screens/channel/video/video_player_interface.dart
@@ -0,0 +1,51 @@
+import 'package:frosty/models/channel.dart';
+import 'package:frosty/models/stream.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+
+/// Abstraction over the video player store so both [VideoStore] (WebView)
+/// and [NativeVideoStore] can drive the same overlay and channel UI.
+///
+/// Native-only capabilities live on [NativeVideoPlayerInterface].
+abstract class VideoPlayerInterface {
+  SettingsStore get settingsStore;
+
+  /// Channel this store is driving — used as a key for per-channel
+  /// persistence (e.g. last-selected quality).
+  String get userLogin;
+
+  bool get loading;
+  bool get paused;
+  bool get overlayVisible;
+  bool get isInPipMode;
+  StreamTwitch? get streamInfo;
+  Channel? get offlineChannelInfo;
+  List<String> get availableStreamQualities;
+
+  /// Qualities that exist for this stream but require a subscription.
+  /// Only the native player can know this (parsed from the playback token);
+  /// the WebView player always reports none.
+  List<String> get restrictedStreamQualities;
+
+  String get streamQuality;
+  String? get latency;
+
+  /// True while TwitchAdSolutions is actively avoiding an ad break.
+  bool get isBlockingAds;
+
+  void handleVideoTap();
+  void handlePausePlay();
+  void handleToggleOverlay();
+  Future<void> handleRefresh();
+  void requestPictureInPicture();
+  void togglePictureInPicture();
+  Future<void> updateStreamQualities();
+  Future<void> setStreamQuality(String quality);
+  Future<void> updateStreamInfo({bool forceUpdate});
+  void handleAppResume();
+
+  /// Called from the platform PiP callbacks on Android so the store can sync
+  /// its overlay state, and its playback, with the OS PiP window.
+  void handleAndroidPipChanged(bool isInPip);
+
+  void dispose();
+}
diff --git a/lib/screens/channel/video/video_store.dart b/lib/screens/channel/video/video_store.dart
index c8c93c4b..971a25bf 100644
--- a/lib/screens/channel/video/video_store.dart
+++ b/lib/screens/channel/video/video_store.dart
@@ -1,72 +1,235 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
-import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/constants.dart';
+import 'package:frosty/models/channel.dart';
 import 'package:frosty/models/stream.dart';
+import 'package:frosty/screens/channel/video/chat_latency_sync.dart';
+import 'package:frosty/screens/channel/video/stream_info_poller.dart';
+import 'package:frosty/screens/channel/video/video_player_interface.dart';
+import 'package:frosty/screens/channel/video/video_timing_constants.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:mobx/mobx.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:simple_pip_mode/simple_pip.dart';
 import 'package:webview_flutter/webview_flutter.dart';
+import 'package:webview_flutter_android/webview_flutter_android.dart';
+import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart';
 
 part 'video_store.g.dart';
 
 class VideoStore = VideoStoreBase with _$VideoStore;
 
-abstract class VideoStoreBase with Store {
+abstract class VideoStoreBase with Store implements VideoPlayerInterface {
   final TwitchApi twitchApi;
 
   /// The userlogin of the current channel.
+  @override
   final String userLogin;
 
+  /// The user ID of the current channel.
+  final String userId;
+
   final AuthStore authStore;
 
+  @override
   final SettingsStore settingsStore;
 
   /// The [SimplePip] instance used for initiating PiP on Android.
   final pip = SimplePip();
+  late final ChatLatencySync _chatLatencySync =
+      ChatLatencySync(settingsStore: settingsStore);
+  late final StreamInfoPoller _streamInfoPoller = StreamInfoPoller(
+    twitchApi: twitchApi,
+    userLogin: userLogin,
+    userId: userId,
+  );
+
+  var _firstTimeSettingQuality = true;
+  var _highLatencyCount = 0;
+
+  /// Whether [initVideo] should run on the next [onPageFinished].
+  ///
+  /// Dart-controlled rather than JS-side (`window._injected`) to avoid race
+  /// conditions when `loadRequest` fires before the previous page fully
+  /// loads — but re-armed by `onPageStarted` on *every* navigation so it
+  /// keeps the page-scoped lifetime the JS flag had for free. This controller
+  /// outlives the [Video] widget, which reloads [videoUrl] on each mount, and
+  /// a flag only [handleRefresh] reset left those reloads permanently
+  /// uninitialized: no play/pause listeners, no `_videoEl`, no autoplay, no
+  /// overlay CSS, and no recovery short of restarting the app.
+  var _needsInit = true;
+
+  /// Whether the *user* paused, as opposed to the page pausing itself.
+  ///
+  /// Backgrounding can suspend playback with no way for the page to resume on
+  /// its own — the native store recovers via `play()` on resume, the webview
+  /// store had no equivalent. This distinguishes "resume it for them" from
+  /// "they meant it".
+  var _userPaused = false;
+
+  /// The video web view params used for enabling auto play.
+  late final PlatformWebViewControllerCreationParams _videoWebViewParams;
 
   /// The webview controller used for injecting JavaScript to control the webview and video player.
-  WebViewController? controller;
+  late final WebViewController videoWebViewController =
+      WebViewController.fromPlatformCreationParams(_videoWebViewParams)
+        ..setBackgroundColor(Colors.black)
+        ..setJavaScriptMode(JavaScriptMode.unrestricted)
+        ..addJavaScriptChannel(
+          'Latency',
+          onMessageReceived: (message) {
+            final receivedLatency = message.message;
+            _latency = receivedLatency;
+
+            // Parse latency from abbreviated format: "5s" -> 5.0
+            final numericPart = receivedLatency.replaceAll(
+              RegExp(r'[^0-9.]'),
+              '',
+            );
+            final latencyAsDouble = double.tryParse(numericPart);
+
+            // Auto-recover when latency climbs too high.
+            // Intentionally skips the chat delay sync — the stale value
+            // would desync chat further. Recovery will restore it.
+            if (latencyAsDouble != null &&
+                latencyAsDouble >= VideoTimingConstants.highLatencyThresholdSeconds &&
+                !_paused &&
+                !_loading) {
+              _highLatencyCount++;
+              if (_highLatencyCount == 1) {
+                debugPrint(
+                  'VideoStore: high latency (${latencyAsDouble.round()}s), seeking to live edge',
+                );
+                try {
+                  videoWebViewController.runJavaScript('''
+                    (function() {
+                      const v = window._videoEl || document.querySelector("video");
+                      if (v && v.buffered.length > 0) {
+                        v.currentTime = v.buffered.end(v.buffered.length - 1);
+                      }
+                    })();
+                  ''');
+                } catch (e) {
+                  debugPrint(e.toString());
+                }
+              } else {
+                debugPrint(
+                  'VideoStore: latency still high (${latencyAsDouble.round()}s), refreshing',
+                );
+                _highLatencyCount = 0;
+                handleRefresh();
+              }
+              return;
+            }
+            _highLatencyCount = 0;
+
+            if (latencyAsDouble != null) {
+              _chatLatencySync.report(latencyAsDouble);
+            }
+          },
+        )
+        ..addJavaScriptChannel(
+          'StreamQualities',
+          onMessageReceived: (message) async {
+            final data = jsonDecode(message.message) as List;
+            _availableStreamQualities = data
+                .map((item) => item as String)
+                .toList();
+            if (_firstTimeSettingQuality) {
+              _firstTimeSettingQuality = false;
+              if (settingsStore.defaultToHighestQuality) {
+                await _setStreamQualityIndex(1);
+                return;
+              }
+              final prefs = await SharedPreferences.getInstance();
+              final lastStreamQuality =
+                  prefs.getString(lastStreamQualityKey(userLogin));
+              if (lastStreamQuality == null) return;
+              setStreamQuality(lastStreamQuality);
+            }
+          },
+        )
+        ..addJavaScriptChannel(
+          'VideoPause',
+          onMessageReceived: (message) {
+            _paused = true;
+            if (Platform.isAndroid) pip.setIsPlaying(false);
+          },
+        )
+        ..addJavaScriptChannel(
+          'VideoPlaying',
+          onMessageReceived: (message) {
+            _loading = false;
+            _paused = false;
+            if (Platform.isAndroid) pip.setIsPlaying(true);
+          },
+        )
+        ..addJavaScriptChannel(
+          'PipEntered',
+          onMessageReceived: (message) => _setPipActive(true),
+        )
+        ..addJavaScriptChannel(
+          'PipExited',
+          onMessageReceived: (message) => _setPipActive(false),
+        )
+        ..setNavigationDelegate(
+          NavigationDelegate(
+            // Every real navigation invalidates the injected JS context, so
+            // every one must re-arm init. Unconditional is safe: the
+            // onPageFinished handler below still filters on videoUrl.
+            onPageStarted: (url) {
+              _needsInit = true;
+              // Best-effort: inject vaft as early as the WebView allows.
+              // True document-start injection isn't exposed by webview_flutter
+              // on Android; native player remains the reliable adblock path.
+              if (settingsStore.blockTwitchAds) {
+                unawaited(_injectVaftUserScript());
+              }
+            },
+            onPageFinished: (url) async {
+              if (url != videoUrl) return;
+              if (settingsStore.blockTwitchAds) {
+                await _injectVaftUserScript();
+              }
+              if (!_needsInit) return;
+              _needsInit = false;
+              await initVideo();
+              _acceptContentWarning();
+            },
+          ),
+        );
 
   /// The timer that handles hiding the overlay automatically
-  late Timer _overlayTimer;
+  Timer? _overlayTimer;
+
+  /// Tracks the pre-PiP overlay visibility so we can restore it on exit.
+  bool _overlayWasVisibleBeforePip = true;
+
+  /// The timer that handles periodic stream info updates
+  Timer? _streamInfoTimer;
+
+  /// Timer for periodic JavaScript state cleanup to prevent memory accumulation.
+  Timer? _jsCleanupTimer;
 
   /// Disposes the overlay reactions.
   late final ReactionDisposer _disposeOverlayReaction;
 
-  /// The JavaScript channels used to communicate play/pause from the webview to Flutter.
-  late final javascriptChannels = {
-    JavascriptChannel(
-      name: 'VideoPause',
-      onMessageReceived: (message) {
-        _paused = true;
-        if (Platform.isAndroid) pip.setIsPlaying(false);
-      },
-    ),
-    JavascriptChannel(
-      name: 'VideoPlaying',
-      onMessageReceived: (message) {
-        _paused = false;
-        if (Platform.isAndroid) pip.setIsPlaying(true);
-        controller?.runJavascript(
-            'document.getElementsByTagName("video")[0].muted = false;');
-        controller?.runJavascript(
-            'document.getElementsByTagName("video")[0].volume = 1.0;');
-      },
-    ),
-  };
+  /// Disposes the video mode reaction for timer management.
+  late final ReactionDisposer _disposeVideoModeReaction;
 
-  /// Used for preventing accidental navigation in the webview.
-  FutureOr<NavigationDecision> handleNavigation(NavigationRequest navigation) {
-    if (navigation.url.startsWith('https://player.twitch.tv')) {
-      return NavigationDecision.navigate;
-    }
-    return NavigationDecision.prevent;
-  }
+  ReactionDisposer? _disposeAndroidAutoPipReaction;
+
+  /// Disposes the latency settings reaction.
+  ReactionDisposer? _disposeLatencySettingsReaction;
+
+  @readonly
+  var _loading = true;
 
   /// If the video is currently paused.
   ///
@@ -78,109 +241,610 @@ abstract class VideoStoreBase with Store {
   @readonly
   var _overlayVisible = true;
 
-  /// If the current device is iPad.
-  @readonly
-  var _isIPad = false;
-
   /// The current stream info, used for displaying relevant info on the overlay.
   @readonly
   StreamTwitch? _streamInfo;
 
-  /// The video URL to use for the webview. Controls will be disabled when custom overlay is enabled.
-  @computed
-  String get videoUrl => settingsStore.showOverlay
-      ? 'https://player.twitch.tv/?channel=$userLogin&controls=false&muted=false&parent=frosty'
-      : 'https://player.twitch.tv/?channel=$userLogin&muted=false&parent=frosty';
+  /// The offline channel info, used for displaying channel details when offline.
+  @readonly
+  Channel? _offlineChannelInfo;
+
+  @readonly
+  List<String> _availableStreamQualities = [];
+
+  // The WebView player has no access to the playback token, so sub-only
+  // qualities can't be detected here.
+  @override
+  List<String> get restrictedStreamQualities => const [];
+
+  // The current stream quality index
+  @readonly
+  int _streamQualityIndex = 0;
+
+  // The current stream quality string
+  @override
+  String get streamQuality =>
+      _availableStreamQualities.elementAtOrNull(_streamQualityIndex) ?? 'Auto';
+
+  @readonly
+  String? _latency;
+
+  /// Whether the app is currently in picture-in-picture mode (iOS only).
+  /// On Android, this state is not tracked since there's no programmatic exit.
+  @readonly
+  var _isInPipMode = false;
+
+  /// WebView path relies on the injected vaft userscript's own overlay; the
+  /// Dart overlay banner is driven by the native player only.
+  @override
+  bool get isBlockingAds => false;
+
+  /// The video URL to use for the webview.
+  String get videoUrl =>
+      'https://player.twitch.tv/?channel=$userLogin&muted=false&parent=frosty';
 
   VideoStoreBase({
     required this.userLogin,
+    required this.userId,
     required this.twitchApi,
     required this.authStore,
     required this.settingsStore,
   }) {
+    // Reset chat delay to 0 to prevent starting with a stale value from
+    // a previous channel.
+    _chatLatencySync.reset();
+    // Initialize the video webview params for iOS to enable video autoplay.
+    if (WebViewPlatform.instance is WebKitWebViewPlatform) {
+      _videoWebViewParams = WebKitWebViewControllerCreationParams(
+        allowsInlineMediaPlayback: true,
+        mediaTypesRequiringUserAction: const <PlaybackMediaTypes>{},
+      );
+    } else {
+      _videoWebViewParams = const PlatformWebViewControllerCreationParams();
+    }
+
+    // Initialize the video webview params for Android to enable video autoplay.
+    if (videoWebViewController.platform is AndroidWebViewController) {
+      (videoWebViewController.platform as AndroidWebViewController)
+          .setMediaPlaybackRequiresUserGesture(false);
+    }
+
+    // Initialize the [_overlayTimer] to auto-hide the overlay after a delay (default 5 seconds).
+    _scheduleOverlayHide();
+
+    // Initialize a reaction that incrementally applies/removes overlay customizations
+    // without reloading the webview (which would tear down the HLS stream).
+    _disposeOverlayReaction = reaction((_) => settingsStore.showOverlay, (
+      showOverlay,
+    ) async {
+      if (showOverlay) {
+        await _hideDefaultOverlay();
+        if (settingsStore.showLatency || settingsStore.autoSyncChatDelay) {
+          await _listenOnLatencyChanges();
+        }
+        await updateStreamQualities();
+      } else {
+        _showDefaultOverlay();
+        _stopLatencyTracker();
+      }
+    });
+
+    // Initialize a reaction to manage timers based on video mode
+    _disposeVideoModeReaction = reaction((_) => settingsStore.showVideo, (
+      showVideo,
+    ) {
+      if (showVideo) {
+        // In video mode, stop the timer since overlay taps handle refreshing
+        _stopStreamInfoTimer();
+        _startJsCleanupTimer();
+      } else {
+        // In chat-only mode, start the timer for automatic updates
+        _startStreamInfoTimer();
+        _stopJsCleanupTimer();
+        // Ensure overlay timer is active for clean UI
+        _scheduleOverlayHide();
+        // The tracker's 60s cycle opens the Twitch settings menu via DOM
+        // queries — keep that off when the player isn't even visible.
+        _stopLatencyTracker();
+      }
+    });
+
+    // Check initial state and start timer if already in chat-only mode
+    if (!settingsStore.showVideo) {
+      _startStreamInfoTimer();
+      _scheduleOverlayHide();
+    } else {
+      _startJsCleanupTimer();
+    }
+
     // On Android, enable auto PiP mode (setAutoEnterEnabled) if the device supports it.
     if (Platform.isAndroid) {
-      SimplePip.isAutoPipAvailable.then((isAutoPipAvailable) {
-        if (isAutoPipAvailable) pip.setAutoPipMode();
+      _disposeAndroidAutoPipReaction = autorun((_) async {
+        // setAutoPipMode is only implemented on Android S+ — invoking it on
+        // older versions throws a PlatformException, so skip when unavailable.
+        if (!await SimplePip.isAutoPipAvailable) return;
+        pip.setAutoPipMode(autoEnter: settingsStore.showVideo);
       });
     }
 
-    // Initialize the [_overlayTimer] to hide the overlay automatically after 5 seconds.
-    _overlayTimer =
-        Timer(const Duration(seconds: 5), () => _overlayVisible = false);
-
-    // Initialize a reaction that will reload the webview whenever the overlay is toggled.
-    _disposeOverlayReaction = reaction(
-      (_) => settingsStore.showOverlay,
-      (_) => controller?.loadUrl(videoUrl),
-    );
-
     updateStreamInfo();
+
+    // React to changes in latency-related settings mid-session
+    // This handles the case where user toggles autoSyncChatDelay or showLatency
+    // while already watching a stream
+    _disposeLatencySettingsReaction = reaction(
+      (_) => (settingsStore.showLatency, settingsStore.autoSyncChatDelay),
+      (values) async {
+        final (showLatency, autoSync) = values;
+        // Tracker only runs against the live player iframe — skip in
+        // chat-only mode and when the custom overlay is off.
+        if (!settingsStore.showVideo || !settingsStore.showOverlay) return;
+
+        if (showLatency || autoSync) {
+          // Start tracker if either setting is now enabled
+          // The init() method is idempotent - won't double-start if already running
+          await _listenOnLatencyChanges();
+
+          // If autoSync was just enabled and we already have a cached latency
+          // value (e.g. from showLatency tracking), apply it immediately instead
+          // of waiting for the next tracker cycle (up to 60s).
+          if (autoSync && _latency != null) {
+            final numericPart = _latency!.replaceAll(
+              RegExp(r'[^0-9.]'),
+              '',
+            );
+            final latencyAsDouble = double.tryParse(numericPart);
+            if (latencyAsDouble != null) {
+              _chatLatencySync.report(latencyAsDouble);
+            }
+          }
+        } else {
+          // Stop tracker if both settings are now disabled
+          _stopLatencyTracker();
+        }
+      },
+    );
+  }
+
+  @override
+  @action
+  Future<void> updateStreamQualities() async {
+    try {
+      await videoWebViewController.runJavaScript(r'''
+      _queuePromise(async () => {
+        const settingsBtn = await _asyncQuerySelector('[data-a-target="player-settings-button"]');
+        if (!settingsBtn) return;
+
+        try {
+          settingsBtn.click();
+
+          const qualityItem = await _asyncQuerySelector('[data-a-target="player-settings-menu-item-quality"]');
+          if (!qualityItem) return;
+          qualityItem.click();
+
+          // Wait until at least one quality option is rendered
+          await _asyncQuerySelector(
+            '[data-a-target="player-settings-menu"] input[name="player-settings-submenu-quality-option"] + label'
+          );
+
+          // Grab every label, normalise whitespace, return as array
+          const qualities = Array.from(
+            document.querySelectorAll(
+              '[data-a-target="player-settings-menu"] input[name="player-settings-submenu-quality-option"] + label'
+            )
+          ).map(l => l.textContent.replace(/\s+/g, ' ').trim());
+
+          StreamQualities.postMessage(JSON.stringify(qualities));
+        } finally {
+          // Always close the settings panel
+          settingsBtn.click();
+        }
+      });
+    ''');
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  @override
+  @action
+  Future<void> setStreamQuality(String newStreamQuality) async {
+    final indexOfStreamQuality = _availableStreamQualities.indexOf(
+      newStreamQuality,
+    );
+    if (indexOfStreamQuality == -1) return;
+    await _setStreamQualityIndex(indexOfStreamQuality);
+  }
+
+  @action
+  Future<void> _setStreamQualityIndex(int newStreamQualityIndex) async {
+    try {
+      await videoWebViewController.runJavaScript('''
+        _queuePromise(async () => {
+          const settingsBtn = await _asyncQuerySelector('[data-a-target="player-settings-button"]');
+          if (!settingsBtn) return;
+
+          try {
+            settingsBtn.click();
+
+            const qualityItem = await _asyncQuerySelector('[data-a-target="player-settings-menu-item-quality"]');
+            if (!qualityItem) return;
+            qualityItem.click();
+
+            await _asyncQuerySelector('[data-a-target="player-settings-submenu-quality-option"] input');
+            const inputs = [...document.querySelectorAll('[data-a-target="player-settings-submenu-quality-option"] input')];
+            if (inputs[$newStreamQualityIndex]) {
+              inputs[$newStreamQualityIndex].click();
+            }
+          } finally {
+            settingsBtn.click();
+          }
+        });
+      ''');
+      _streamQualityIndex = newStreamQualityIndex;
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  /// Hides the default Twitch overlay elements using CSS injection.
+  ///
+  /// CSS rules apply automatically to present and future DOM elements,
+  /// so no MutationObserver is needed.
+  Future<void> _hideDefaultOverlay() async {
+    try {
+      await videoWebViewController.runJavaScript('''
+        {
+          if (!document.getElementById('frosty-overlay-styles')) {
+            const style = document.createElement('style');
+            style.id = 'frosty-overlay-styles';
+            style.textContent = `
+              .top-bar,
+              .player-controls,
+              #channel-player-disclosures,
+              [data-a-target="player-overlay-preview-background"],
+              [data-a-target="player-overlay-video-stats"] {
+                display: none !important;
+                visibility: hidden !important;
+                pointer-events: none !important;
+              }
+            `;
+            document.head.appendChild(style);
+          }
+        }
+      ''');
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  /// Removes the custom CSS that hides Twitch's default overlay,
+  /// restoring the native Twitch player controls.
+  void _showDefaultOverlay() {
+    try {
+      videoWebViewController.runJavaScript(
+        "document.getElementById('frosty-overlay-styles')?.remove();",
+      );
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  Future<void> _acceptContentWarning() async {
+    try {
+      await videoWebViewController.runJavaScript('''
+        {
+          (async () => {
+            const warningBtn = await _asyncQuerySelector('button[data-a-target*="content-classification-gate"]', 10000);
+
+            if (warningBtn) {
+              warningBtn.click();
+            }
+          })();
+        }
+      ''');
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  /// Sets up visibility-aware latency tracking.
+  ///
+  /// Key optimizations over previous implementation:
+  /// - Only tracks when overlay is visible (pauses when hidden)
+  /// - Properly clears setTimeout IDs to prevent accumulation
+  /// - Has explicit stop() method for cleanup
+  /// - Skips cycles entirely when overlay hidden (saves CPU)
+  Future<void> _listenOnLatencyChanges() async {
+    try {
+      await videoWebViewController.runJavaScript(_kLatencyTrackerJs);
+      _updateLatencyTrackerVisibility(_overlayVisible);
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  /// Tells the in-webview latency tracker to stop its polling cycle.
+  /// Safe to call when the tracker hasn't been injected yet.
+  void _stopLatencyTracker() {
+    try {
+      videoWebViewController.runJavaScript('window._latencyTracker?.stop()');
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  /// Updates the latency tracker's overlay visibility state.
+  ///
+  /// When overlay is hidden, the latency tracker pauses its polling cycle
+  /// to save CPU. When overlay becomes visible again, it resumes.
+  ///
+  /// However, if autoSyncChatDelay is enabled, the tracker always runs
+  /// regardless of overlay visibility to keep chat delay accurate.
+  void _updateLatencyTrackerVisibility(bool visible) {
+    // Skip if latency tracking isn't active at all
+    if (!settingsStore.showLatency && !settingsStore.autoSyncChatDelay) return;
+
+    // If auto-sync is enabled, always keep tracker running (don't pause on hide)
+    // to ensure chat delay stays synchronized even during long viewing sessions
+    if (settingsStore.autoSyncChatDelay) {
+      // Always report visible to keep tracking active
+      try {
+        videoWebViewController.runJavaScript(
+          'window._latencyTracker?.setOverlayVisible(true)',
+        );
+      } catch (e) {
+        debugPrint(e.toString());
+      }
+      return;
+    }
+
+    // Only pause/resume based on visibility if just showLatency is enabled
+    try {
+      videoWebViewController.runJavaScript(
+        'window._latencyTracker?.setOverlayVisible($visible)',
+      );
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  /// Performs a soft reset of JavaScript state to prevent memory accumulation.
+  ///
+  /// This runs periodically during long viewing sessions to clear accumulated
+  /// state without requiring a full page reload. Resets:
+  /// - Promise queue (clears any stale promise chains)
+  /// - Queue length counter
+  /// - Generation counter (prevents stale callbacks from decrementing length)
+  ///
+  /// Only resets if queue is idle to avoid orphaning in-flight operations
+  /// (which could leave the settings menu open).
+  void _performJsSoftReset() {
+    try {
+      videoWebViewController.runJavaScript('''
+        // Only reset if queue is idle to avoid orphaning in-flight operations
+        if (window._promiseQueueLength === 0) {
+          window._PROMISE_QUEUE = Promise.resolve();
+          window._promiseQueueGen = (window._promiseQueueGen || 0) + 1;
+        }
+      ''');
+    } catch (e) {
+      debugPrint('JS soft reset error: $e');
+    }
   }
 
   /// Initializes the video webview.
   @action
   Future<void> initVideo() async {
-    // Add event listeners to notify the JavaScript channels when the video plays and pauses.
+    if (await videoWebViewController.currentUrl() != videoUrl) return;
     try {
-      controller?.runJavascript(
-          'document.getElementsByTagName("video")[0].addEventListener("pause", () => VideoPause.postMessage("video paused"));');
-      controller?.runJavascript(
-          'document.getElementsByTagName("video")[0].addEventListener("playing", () => VideoPlaying.postMessage("video playing"));');
+      await videoWebViewController.runJavaScript(_kInitVideoJs);
+      if (!settingsStore.showOverlay) return;
+      await _hideDefaultOverlay();
+      // Start latency tracking if either showLatency (user-visible) or
+      // autoSyncChatDelay (needs latency to sync chat) is enabled.
+      if (settingsStore.showLatency || settingsStore.autoSyncChatDelay) {
+        await _listenOnLatencyChanges();
+      }
+      await updateStreamQualities();
     } catch (e) {
       debugPrint(e.toString());
     }
+  }
 
-    // Determine whether the device is an iPad or not.
-    // Used to show or hide the rotate button on the overlay.
-    // Flutter doesn't allow programmatic rotation on iPad unless multitasking is disabled.
-    if (Platform.isIOS) {
-      final deviceInfo = DeviceInfoPlugin();
-      final info = await deviceInfo.iosInfo;
-      if (info.model?.toLowerCase().contains('ipad') == true) {
-        _isIPad = true;
-      } else {
-        _isIPad = false;
-      }
+  /// Injects [assets/js/vaft.user.js] (TwitchAdSolutions) into the player page.
+  Future<void> _injectVaftUserScript() async {
+    try {
+      final raw = await rootBundle.loadString('assets/js/vaft.user.js');
+      // Strip UserScript metadata; keep the IIFE body.
+      final script = raw.replaceFirst(
+        RegExp(r'^[\s\S]*?==/UserScript==\s*', multiLine: true),
+        '',
+      );
+      await videoWebViewController.runJavaScript(script);
+      debugPrint('VideoStore: injected TwitchAdSolutions vaft');
+    } catch (e) {
+      debugPrint('VideoStore: vaft inject failed: $e');
     }
   }
 
   /// Called whenever the video/overlay is tapped.
+  @override
   @action
   void handleVideoTap() {
-    _overlayTimer.cancel();
+    if (_isInPipMode) {
+      _overlayVisible = true;
+      return;
+    }
+
+    _overlayTimer?.cancel();
 
     if (_overlayVisible) {
       _overlayVisible = false;
+      // Notify latency tracker to pause when overlay hidden
+      _updateLatencyTrackerVisibility(false);
     } else {
-      updateStreamInfo();
+      updateStreamInfo(forceUpdate: true);
 
       _overlayVisible = true;
-      _overlayTimer =
-          Timer(const Duration(seconds: 5), () => _overlayVisible = false);
+      // Notify latency tracker to resume when overlay visible
+      _updateLatencyTrackerVisibility(true);
+      _scheduleOverlayHide();
     }
   }
 
+  /// Starts the periodic stream info timer for chat-only mode.
+  void _startStreamInfoTimer() {
+    // Only start if not already active
+    if (_streamInfoTimer?.isActive != true) {
+      _streamInfoTimer = Timer.periodic(
+        VideoTimingConstants.webviewStreamInfoInterval,
+        (_) => updateStreamInfo(),
+      );
+    }
+  }
+
+  /// Stops the periodic stream info timer.
+  void _stopStreamInfoTimer() {
+    if (_streamInfoTimer?.isActive == true) {
+      _streamInfoTimer?.cancel();
+      _streamInfoTimer = null;
+    }
+  }
+
+  void _startJsCleanupTimer() {
+    if (_jsCleanupTimer?.isActive == true) return;
+
+    _jsCleanupTimer = Timer.periodic(
+      VideoTimingConstants.jsCleanupInterval,
+      (_) => _performJsSoftReset(),
+    );
+  }
+
+  void _stopJsCleanupTimer() {
+    _jsCleanupTimer?.cancel();
+    _jsCleanupTimer = null;
+  }
+
+  void _scheduleOverlayHide([
+    Duration delay = VideoTimingConstants.overlayAutoHide,
+  ]) {
+    _overlayTimer?.cancel();
+
+    if (_isInPipMode) {
+      _overlayVisible = true;
+      return;
+    }
+
+    _overlayTimer = Timer(delay, () {
+      if (_isInPipMode) return;
+
+      runInAction(() {
+        _overlayVisible = false;
+      });
+      // Notify latency tracker to pause when overlay auto-hides
+      _updateLatencyTrackerVisibility(false);
+    });
+  }
+
+  @override
+  @action
+  void handleAndroidPipChanged(bool isInPip) => _setPipActive(isInPip);
+
+  /// Shared PiP enter/exit state machine.
+  ///
+  /// Driven by the Android activity callback and, on iOS, by the web PiP API
+  /// events posted from the page. Android previously reached neither — the
+  /// callback was routed only to the native store — so `_isInPipMode` stayed
+  /// false for the whole PiP session and the overlay kept auto-hiding.
+  @action
+  void _setPipActive(bool isInPip) {
+    if (isInPip == _isInPipMode) return;
+
+    if (isInPip) {
+      _overlayWasVisibleBeforePip = _overlayVisible;
+      _isInPipMode = true;
+      _overlayTimer?.cancel();
+      _overlayVisible = true;
+    } else {
+      _isInPipMode = false;
+      if (_overlayWasVisibleBeforePip) {
+        _updateLatencyTrackerVisibility(true);
+        _scheduleOverlayHide();
+      } else {
+        _overlayVisible = false;
+        _updateLatencyTrackerVisibility(false);
+      }
+    }
+  }
+
+  /// Resumes playback when the page paused itself rather than the user doing
+  /// it. Safe to call spuriously — `play()` on an already-playing element is
+  /// a no-op.
+  ///
+  /// Deliberately not called on PiP transitions: Twitch's embed refuses to
+  /// play below 400x300 CSS pixels, and an Android PiP window is far under
+  /// that, so a resume there is rejected no matter what we do.
+  void _resumeIfSuspended() {
+    if (!settingsStore.showVideo || !_paused || _userPaused) return;
+    try {
+      videoWebViewController.runJavaScript(
+        '(window._videoEl || document.getElementsByTagName("video")[0])?.play();',
+      );
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  /// Handles the app returning to the foreground.
+  ///
+  /// In chat-only mode this just refreshes the stream info. In video mode it
+  /// also resumes playback if the page paused itself while backgrounded —
+  /// the webview can be suspended when detached from the window and has no
+  /// way to restart on its own, which previously left the player dead until
+  /// a manual refresh. A pause the user asked for is left alone.
+  @override
+  @action
+  void handleAppResume() {
+    if (!settingsStore.showVideo) {
+      updateStreamInfo(forceUpdate: true);
+      return;
+    }
+
+    _resumeIfSuspended();
+  }
+
   /// Updates the stream info from the Twitch API.
   ///
-  /// If the stream is offline, disables the overlay.
+  /// If the stream is offline, fetches channel information to show offline details.
+  /// Set [forceUpdate] to true to bypass the rate limiting check.
+  @override
   @action
-  Future<void> updateStreamInfo() async {
-    try {
-      _streamInfo = await twitchApi.getStream(
-          userLogin: userLogin, headers: authStore.headersTwitch);
-    } catch (e) {
-      debugPrint(e.toString());
-
-      _overlayTimer.cancel();
+  Future<void> updateStreamInfo({bool forceUpdate = false}) async {
+    final result = await _streamInfoPoller.fetch(forceUpdate: forceUpdate);
+    if (result == null) return;
+    runInAction(() {
+      if (result.stream != null) {
+        _streamInfo = result.stream;
+        _offlineChannelInfo = null;
+        return;
+      }
+      _overlayTimer?.cancel();
+      _loading = false;
       _streamInfo = null;
       _paused = true;
-    }
+      _offlineChannelInfo = result.offlineChannel;
+      // Restart overlay timer in chat-only mode even on error
+      if (!settingsStore.showVideo) {
+        _scheduleOverlayHide();
+      }
+    });
   }
 
   /// Handles the toggle overlay options.
   ///
   /// The toggle overlay option allows switching between the custom and Twitch's overlay by long-pressing the overlay.
+  @override
   @action
   void handleToggleOverlay() {
     if (settingsStore.toggleableOverlay) {
@@ -190,31 +854,56 @@ abstract class VideoStoreBase with Store {
 
       if (settingsStore.showOverlay) {
         _overlayVisible = true;
-
-        _overlayTimer.cancel();
-        _overlayTimer =
-            Timer(const Duration(seconds: 3), () => _overlayVisible = false);
+        _scheduleOverlayHide(VideoTimingConstants.overlayQuickHide);
       }
     }
+
+    // Stream info timer is managed automatically by the video mode reaction
   }
 
   /// Refreshes the stream webview and updates the stream info.
+  @override
   @action
-  void handleRefresh() {
+  Future<void> handleRefresh() async {
     HapticFeedback.lightImpact();
-    controller?.reload();
+    _loading = true;
+    _paused = true;
+    _userPaused = false;
+    _firstTimeSettingQuality = true;
+    _highLatencyCount = 0;
+    _isInPipMode = false;
+    _latency = null;
+    _availableStreamQualities = [];
+
+    _overlayTimer?.cancel();
+    _scheduleOverlayHide();
+
+    // Belt-and-braces: onPageStarted re-arms this for the loadRequest below
+    // too, but don't depend on the delegate firing for an explicit refresh.
+    _needsInit = true;
+
+    _stopLatencyTracker();
+
+    await videoWebViewController.loadRequest(Uri.parse(videoUrl));
+
     updateStreamInfo();
   }
 
   /// Play or pause the video depending on the current state of [_paused].
+  @override
   void handlePausePlay() {
+    // Remember the user's intent so handleAppResume knows whether a pause is
+    // theirs or something the page did to itself.
+    _userPaused = !_paused;
     try {
       if (_paused) {
-        controller?.runJavascript(
-            'document.getElementsByTagName("video")[0].play();');
+        videoWebViewController.runJavaScript(
+          '(window._videoEl || document.getElementsByTagName("video")[0])?.play();',
+        );
       } else {
-        controller?.runJavascript(
-            'document.getElementsByTagName("video")[0].pause();');
+        videoWebViewController.runJavaScript(
+          '(window._videoEl || document.getElementsByTagName("video")[0])?.pause();',
+        );
       }
     } catch (e) {
       debugPrint(e.toString());
@@ -225,19 +914,49 @@ abstract class VideoStoreBase with Store {
   ///
   /// On Android, this will utilize the native Android PiP API.
   /// On iOS, this will utilize the web picture-in-picture API.
+  @override
   void requestPictureInPicture() {
     try {
       if (Platform.isAndroid) {
         pip.enterPipMode(autoEnter: true);
       } else if (Platform.isIOS) {
-        controller?.runJavascript(
-            'document.getElementsByTagName("video")[0].requestPictureInPicture();');
+        videoWebViewController.runJavaScript(
+          '(window._videoEl || document.getElementsByTagName("video")[0])?.requestPictureInPicture();',
+        );
       }
     } catch (e) {
       debugPrint(e.toString());
     }
   }
 
+  /// Toggle picture-in-picture mode.
+  ///
+  /// If not in PiP mode, enters PiP mode.
+  /// If already in PiP mode on iOS, exits PiP mode.
+  /// On Android, always enters PiP mode (no programmatic exit or state tracking).
+  @override
+  @action
+  void togglePictureInPicture() {
+    try {
+      if (Platform.isIOS && _isInPipMode) {
+        // Exit PiP mode on iOS
+        videoWebViewController.runJavaScript('''
+          (function() {
+            if (document.pictureInPictureElement) {
+              document.exitPictureInPicture();
+            }
+          })();
+          ''');
+      } else {
+        // Enter PiP mode (both iOS and Android)
+        requestPictureInPicture();
+      }
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  @override
   @action
   void dispose() {
     // Disable auto PiP when leaving so that we don't enter PiP on other screens.
@@ -247,10 +966,294 @@ abstract class VideoStoreBase with Store {
       });
     }
 
-    // Not ideal, but seems like the only way of disposing of the video properly.
-    // Will both prevent the video from continuing to play when dismissed and closes PiP on iOS.
-    if (Platform.isIOS) controller?.reload();
+    _overlayTimer?.cancel();
+    _streamInfoTimer?.cancel();
+    _jsCleanupTimer?.cancel();
 
     _disposeOverlayReaction();
+    _disposeVideoModeReaction();
+    _disposeAndroidAutoPipReaction?.call();
+    _disposeLatencySettingsReaction?.call();
+
+    // Explicitly stop latency tracker as defense-in-depth.
+    // The Video widget also loads about:blank during disposal which clears
+    // all JavaScript state, but this provides an extra safety layer.
+    _stopLatencyTracker();
   }
 }
+
+// ---------------------------------------------------------------------------
+// JS templates evaluated inside the Twitch player WebView.
+// These are at the end of the file so the Dart code above stays readable.
+// ---------------------------------------------------------------------------
+
+/// Bootstraps the Twitch player iframe: promise queue, async query selector,
+/// and play/pause/PiP event listeners that post back through Flutter's
+/// JavaScriptChannels. Run once per page load from [VideoStoreBase.initVideo].
+const _kInitVideoJs = r'''
+  // Promise queue with length limit and generation tracking
+  // Generation tracking prevents counter from going negative when queue resets
+  window._PROMISE_QUEUE = Promise.resolve();
+  window._promiseQueueLength = 0;
+  window._promiseQueueGen = 0;
+
+  window._queuePromise = (method) => {
+    window._promiseQueueLength++;
+
+    // Reset queue if it gets too long (prevents memory accumulation)
+    if (window._promiseQueueLength > 30) {
+      window._PROMISE_QUEUE = Promise.resolve();
+      window._promiseQueueLength = 1;
+      window._promiseQueueGen++;
+    }
+
+    const myGen = window._promiseQueueGen;
+
+    window._PROMISE_QUEUE = window._PROMISE_QUEUE.then(async () => {
+      try {
+        await method();
+      } catch (e) {
+        console.warn('Queue promise error:', e);
+      } finally {
+        // Only decrement if still same generation (not reset)
+        if (myGen === window._promiseQueueGen) {
+          window._promiseQueueLength--;
+        }
+      }
+    });
+
+    return window._PROMISE_QUEUE;
+  };
+  window._asyncQuerySelector = (selector, timeout = 10000) => new Promise((resolve) => {
+    let element = document.querySelector(selector);
+    if (element) {
+      return resolve(element);
+    }
+
+    let timeoutId;
+    const observer = new MutationObserver(() => {
+      element = document.querySelector(selector);
+      if (element) {
+        observer.disconnect();
+        clearTimeout(timeoutId);
+        resolve(element);
+      }
+    });
+    // Must use subtree to detect nested elements in the player
+    observer.observe(document.body, { childList: true, subtree: true });
+
+    // Always set timeout with default of 10 seconds
+    timeoutId = setTimeout(() => {
+      observer.disconnect();
+      resolve(undefined);
+    }, timeout);
+  });
+
+  _queuePromise(async () => {
+    const videoElement = await _asyncQuerySelector("video");
+
+    // Null check in case element was not found within timeout
+    if (!videoElement) {
+      console.warn("Video element not found within timeout");
+      return;
+    }
+
+    // Cache for reuse in play/pause/PiP calls
+    window._videoEl = videoElement;
+
+    // Prevent duplicate event listener registration
+    if (!videoElement._listenersAdded) {
+      videoElement._listenersAdded = true;
+
+      videoElement.addEventListener("pause", () => {
+        VideoPause.postMessage("video paused");
+        if (videoElement.textTracks && videoElement.textTracks.length > 0) {
+          videoElement.textTracks[0].mode = "hidden";
+        }
+      });
+      videoElement.addEventListener("playing", () => {
+        VideoPlaying.postMessage("video playing");
+        // Ensure video is unmuted and captions are hidden
+        videoElement.muted = false;
+        videoElement.volume = 1.0;
+        if (videoElement.textTracks && videoElement.textTracks.length > 0) {
+          videoElement.textTracks[0].mode = "hidden";
+        }
+      });
+
+      // Add PiP event listeners for iOS
+      videoElement.addEventListener("enterpictureinpicture", () => {
+        PipEntered.postMessage("pip entered");
+      });
+      videoElement.addEventListener("leavepictureinpicture", () => {
+        PipExited.postMessage("pip exited");
+      });
+    }
+
+    if (!videoElement.paused) {
+      VideoPlaying.postMessage("video playing");
+      // Ensure video is unmuted and captions are hidden
+      videoElement.muted = false;
+      videoElement.volume = 1.0;
+      if (videoElement.textTracks && videoElement.textTracks.length > 0) {
+        videoElement.textTracks[0].mode = "hidden";
+      }
+    }
+
+    // Explicitly attempt autoplay in case the player loaded paused
+    try { await videoElement.play(); } catch (e) {}
+  });
+''';
+
+/// Periodic latency-tracker state machine running inside the Twitch player
+/// WebView. Opens the stats panel, reads "Latency To Broadcaster", posts the
+/// value through the `Latency` JavaScriptChannel, and closes the panel.
+/// Pauses its cycle when the overlay is hidden (saves CPU).
+const _kLatencyTrackerJs = r'''
+  window._latencyTracker ??= {
+    CYCLE_INTERVAL: 60000,
+    STATS_ACTIVE_TIME: 1500,
+    INITIAL_RETRY_INTERVAL: 3000,
+    MAX_INITIAL_RETRIES: 4,
+
+    cycleCount: 0,
+    hasInitialLatency: false,
+    timeoutId: null,
+    isRunning: false,
+    overlayVisible: true,
+    isCycling: false,
+
+    init() {
+      if (this.isRunning) return;
+      this.isRunning = true;
+      if (!this.isCycling && !this.timeoutId) {
+        this._cycle();
+      }
+    },
+
+    stop() {
+      this.isRunning = false;
+      if (this.timeoutId) {
+        clearTimeout(this.timeoutId);
+        this.timeoutId = null;
+      }
+    },
+
+    setOverlayVisible(visible) {
+      this.overlayVisible = visible;
+      // Resume immediately when overlay becomes visible
+      if (visible && this.isRunning && !this.isCycling && !this.timeoutId) {
+        this._cycle();
+      }
+    },
+
+    async _cycle() {
+      if (this.isCycling) return;
+      this.isCycling = true;
+
+      try {
+        // Clear timeout ID synchronously at entry to prevent race conditions
+        // (e.g., setOverlayVisible calling _cycle while timeout is firing)
+        const currentTimeoutId = this.timeoutId;
+        this.timeoutId = null;
+        if (currentTimeoutId) {
+          clearTimeout(currentTimeoutId);
+        }
+
+        if (!this.isRunning) return;
+
+        // Skip cycle entirely if overlay not visible - major CPU savings
+        if (!this.overlayVisible) {
+          this.timeoutId = setTimeout(() => this._cycle(), 5000);
+          return;
+        }
+
+        // Defer if another operation (e.g., quality selection) is using the settings menu
+        if (window._promiseQueueLength > 0) {
+          this.timeoutId = setTimeout(() => this._cycle(), 2000);
+          return;
+        }
+
+        this.cycleCount++;
+        const cycleStart = Date.now();
+
+        await this._setStatsEnabled(true);
+
+        // Wait longer on first cycle for stats to populate
+        const waitTime = this.cycleCount === 1 ? 3000 : this.STATS_ACTIVE_TIME;
+        await new Promise(resolve => setTimeout(resolve, waitTime));
+
+        this._readLatency();
+        await this._setStatsEnabled(false);
+
+        if (!this.isRunning) return;
+
+        const totalActiveTime = Date.now() - cycleStart;
+
+        // Calculate next interval
+        let nextInterval;
+        if (!this.hasInitialLatency && this.cycleCount < this.MAX_INITIAL_RETRIES) {
+          nextInterval = this.INITIAL_RETRY_INTERVAL;
+        } else {
+          nextInterval = this.CYCLE_INTERVAL - totalActiveTime;
+        }
+
+        // Schedule next cycle
+        this.timeoutId = setTimeout(() => this._cycle(), Math.max(nextInterval, 1000));
+      } finally {
+        this.isCycling = false;
+      }
+    },
+
+    async _setStatsEnabled(enable) {
+      try {
+        await _queuePromise(async () => {
+          const settingsBtn = await _asyncQuerySelector('[data-a-target="player-settings-button"]');
+          if (!settingsBtn) return;
+          settingsBtn.click();
+
+          const advancedItem = await _asyncQuerySelector('[data-a-target="player-settings-menu-item-advanced"]');
+          if (!advancedItem) {
+            settingsBtn.click();
+            return;
+          }
+          advancedItem.click();
+
+          const statsCheckbox = await _asyncQuerySelector('[data-a-target="player-settings-submenu-advanced-video-stats"] input');
+          if (statsCheckbox && statsCheckbox.checked !== enable) {
+            statsCheckbox.click();
+          }
+
+          settingsBtn.click();
+        });
+      } catch (error) {
+        // Silently fail - stats panel may not be available
+      }
+    },
+
+    _readLatency() {
+      try {
+        const latencyElement = document.querySelector('[aria-label="Latency To Broadcaster"]');
+        if (latencyElement && latencyElement.textContent) {
+          let latencyText = latencyElement.textContent.trim();
+
+          // Convert to whole number with abbreviated unit: "4.69 sec." -> "5s"
+          const match = latencyText.match(/([0-9.]+)\s*sec/i);
+          if (match) {
+            const rounded = Math.round(parseFloat(match[1]));
+            latencyText = rounded + 's';
+            this.hasInitialLatency = true;
+          }
+
+          if (window.Latency) {
+            Latency.postMessage(latencyText);
+          }
+        }
+      } catch (error) {
+        // Silently fail
+      }
+    }
+  };
+
+  window._latencyTracker.init();
+''';
diff --git a/lib/screens/channel/video/video_store.g.dart b/lib/screens/channel/video/video_store.g.dart
index 549f0cfc..13e704fc 100644
--- a/lib/screens/channel/video/video_store.g.dart
+++ b/lib/screens/channel/video/video_store.g.dart
@@ -9,16 +9,30 @@ part of 'video_store.dart';
 // ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
 
 mixin _$VideoStore on VideoStoreBase, Store {
-  Computed<String>? _$videoUrlComputed;
+  late final _$_loadingAtom = Atom(
+    name: 'VideoStoreBase._loading',
+    context: context,
+  );
+
+  bool get loading {
+    _$_loadingAtom.reportRead();
+    return super._loading;
+  }
 
   @override
-  String get videoUrl =>
-      (_$videoUrlComputed ??= Computed<String>(() => super.videoUrl,
-              name: 'VideoStoreBase.videoUrl'))
-          .value;
+  bool get _loading => loading;
 
-  late final _$_pausedAtom =
-      Atom(name: 'VideoStoreBase._paused', context: context);
+  @override
+  set _loading(bool value) {
+    _$_loadingAtom.reportWrite(value, super._loading, () {
+      super._loading = value;
+    });
+  }
+
+  late final _$_pausedAtom = Atom(
+    name: 'VideoStoreBase._paused',
+    context: context,
+  );
 
   bool get paused {
     _$_pausedAtom.reportRead();
@@ -35,8 +49,10 @@ mixin _$VideoStore on VideoStoreBase, Store {
     });
   }
 
-  late final _$_overlayVisibleAtom =
-      Atom(name: 'VideoStoreBase._overlayVisible', context: context);
+  late final _$_overlayVisibleAtom = Atom(
+    name: 'VideoStoreBase._overlayVisible',
+    context: context,
+  );
 
   bool get overlayVisible {
     _$_overlayVisibleAtom.reportRead();
@@ -53,26 +69,10 @@ mixin _$VideoStore on VideoStoreBase, Store {
     });
   }
 
-  late final _$_isIPadAtom =
-      Atom(name: 'VideoStoreBase._isIPad', context: context);
-
-  bool get isIPad {
-    _$_isIPadAtom.reportRead();
-    return super._isIPad;
-  }
-
-  @override
-  bool get _isIPad => isIPad;
-
-  @override
-  set _isIPad(bool value) {
-    _$_isIPadAtom.reportWrite(value, super._isIPad, () {
-      super._isIPad = value;
-    });
-  }
-
-  late final _$_streamInfoAtom =
-      Atom(name: 'VideoStoreBase._streamInfo', context: context);
+  late final _$_streamInfoAtom = Atom(
+    name: 'VideoStoreBase._streamInfo',
+    context: context,
+  );
 
   StreamTwitch? get streamInfo {
     _$_streamInfoAtom.reportRead();
@@ -89,29 +89,188 @@ mixin _$VideoStore on VideoStoreBase, Store {
     });
   }
 
-  late final _$initVideoAsyncAction =
-      AsyncAction('VideoStoreBase.initVideo', context: context);
+  late final _$_offlineChannelInfoAtom = Atom(
+    name: 'VideoStoreBase._offlineChannelInfo',
+    context: context,
+  );
+
+  Channel? get offlineChannelInfo {
+    _$_offlineChannelInfoAtom.reportRead();
+    return super._offlineChannelInfo;
+  }
+
+  @override
+  Channel? get _offlineChannelInfo => offlineChannelInfo;
+
+  @override
+  set _offlineChannelInfo(Channel? value) {
+    _$_offlineChannelInfoAtom.reportWrite(value, super._offlineChannelInfo, () {
+      super._offlineChannelInfo = value;
+    });
+  }
+
+  late final _$_availableStreamQualitiesAtom = Atom(
+    name: 'VideoStoreBase._availableStreamQualities',
+    context: context,
+  );
+
+  List<String> get availableStreamQualities {
+    _$_availableStreamQualitiesAtom.reportRead();
+    return super._availableStreamQualities;
+  }
+
+  @override
+  List<String> get _availableStreamQualities => availableStreamQualities;
+
+  @override
+  set _availableStreamQualities(List<String> value) {
+    _$_availableStreamQualitiesAtom.reportWrite(
+      value,
+      super._availableStreamQualities,
+      () {
+        super._availableStreamQualities = value;
+      },
+    );
+  }
+
+  late final _$_streamQualityIndexAtom = Atom(
+    name: 'VideoStoreBase._streamQualityIndex',
+    context: context,
+  );
+
+  int get streamQualityIndex {
+    _$_streamQualityIndexAtom.reportRead();
+    return super._streamQualityIndex;
+  }
+
+  @override
+  int get _streamQualityIndex => streamQualityIndex;
+
+  @override
+  set _streamQualityIndex(int value) {
+    _$_streamQualityIndexAtom.reportWrite(value, super._streamQualityIndex, () {
+      super._streamQualityIndex = value;
+    });
+  }
+
+  late final _$_latencyAtom = Atom(
+    name: 'VideoStoreBase._latency',
+    context: context,
+  );
+
+  String? get latency {
+    _$_latencyAtom.reportRead();
+    return super._latency;
+  }
+
+  @override
+  String? get _latency => latency;
+
+  @override
+  set _latency(String? value) {
+    _$_latencyAtom.reportWrite(value, super._latency, () {
+      super._latency = value;
+    });
+  }
+
+  late final _$_isInPipModeAtom = Atom(
+    name: 'VideoStoreBase._isInPipMode',
+    context: context,
+  );
+
+  bool get isInPipMode {
+    _$_isInPipModeAtom.reportRead();
+    return super._isInPipMode;
+  }
+
+  @override
+  bool get _isInPipMode => isInPipMode;
+
+  @override
+  set _isInPipMode(bool value) {
+    _$_isInPipModeAtom.reportWrite(value, super._isInPipMode, () {
+      super._isInPipMode = value;
+    });
+  }
+
+  late final _$updateStreamQualitiesAsyncAction = AsyncAction(
+    'VideoStoreBase.updateStreamQualities',
+    context: context,
+  );
+
+  @override
+  Future<void> updateStreamQualities() {
+    return _$updateStreamQualitiesAsyncAction.run(
+      () => super.updateStreamQualities(),
+    );
+  }
+
+  late final _$setStreamQualityAsyncAction = AsyncAction(
+    'VideoStoreBase.setStreamQuality',
+    context: context,
+  );
+
+  @override
+  Future<void> setStreamQuality(String newStreamQuality) {
+    return _$setStreamQualityAsyncAction.run(
+      () => super.setStreamQuality(newStreamQuality),
+    );
+  }
+
+  late final _$_setStreamQualityIndexAsyncAction = AsyncAction(
+    'VideoStoreBase._setStreamQualityIndex',
+    context: context,
+  );
+
+  @override
+  Future<void> _setStreamQualityIndex(int newStreamQualityIndex) {
+    return _$_setStreamQualityIndexAsyncAction.run(
+      () => super._setStreamQualityIndex(newStreamQualityIndex),
+    );
+  }
+
+  late final _$initVideoAsyncAction = AsyncAction(
+    'VideoStoreBase.initVideo',
+    context: context,
+  );
 
   @override
   Future<void> initVideo() {
     return _$initVideoAsyncAction.run(() => super.initVideo());
   }
 
-  late final _$updateStreamInfoAsyncAction =
-      AsyncAction('VideoStoreBase.updateStreamInfo', context: context);
+  late final _$updateStreamInfoAsyncAction = AsyncAction(
+    'VideoStoreBase.updateStreamInfo',
+    context: context,
+  );
 
   @override
-  Future<void> updateStreamInfo() {
-    return _$updateStreamInfoAsyncAction.run(() => super.updateStreamInfo());
+  Future<void> updateStreamInfo({bool forceUpdate = false}) {
+    return _$updateStreamInfoAsyncAction.run(
+      () => super.updateStreamInfo(forceUpdate: forceUpdate),
+    );
   }
 
-  late final _$VideoStoreBaseActionController =
-      ActionController(name: 'VideoStoreBase', context: context);
+  late final _$handleRefreshAsyncAction = AsyncAction(
+    'VideoStoreBase.handleRefresh',
+    context: context,
+  );
+
+  @override
+  Future<void> handleRefresh() {
+    return _$handleRefreshAsyncAction.run(() => super.handleRefresh());
+  }
+
+  late final _$VideoStoreBaseActionController = ActionController(
+    name: 'VideoStoreBase',
+    context: context,
+  );
 
   @override
   void handleVideoTap() {
     final _$actionInfo = _$VideoStoreBaseActionController.startAction(
-        name: 'VideoStoreBase.handleVideoTap');
+      name: 'VideoStoreBase.handleVideoTap',
+    );
     try {
       return super.handleVideoTap();
     } finally {
@@ -119,10 +278,47 @@ mixin _$VideoStore on VideoStoreBase, Store {
     }
   }
 
+  @override
+  void handleAndroidPipChanged(bool isInPip) {
+    final _$actionInfo = _$VideoStoreBaseActionController.startAction(
+      name: 'VideoStoreBase.handleAndroidPipChanged',
+    );
+    try {
+      return super.handleAndroidPipChanged(isInPip);
+    } finally {
+      _$VideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void _setPipActive(bool isInPip) {
+    final _$actionInfo = _$VideoStoreBaseActionController.startAction(
+      name: 'VideoStoreBase._setPipActive',
+    );
+    try {
+      return super._setPipActive(isInPip);
+    } finally {
+      _$VideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
+  @override
+  void handleAppResume() {
+    final _$actionInfo = _$VideoStoreBaseActionController.startAction(
+      name: 'VideoStoreBase.handleAppResume',
+    );
+    try {
+      return super.handleAppResume();
+    } finally {
+      _$VideoStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
   @override
   void handleToggleOverlay() {
     final _$actionInfo = _$VideoStoreBaseActionController.startAction(
-        name: 'VideoStoreBase.handleToggleOverlay');
+      name: 'VideoStoreBase.handleToggleOverlay',
+    );
     try {
       return super.handleToggleOverlay();
     } finally {
@@ -131,11 +327,12 @@ mixin _$VideoStore on VideoStoreBase, Store {
   }
 
   @override
-  void handleRefresh() {
+  void togglePictureInPicture() {
     final _$actionInfo = _$VideoStoreBaseActionController.startAction(
-        name: 'VideoStoreBase.handleRefresh');
+      name: 'VideoStoreBase.togglePictureInPicture',
+    );
     try {
-      return super.handleRefresh();
+      return super.togglePictureInPicture();
     } finally {
       _$VideoStoreBaseActionController.endAction(_$actionInfo);
     }
@@ -144,7 +341,8 @@ mixin _$VideoStore on VideoStoreBase, Store {
   @override
   void dispose() {
     final _$actionInfo = _$VideoStoreBaseActionController.startAction(
-        name: 'VideoStoreBase.dispose');
+      name: 'VideoStoreBase.dispose',
+    );
     try {
       return super.dispose();
     } finally {
@@ -155,7 +353,7 @@ mixin _$VideoStore on VideoStoreBase, Store {
   @override
   String toString() {
     return '''
-videoUrl: ${videoUrl}
+
     ''';
   }
 }
diff --git a/lib/screens/channel/video/video_timing_constants.dart b/lib/screens/channel/video/video_timing_constants.dart
new file mode 100644
index 00000000..3fe54344
--- /dev/null
+++ b/lib/screens/channel/video/video_timing_constants.dart
@@ -0,0 +1,67 @@
+/// Named durations and counts used by the video player stores.
+/// Central owner so tuning values don't have to be hunted across files.
+class VideoTimingConstants {
+  VideoTimingConstants._();
+
+  // Stall recovery
+  //
+  // Cross-layer ordering contract: iOS's native notification-stall recovery
+  // fires at ~1s, this Dart timer at 8s, and the Android native watchdog
+  // (VideoPlayerObserver.kt STALL_WATCHDOG_MS) at 12s. Correctness depends
+  // on 1s < stallDetectionDelay < 12s — Dart's attempt-1 seek must pre-empt
+  // the Android watchdog's heavier stop()/prepare() recovery, and iOS has
+  // no native watchdog so the Dart timer is the only recoverer for silent
+  // rate-drops there. Don't tune past either neighbor.
+  static const stallDetectionDelay = Duration(seconds: 8);
+  static const initRetryDelay = Duration(seconds: 3);
+  static const int maxRefreshAttempts = 3;
+
+  /// Delay between stall-recovery full refreshes, indexed by attempt number
+  /// (0 = first attempt). Attempts beyond the list length fall through to
+  /// the error path via [maxRefreshAttempts].
+  static const refreshBackoff = <Duration>[
+    Duration.zero,
+    Duration(seconds: 3),
+    Duration(seconds: 8),
+  ];
+
+  /// A "play" event arriving within this window after a previous one is
+  /// treated as a failed-recovery bounce rather than a fresh successful start.
+  static const shortPlayWindow = Duration(seconds: 10);
+  /// Number of short-play bounces required before surfacing a tailored error.
+  static const int shortPlayLoopThreshold = 3;
+
+  // Latency / chat sync
+  static const latencyPollingInterval = Duration(seconds: 3);
+  static const int highLatencyThresholdSeconds = 30;
+  static const int chatSyncDriftToleranceSeconds = 2;
+
+  /// Maximum consecutive high-latency interventions (seek/refresh) before
+  /// giving up on latency-driven recovery. Persistent high readings usually
+  /// mean device clock skew or a device that can't keep up — looping
+  /// recoveries forever makes playback worse, not better.
+  static const int maxHighLatencyRecoveries = 3;
+
+  /// How long a quality switch may suppress stall classification before the
+  /// flag expires. A resolution-only switch never interrupts playback, so no
+  /// play/pause event arrives to clear it — without this backstop the flag
+  /// sticks for the whole session and disables stall recovery.
+  static const qualitySwitchGrace = Duration(seconds: 5);
+
+  /// Delay before re-checking /streams when the first check reports offline.
+  /// Helix transiently drops live streams from results; a single failed
+  /// check isn't enough to tear down healthy playback.
+  static const offlineConfirmationDelay = Duration(seconds: 2);
+
+  // Overlay
+  static const overlayAutoHide = Duration(seconds: 5);
+  static const overlayQuickHide = Duration(seconds: 3);
+
+  // Stream info
+  static const streamInfoDebounce = Duration(seconds: 5);
+  static const webviewStreamInfoInterval = Duration(minutes: 1);
+  static const nativeStreamInfoInterval = Duration(seconds: 30);
+
+  // WebView housekeeping
+  static const jsCleanupInterval = Duration(minutes: 10);
+}
diff --git a/lib/screens/home/home.dart b/lib/screens/home/home.dart
index 1e160bcc..64c32616 100644
--- a/lib/screens/home/home.dart
+++ b/lib/screens/home/home.dart
@@ -9,10 +9,15 @@ import 'package:frosty/screens/home/top/top.dart';
 import 'package:frosty/screens/settings/settings.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/screens/settings/widgets/release_notes.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/profile_picture.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class Home extends StatefulWidget {
-  const Home({Key? key}) : super(key: key);
+  const Home({super.key});
 
   @override
   State<Home> createState() => _HomeState();
@@ -23,15 +28,73 @@ class _HomeState extends State<Home> {
 
   late final _homeStore = HomeStore(authStore: _authStore);
 
+  Future<void> checkAndShowReleaseNotes() async {
+    final packageInfo = await PackageInfo.fromPlatform();
+    final prefs = await SharedPreferences.getInstance();
+
+    final currentVersion = packageInfo.version;
+    final storedVersion = prefs.getString('last_shown_version');
+
+    // Extract major.minor version (ignore patch)
+    final currentMajorMinor = currentVersion.split('.').take(2).join('.');
+    final storedMajorMinor = storedVersion?.split('.').take(2).join('.');
+
+    if (storedMajorMinor == null || storedMajorMinor != currentMajorMinor) {
+      if (!mounted) return;
+
+      Navigator.push(
+        context,
+        MaterialPageRoute(
+          settings: const RouteSettings(name: ReleaseNotes.routeName),
+          builder: (context) => const ReleaseNotes(),
+        ),
+      ).then((_) => prefs.setString('last_shown_version', currentVersion));
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    SystemChrome.setPreferredOrientations([]);
+    checkAndShowReleaseNotes();
+  }
+
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([]);
+    final theme = Theme.of(context);
 
     return GestureDetector(
       onTap: FocusScope.of(context).unfocus,
       child: Scaffold(
+        backgroundColor: theme.scaffoldBackgroundColor,
+        extendBody: true,
+        extendBodyBehindAppBar: true,
         appBar: AppBar(
           centerTitle: false,
+          elevation: 0,
+          backgroundColor: Colors.transparent,
+          surfaceTintColor: Colors.transparent,
+          titleSpacing: 16,
+          systemOverlayStyle: SystemUiOverlayStyle(
+            statusBarColor: Colors.transparent,
+            statusBarIconBrightness: theme.brightness == Brightness.dark
+                ? Brightness.light
+                : Brightness.dark,
+          ),
+          flexibleSpace: Observer(
+            builder: (_) {
+              // Only show flexible space on Following tab (when logged in)
+              final isOnFollowingTab =
+                  _authStore.isLoggedIn && _homeStore.selectedIndex == 0;
+
+              if (!isOnFollowingTab) return const SizedBox.shrink();
+
+              return BlurredContainer(
+                gradientDirection: GradientDirection.up,
+                child: const SizedBox.expand(),
+              );
+            },
+          ),
           title: Observer(
             builder: (_) {
               final titles = [
@@ -44,67 +107,111 @@ class _HomeState extends State<Home> {
             },
           ),
           actions: [
-            IconButton(
-              tooltip: 'Settings',
-              icon: const Icon(Icons.settings_rounded),
-              onPressed: () => Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) =>
-                      Settings(settingsStore: context.read<SettingsStore>()),
-                ),
-              ),
-            )
+            Observer(
+              builder: (_) {
+                final isLoggedIn =
+                    _authStore.isLoggedIn && _authStore.user.details != null;
+                return Padding(
+                  padding: const EdgeInsets.only(right: 8),
+                  child: IconButton(
+                    tooltip: 'Settings',
+                    icon: isLoggedIn
+                        ? ProfilePicture(
+                            userLogin: _authStore.user.details!.login,
+                            radius: 16,
+                          )
+                        : const Icon(Icons.settings_rounded),
+                    onPressed: () => Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        settings: const RouteSettings(name: Settings.routeName),
+                        builder: (context) => Settings(
+                          settingsStore: context.read<SettingsStore>(),
+                        ),
+                      ),
+                    ),
+                  ),
+                );
+              },
+            ),
           ],
         ),
-        body: SafeArea(
-          child: Observer(
-            builder: (_) => IndexedStack(
-              index: _homeStore.selectedIndex,
-              children: [
-                if (_authStore.isLoggedIn)
-                  StreamsList(
-                    listType: ListType.followed,
-                    scrollController: _homeStore.followedScrollController,
-                  ),
-                TopSection(
-                  homeStore: _homeStore,
+        body: Observer(
+          builder: (_) => IndexedStack(
+            index: _homeStore.selectedIndex,
+            children: [
+              if (_authStore.isLoggedIn)
+                StreamsList(
+                  listType: ListType.followed,
+                  scrollController: _homeStore.followedScrollController,
                 ),
-                Search(
-                  scrollController: _homeStore.searchScrollController,
-                ),
-              ],
-            ),
+              TopSection(homeStore: _homeStore),
+              Search(scrollController: _homeStore.searchScrollController),
+            ],
           ),
         ),
-        bottomNavigationBar: Observer(
-          builder: (_) => BottomNavigationBar(
-            selectedFontSize: 12.0,
-            type: BottomNavigationBarType.fixed,
-            selectedLabelStyle: const TextStyle(fontWeight: FontWeight.w500),
-            unselectedLabelStyle: const TextStyle(fontWeight: FontWeight.w500),
-            items: [
-              if (_authStore.isLoggedIn)
-                BottomNavigationBarItem(
-                  icon: _homeStore.selectedIndex == 0
-                      ? const Icon(Icons.favorite_rounded)
-                      : const Icon(Icons.favorite_border_rounded),
-                  label: 'Following',
-                  tooltip: 'Followed streams',
-                ),
-              const BottomNavigationBarItem(
-                icon: Icon(Icons.arrow_upward_rounded),
-                label: 'Top',
-                tooltip: 'Top streams and categories',
+        bottomNavigationBar: BlurredContainer(
+          gradientDirection: GradientDirection.down,
+          child: Observer(
+            builder: (_) => Theme(
+              data: Theme.of(
+                context,
+              ).copyWith(splashFactory: NoSplash.splashFactory),
+              child: NavigationBar(
+                backgroundColor: Colors.transparent,
+                surfaceTintColor: Colors.transparent,
+                elevation: 0,
+                destinations: [
+                  if (_authStore.isLoggedIn)
+                    NavigationDestination(
+                      icon: Icon(
+                        Icons.favorite_border_rounded,
+                        color: theme.colorScheme.onSurfaceVariant
+                            .withValues(alpha: 0.5),
+                      ),
+                      selectedIcon: Icon(
+                        Icons.favorite_rounded,
+                        color: theme.colorScheme.primary,
+                      ),
+                      label: 'Following',
+                      tooltip: 'Following',
+                    ),
+                  NavigationDestination(
+                    icon: Icon(
+                      Icons.arrow_upward_rounded,
+                      color: theme.colorScheme.onSurfaceVariant
+                          .withValues(alpha: 0.5),
+                    ),
+                    selectedIcon: Icon(
+                      Icons.arrow_upward_rounded,
+                      color: theme.colorScheme.primary,
+                    ),
+                    label: 'Top',
+                    tooltip: 'Top',
+                  ),
+                  NavigationDestination(
+                    icon: Icon(
+                      Icons.search_rounded,
+                      color: theme.colorScheme.onSurfaceVariant
+                          .withValues(alpha: 0.5),
+                    ),
+                    selectedIcon: Icon(
+                      Icons.search_rounded,
+                      color: theme.colorScheme.primary,
+                    ),
+                    label: 'Search',
+                    tooltip: 'Search',
+                  ),
+                ],
+                selectedIndex: _homeStore.selectedIndex,
+                onDestinationSelected: (index) {
+                  if (index != _homeStore.selectedIndex) {
+                    HapticFeedback.selectionClick();
+                  }
+                  _homeStore.handleTap(index);
+                },
               ),
-              const BottomNavigationBarItem(
-                icon: Icon(Icons.search_rounded),
-                label: 'Search',
-                tooltip: 'Search for channels and categories',
-              ),
-            ],
-            currentIndex: _homeStore.selectedIndex,
-            onTap: _homeStore.handleTap,
+            ),
           ),
         ),
       ),
diff --git a/lib/screens/home/home_store.dart b/lib/screens/home/home_store.dart
index 2738e024..d57445e0 100644
--- a/lib/screens/home/home_store.dart
+++ b/lib/screens/home/home_store.dart
@@ -16,15 +16,13 @@ abstract class HomeStoreBase with Store {
 
   /// The scroll controllers for controlling the scroll to top on the top section.
   /// One controller is for the top streams tab and the other is for the top categories tab.
-  final topSectionScrollControllers = [
-    ScrollController(),
-    ScrollController(),
-  ];
+  final topSectionScrollControllers = [ScrollController(), ScrollController()];
 
   /// The scroll controller for controlling the scroll to top on the search section.
   final searchScrollController = ScrollController();
 
   /// The current index of the top section tab. Changes when switching between the streams and categories tabs.
+  @observable
   var topSectionCurrentIndex = 0;
 
   /// The current selected index/tab of the bottom navigation bar.
@@ -47,7 +45,7 @@ abstract class HomeStoreBase with Store {
     if (index != _selectedIndex) {
       _selectedIndex = index;
     } else {
-      const duration = Duration(milliseconds: 500);
+      const duration = Duration(milliseconds: 300);
 
       // Use different logic if logged in/out since there will be one less tab when logged out.
       if (authStore.isLoggedIn) {
@@ -99,6 +97,7 @@ abstract class HomeStoreBase with Store {
     _disposeReaction();
 
     followedScrollController.dispose();
+    searchScrollController.dispose();
 
     for (final controller in topSectionScrollControllers) {
       controller.dispose();
diff --git a/lib/screens/home/home_store.g.dart b/lib/screens/home/home_store.g.dart
index 954275f9..eb40afcb 100644
--- a/lib/screens/home/home_store.g.dart
+++ b/lib/screens/home/home_store.g.dart
@@ -9,8 +9,32 @@ part of 'home_store.dart';
 // ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
 
 mixin _$HomeStore on HomeStoreBase, Store {
-  late final _$_selectedIndexAtom =
-      Atom(name: 'HomeStoreBase._selectedIndex', context: context);
+  late final _$topSectionCurrentIndexAtom = Atom(
+    name: 'HomeStoreBase.topSectionCurrentIndex',
+    context: context,
+  );
+
+  @override
+  int get topSectionCurrentIndex {
+    _$topSectionCurrentIndexAtom.reportRead();
+    return super.topSectionCurrentIndex;
+  }
+
+  @override
+  set topSectionCurrentIndex(int value) {
+    _$topSectionCurrentIndexAtom.reportWrite(
+      value,
+      super.topSectionCurrentIndex,
+      () {
+        super.topSectionCurrentIndex = value;
+      },
+    );
+  }
+
+  late final _$_selectedIndexAtom = Atom(
+    name: 'HomeStoreBase._selectedIndex',
+    context: context,
+  );
 
   int get selectedIndex {
     _$_selectedIndexAtom.reportRead();
@@ -27,13 +51,16 @@ mixin _$HomeStore on HomeStoreBase, Store {
     });
   }
 
-  late final _$HomeStoreBaseActionController =
-      ActionController(name: 'HomeStoreBase', context: context);
+  late final _$HomeStoreBaseActionController = ActionController(
+    name: 'HomeStoreBase',
+    context: context,
+  );
 
   @override
   void handleTap(int index) {
     final _$actionInfo = _$HomeStoreBaseActionController.startAction(
-        name: 'HomeStoreBase.handleTap');
+      name: 'HomeStoreBase.handleTap',
+    );
     try {
       return super.handleTap(index);
     } finally {
@@ -44,7 +71,7 @@ mixin _$HomeStore on HomeStoreBase, Store {
   @override
   String toString() {
     return '''
-
+topSectionCurrentIndex: ${topSectionCurrentIndex}
     ''';
   }
 }
diff --git a/lib/screens/home/search/search.dart b/lib/screens/home/search/search.dart
index 1f516421..c2fb3ab8 100644
--- a/lib/screens/home/search/search.dart
+++ b/lib/screens/home/search/search.dart
@@ -2,148 +2,251 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
 import 'package:frosty/screens/home/search/search_results_categories.dart';
 import 'package:frosty/screens/home/search/search_results_channels.dart';
+import 'package:frosty/screens/home/search/search_results_tags.dart';
 import 'package:frosty/screens/home/search/search_store.dart';
+import 'package:frosty/screens/home/stream_list/streams_list.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/list_tile.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
 import 'package:frosty/widgets/section_header.dart';
 import 'package:provider/provider.dart';
 
-/// The search section that contians search history and search results for channels and categories.
+/// The search section that contains search history and search results for channels and categories.
 class Search extends StatefulWidget {
   // The scroll controller for handling scroll to top functionality.
   final ScrollController scrollController;
 
-  const Search({
-    Key? key,
-    required this.scrollController,
-  }) : super(key: key);
+  const Search({super.key, required this.scrollController});
 
   @override
   State<Search> createState() => _SearchState();
 }
 
+// Constants for consistent sizing
+const double _kSearchBarHeight = 80.0;
+
 class _SearchState extends State<Search> {
   late final _searchStore = SearchStore(
     authStore: context.read<AuthStore>(),
     twitchApi: context.read<TwitchApi>(),
+    twitchGqlApi: context.read<TwitchGqlApi>(),
   );
 
   @override
   Widget build(BuildContext context) {
-    const headerPadding = EdgeInsets.fromLTRB(15.0, 20.0, 15.0, 10.0);
-
-    return Column(
+    return Stack(
       children: [
-        Padding(
-          padding: const EdgeInsets.symmetric(vertical: 5.0, horizontal: 10.0),
+        // Content behind the search bar
+        Positioned.fill(
           child: Observer(
             builder: (context) {
-              return TextField(
-                controller: _searchStore.textEditingController,
-                focusNode: _searchStore.textFieldFocusNode,
-                autocorrect: false,
-                decoration: InputDecoration(
-                  contentPadding: EdgeInsets.zero,
-                  prefixIcon: const Icon(Icons.search_rounded),
-                  hintText: 'Find a channel or category',
-                  suffixIcon: _searchStore.textFieldFocusNode.hasFocus ||
-                          _searchStore.searchText.isNotEmpty
-                      ? IconButton(
-                          icon: const Icon(Icons.close_rounded),
-                          tooltip: _searchStore.searchText.isEmpty
-                              ? 'Cancel'
-                              : 'Clear',
-                          onPressed: () {
-                            if (_searchStore.searchText.isEmpty) {
-                              _searchStore.textFieldFocusNode.unfocus();
-                            }
-                            _searchStore.textEditingController.clear();
+              if (_searchStore.searchText.isEmpty) {
+                if (_searchStore.searchHistory.isEmpty) {
+                  return CustomScrollView(
+                    controller: widget.scrollController,
+                    slivers: [
+                      SliverToBoxAdapter(
+                        child: SizedBox(
+                          height:
+                              MediaQuery.of(context).padding.top +
+                              _kSearchBarHeight,
+                        ),
+                      ),
+                      SliverFillRemaining(
+                        hasScrollBody: false,
+                        child: Padding(
+                          padding: EdgeInsets.only(
+                            bottom: MediaQuery.of(context).padding.bottom,
+                          ),
+                          child: const AlertMessage(
+                            message: 'No recent searches',
+                            vertical: true,
+                          ),
+                        ),
+                      ),
+                    ],
+                  );
+                }
+
+                return FrostyScrollbar(
+                  controller: widget.scrollController,
+                  padding: EdgeInsets.only(
+                    top: MediaQuery.of(context).padding.top + _kSearchBarHeight,
+                    bottom: MediaQuery.of(context).padding.bottom,
+                  ),
+                  child: ListView(
+                    controller: widget.scrollController,
+                    padding: EdgeInsets.only(
+                      top:
+                          MediaQuery.of(context).padding.top +
+                          _kSearchBarHeight,
+                      bottom: MediaQuery.of(context).padding.bottom,
+                    ),
+                    children: [
+                      Padding(
+                        padding: EdgeInsets.only(
+                          left: 16 + MediaQuery.of(context).padding.left,
+                          right: 4 + MediaQuery.of(context).padding.right,
+                        ),
+                        child: Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            const SectionHeader(
+                              'History',
+                              padding: EdgeInsets.zero,
+                              isFirst: true,
+                            ),
+                            TextButton(
+                              onPressed: _searchStore.searchHistory.clear,
+                              child: const Text('Clear'),
+                            ),
+                          ],
+                        ),
+                      ),
+                      ..._searchStore.searchHistory.mapIndexed(
+                        (index, searchTerm) => ListTile(
+                          leading: const Icon(Icons.history_rounded),
+                          title: Text(searchTerm),
+                          onTap: () {
+                            _searchStore.textEditingController.text =
+                                searchTerm;
+                            _searchStore.handleQuery(searchTerm);
+                            _searchStore.textEditingController.selection =
+                                TextSelection.fromPosition(
+                                  TextPosition(
+                                    offset: _searchStore
+                                        .textEditingController
+                                        .text
+                                        .length,
+                                  ),
+                                );
                           },
-                        )
-                      : null,
+                        ),
+                      ),
+                    ],
+                  ),
+                );
+              }
+              return FrostyScrollbar(
+                controller: widget.scrollController,
+                padding: EdgeInsets.only(
+                  top: MediaQuery.of(context).padding.top + _kSearchBarHeight,
+                  bottom: MediaQuery.of(context).padding.bottom,
+                ),
+                child: CustomScrollView(
+                  controller: widget.scrollController,
+                  slivers: [
+                    // Add padding for app bar and search bar
+                    _SearchTopPadding(),
+                    SliverToBoxAdapter(
+                      child: Builder(
+                        builder: (context) => SectionHeader(
+                          'Channels',
+                          isFirst: true,
+                          padding: EdgeInsets.fromLTRB(
+                            16 + MediaQuery.of(context).padding.left,
+                            16,
+                            16 + MediaQuery.of(context).padding.right,
+                            8,
+                          ),
+                        ),
+                      ),
+                    ),
+                    SearchResultsChannels(
+                      searchStore: _searchStore,
+                      query: _searchStore.searchText,
+                    ),
+                    SliverToBoxAdapter(
+                      child: Builder(
+                        builder: (context) => SectionHeader(
+                          'Categories',
+                          padding: EdgeInsets.fromLTRB(
+                            16 + MediaQuery.of(context).padding.left,
+                            8,
+                            16 + MediaQuery.of(context).padding.right,
+                            8,
+                          ),
+                        ),
+                      ),
+                    ),
+                    SearchResultsCategories(searchStore: _searchStore),
+                    SliverToBoxAdapter(
+                      child: Builder(
+                        builder: (context) => SectionHeader(
+                          'Tags',
+                          padding: EdgeInsets.fromLTRB(
+                            16 + MediaQuery.of(context).padding.left,
+                            8,
+                            16 + MediaQuery.of(context).padding.right,
+                            8,
+                          ),
+                        ),
+                      ),
+                    ),
+                    SearchResultsTags(searchStore: _searchStore),
+                    // Add padding for bottom navigation bar
+                    const SliverBottomPadding(),
+                  ],
                 ),
-                onSubmitted: _searchStore.handleQuery,
               );
             },
           ),
         ),
-        Expanded(
-          child: Observer(
-            builder: (context) {
-              if (_searchStore.textEditingController.text.isEmpty) {
-                if (_searchStore.searchHistory.isEmpty) {
-                  return const AlertMessage(message: 'No recent searches');
-                }
-
+        // Blurred search bar on top
+        Positioned(
+          top: 0,
+          left: 0,
+          right: 0,
+          child: BlurredContainer(
+            gradientDirection: GradientDirection.up,
+            padding: EdgeInsets.only(
+              top: MediaQuery.of(context).padding.top,
+              left: MediaQuery.of(context).padding.left,
+              right: MediaQuery.of(context).padding.right,
+            ),
+            child: Observer(
+              builder: (context) {
                 return Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    const SectionHeader(
-                      'History',
-                      padding: headerPadding,
-                    ),
-                    Expanded(
-                      child: ListView(
-                        controller: widget.scrollController,
-                        children: _searchStore.searchHistory
-                            .mapIndexed(
-                              (index, searchTerm) => FrostyListTile(
-                                leading: const Icon(Icons.history_rounded),
-                                title: searchTerm,
-                                trailing: Tooltip(
-                                  message: 'Remove',
-                                  preferBelow: false,
-                                  child: IconButton(
-                                    icon: const Icon(Icons.close_rounded),
-                                    onPressed: () => _searchStore.searchHistory
-                                        .removeAt(index),
-                                  ),
-                                ),
-                                onTap: () {
-                                  _searchStore.textEditingController.text =
-                                      searchTerm;
-                                  _searchStore.handleQuery(searchTerm);
-                                  _searchStore.textEditingController.selection =
-                                      TextSelection.fromPosition(TextPosition(
-                                          offset: _searchStore
-                                              .textEditingController
-                                              .text
-                                              .length));
-                                },
-                              ),
-                            )
-                            .toList(),
+                    Padding(
+                      padding: const EdgeInsets.all(16),
+                      child: TextField(
+                        controller: _searchStore.textEditingController,
+                        focusNode: _searchStore.textFieldFocusNode,
+                        autocorrect: false,
+                        onChanged: _searchStore.onSearchTextChanged,
+                        decoration: InputDecoration(
+                          prefixIcon: const Icon(Icons.search_rounded),
+                          hintText: 'Search channels, categories, or tags',
+                          suffixIcon:
+                              _searchStore.textFieldFocusNode.hasFocus ||
+                                  _searchStore.searchText.isNotEmpty
+                              ? IconButton(
+                                  icon: const Icon(Icons.close_rounded),
+                                  tooltip: _searchStore.searchText.isEmpty
+                                      ? 'Cancel'
+                                      : 'Clear',
+                                  onPressed: () {
+                                    if (_searchStore.searchText.isEmpty) {
+                                      _searchStore.textFieldFocusNode.unfocus();
+                                    }
+                                    _searchStore.textEditingController.clear();
+                                    _searchStore.onSearchTextChanged('');
+                                  },
+                                )
+                              : null,
+                        ),
+                        onSubmitted: _searchStore.handleQuery,
                       ),
                     ),
                   ],
                 );
-              }
-              return CustomScrollView(
-                controller: widget.scrollController,
-                slivers: [
-                  const SliverToBoxAdapter(
-                    child: SectionHeader(
-                      'Channels',
-                      padding: headerPadding,
-                    ),
-                  ),
-                  SearchResultsChannels(
-                    searchStore: _searchStore,
-                    query: _searchStore.searchText,
-                  ),
-                  const SliverToBoxAdapter(
-                    child: SectionHeader(
-                      'Categories',
-                      padding: headerPadding,
-                    ),
-                  ),
-                  SearchResultsCategories(searchStore: _searchStore),
-                ],
-              );
-            },
+              },
+            ),
           ),
         ),
       ],
@@ -156,3 +259,17 @@ class _SearchState extends State<Search> {
     super.dispose();
   }
 }
+
+/// Helper widget for consistent top padding in search slivers
+class _SearchTopPadding extends StatelessWidget {
+  const _SearchTopPadding();
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverToBoxAdapter(
+      child: SizedBox(
+        height: MediaQuery.of(context).padding.top + _kSearchBarHeight,
+      ),
+    );
+  }
+}
diff --git a/lib/screens/home/search/search_results_categories.dart b/lib/screens/home/search/search_results_categories.dart
index 2a7ab0a2..2f7634fc 100644
--- a/lib/screens/home/search/search_results_categories.dart
+++ b/lib/screens/home/search/search_results_categories.dart
@@ -4,14 +4,13 @@ import 'package:frosty/models/category.dart';
 import 'package:frosty/screens/home/search/search_store.dart';
 import 'package:frosty/screens/home/top/categories/category_card.dart';
 import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/loading_indicator.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
 import 'package:mobx/mobx.dart';
 
 class SearchResultsCategories extends StatelessWidget {
   final SearchStore searchStore;
 
-  const SearchResultsCategories({Key? key, required this.searchStore})
-      : super(key: key);
+  const SearchResultsCategories({super.key, required this.searchStore});
 
   @override
   Widget build(BuildContext context) {
@@ -19,21 +18,31 @@ class SearchResultsCategories extends StatelessWidget {
       builder: (context) {
         final future = searchStore.categoryFuture;
 
-        switch (future!.status) {
+        // Show skeletons immediately while waiting for debounce.
+        if (future == null) {
+          if (searchStore.isSearching) {
+            return SliverList.builder(
+              itemCount: 8,
+              itemBuilder: (context, index) => const CategorySkeletonLoader(),
+            );
+          }
+          return const SliverToBoxAdapter(child: SizedBox.shrink());
+        }
+
+        switch (future.status) {
           case FutureStatus.pending:
-            return const SliverToBoxAdapter(
-              child: SizedBox(
-                height: 100.0,
-                child: LoadingIndicator(
-                  subtitle: 'Loading categories...',
-                ),
-              ),
+            return SliverList.builder(
+              itemCount: 8,
+              itemBuilder: (context, index) => const CategorySkeletonLoader(),
             );
           case FutureStatus.rejected:
             return const SliverToBoxAdapter(
               child: SizedBox(
                 height: 100.0,
-                child: AlertMessage(message: 'Failed to get categories'),
+                child: AlertMessage(
+                  message: 'Unable to load categories',
+                  vertical: true,
+                ),
               ),
             );
           case FutureStatus.fulfilled:
@@ -43,7 +52,10 @@ class SearchResultsCategories extends StatelessWidget {
               return const SliverToBoxAdapter(
                 child: SizedBox(
                   height: 100.0,
-                  child: AlertMessage(message: 'Failed to get categories'),
+                  child: AlertMessage(
+                    message: 'Failed to get categories',
+                    vertical: true,
+                  ),
                 ),
               );
             }
@@ -52,23 +64,18 @@ class SearchResultsCategories extends StatelessWidget {
               return const SliverToBoxAdapter(
                 child: SizedBox(
                   height: 100.0,
-                  child: AlertMessage(message: 'No matching categories'),
+                  child: AlertMessage(
+                    message: 'No matching categories',
+                    vertical: true,
+                  ),
                 ),
               );
             }
 
-            return SliverGrid.count(
-              crossAxisCount: 2,
-              mainAxisSpacing: 20,
-              children: categories.data
-                  .map(
-                    (category) => GridTile(
-                      child: CategoryCard(
-                        category: category,
-                      ),
-                    ),
-                  )
-                  .toList(),
+            return SliverList.builder(
+              itemCount: categories.data.length,
+              itemBuilder: (context, index) =>
+                  CategoryCard(category: categories.data[index]),
             );
         }
       },
diff --git a/lib/screens/home/search/search_results_channels.dart b/lib/screens/home/search/search_results_channels.dart
index cb780765..7ae772be 100644
--- a/lib/screens/home/search/search_results_channels.dart
+++ b/lib/screens/home/search/search_results_channels.dart
@@ -1,17 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:frosty/constants.dart';
+import 'package:frosty/apis/base_api_client.dart';
 import 'package:frosty/models/channel.dart';
 import 'package:frosty/screens/channel/channel.dart';
 import 'package:frosty/screens/home/search/search_store.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
 import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/animate_scale.dart';
-import 'package:frosty/widgets/block_report_modal.dart';
-import 'package:frosty/widgets/list_tile.dart';
-import 'package:frosty/widgets/loading_indicator.dart';
+import 'package:frosty/widgets/live_indicator.dart';
 import 'package:frosty/widgets/profile_picture.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
 import 'package:frosty/widgets/uptime.dart';
+import 'package:frosty/widgets/user_actions_modal.dart';
 import 'package:mobx/mobx.dart';
 
 class SearchResultsChannels extends StatefulWidget {
@@ -19,10 +20,10 @@ class SearchResultsChannels extends StatefulWidget {
   final String query;
 
   const SearchResultsChannels({
-    Key? key,
+    super.key,
     required this.searchStore,
     required this.query,
-  }) : super(key: key);
+  });
 
   @override
   State<SearchResultsChannels> createState() => _SearchResultsChannelsState();
@@ -33,10 +34,12 @@ class _SearchResultsChannelsState extends State<SearchResultsChannels> {
     try {
       final channelInfo = await widget.searchStore.searchChannel(search);
 
-      if (!mounted) return;
+      if (!context.mounted) return;
+
       Navigator.push(
         context,
         MaterialPageRoute(
+          settings: const RouteSettings(name: VideoChat.routeName),
           builder: (context) => VideoChat(
             userId: channelInfo.broadcasterId,
             userName: channelInfo.broadcasterName,
@@ -44,12 +47,22 @@ class _SearchResultsChannelsState extends State<SearchResultsChannels> {
           ),
         ),
       );
-    } catch (error) {
+    } on ApiException catch (e) {
+      debugPrint('Search channels ApiException: $e');
       final snackBar = SnackBar(
-        content: AlertMessage(message: error.toString()),
-        behavior: SnackBarBehavior.floating,
+        content: AlertMessage(message: e.message, centered: false),
       );
-
+      if (!context.mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(snackBar);
+    } catch (error) {
+      debugPrint('Search channels error: $error');
+      final snackBar = SnackBar(
+        content: AlertMessage(
+          message: 'Unable to find channel',
+          centered: false,
+        ),
+      );
+      if (!context.mounted) return;
       ScaffoldMessenger.of(context).showSnackBar(snackBar);
     }
   }
@@ -60,90 +73,99 @@ class _SearchResultsChannelsState extends State<SearchResultsChannels> {
       builder: (context) {
         final future = widget.searchStore.channelFuture;
 
-        switch (future!.status) {
+        // Show skeletons immediately while waiting for debounce.
+        if (future == null) {
+          if (widget.searchStore.isSearching) {
+            return SliverList.builder(
+              itemCount: 8,
+              itemBuilder: (context, index) =>
+                  ChannelSkeletonLoader(index: index),
+            );
+          }
+          return const SliverToBoxAdapter(child: SizedBox.shrink());
+        }
+
+        switch (future.status) {
           case FutureStatus.pending:
-            return const SliverToBoxAdapter(
-              child: LoadingIndicator(
-                subtitle: 'Loading channels...',
-              ),
+            return SliverList.builder(
+              itemCount: 8,
+              itemBuilder: (context, index) =>
+                  ChannelSkeletonLoader(index: index),
             );
           case FutureStatus.rejected:
             return const SliverToBoxAdapter(
               child: SizedBox(
                 height: 100.0,
-                child: AlertMessage(message: 'Failed to get channels'),
+                child: AlertMessage(
+                  message: 'Unable to load channels',
+                  vertical: true,
+                ),
               ),
             );
           case FutureStatus.fulfilled:
             final results = (future.result as List<ChannelQuery>).where(
-                (channel) => !widget.searchStore.authStore.user.blockedUsers
-                    .map((blockedUser) => blockedUser.userId)
-                    .contains(channel.id));
+              (channel) => !widget.searchStore.authStore.user.blockedUsers
+                  .map((blockedUser) => blockedUser.userId)
+                  .contains(channel.id),
+            );
 
-            return SliverList(
-              delegate: SliverChildListDelegate.fixed(
-                [
-                  ...results.map(
-                    (channel) {
-                      final displayName = regexEnglish
-                              .hasMatch(channel.displayName)
-                          ? channel.displayName
-                          : '${channel.displayName} (${channel.broadcasterLogin})';
+            return SliverList.list(
+              children: [
+                ...results.map((channel) {
+                  final displayName = getReadableName(
+                    channel.displayName,
+                    channel.broadcasterLogin,
+                  );
 
-                      return AnimateScale(
-                        onTap: () => Navigator.push(
-                          context,
-                          MaterialPageRoute(
-                            builder: (context) => VideoChat(
-                              userId: channel.id,
-                              userName: channel.displayName,
-                              userLogin: channel.broadcasterLogin,
-                            ),
-                          ),
+                  return InkWell(
+                    onTap: () => Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        settings: const RouteSettings(name: VideoChat.routeName),
+                        builder: (context) => VideoChat(
+                          userId: channel.id,
+                          userName: channel.displayName,
+                          userLogin: channel.broadcasterLogin,
                         ),
-                        onLongPress: () {
-                          HapticFeedback.lightImpact();
+                      ),
+                    ),
+                    onLongPress: () {
+                      HapticFeedback.mediumImpact();
 
-                          showModalBottomSheet(
-                            backgroundColor: Colors.transparent,
-                            context: context,
-                            builder: (context) => BlockReportModal(
-                              authStore: widget.searchStore.authStore,
-                              name: displayName,
-                              userLogin: channel.broadcasterLogin,
-                              userId: channel.id,
-                            ),
-                          );
-                        },
-                        child: FrostyListTile(
-                          isThreeLine: false,
-                          title: displayName,
-                          leading: ProfilePicture(
-                              userLogin: channel.broadcasterLogin),
-                          subtitle: channel.isLive
-                              ? Row(
-                                  children: [
-                                    const Icon(
-                                      Icons.circle,
-                                      color: Colors.red,
-                                      size: 10,
-                                    ),
-                                    const SizedBox(width: 5),
-                                    Uptime(startTime: channel.startedAt),
-                                  ],
-                                )
-                              : null,
+                      showModalBottomSheetWithProperFocus(
+                        context: context,
+                        builder: (context) => UserActionsModal(
+                          authStore: widget.searchStore.authStore,
+                          name: displayName,
+                          userLogin: channel.broadcasterLogin,
+                          userId: channel.id,
                         ),
                       );
                     },
-                  ),
-                  FrostyListTile(
-                    title: 'Go to channel "${widget.query}"',
-                    onTap: () => _handleSearch(context, widget.query),
-                    trailing: const Icon(Icons.chevron_right_rounded),
-                  )
-                ],
-              ),
+                    child: ListTile(
+                      title: Text(displayName),
+                      leading: ProfilePicture(
+                        userLogin: channel.broadcasterLogin,
+                        radius: 16,
+                      ),
+                      subtitle: channel.isLive
+                          ? Row(
+                              spacing: 6,
+                              children: [
+                                const LiveIndicator(),
+                                Uptime(startTime: channel.startedAt),
+                              ],
+                            )
+                          : null,
+                    ),
+                  );
+                }),
+                ListTile(
+                  title: Text('Go to channel "${widget.query}"'),
+                  onTap: () => _handleSearch(context, widget.query),
+                  trailing: const Icon(Icons.chevron_right_rounded),
+                ),
+              ],
             );
         }
       },
diff --git a/lib/screens/home/search/search_results_tags.dart b/lib/screens/home/search/search_results_tags.dart
new file mode 100644
index 00000000..4a445385
--- /dev/null
+++ b/lib/screens/home/search/search_results_tags.dart
@@ -0,0 +1,97 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/home/search/search_store.dart';
+import 'package:frosty/screens/home/search/tag_streams.dart';
+import 'package:frosty/widgets/alert_message.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
+import 'package:mobx/mobx.dart';
+
+class SearchResultsTags extends StatelessWidget {
+  final SearchStore searchStore;
+
+  const SearchResultsTags({super.key, required this.searchStore});
+
+  @override
+  Widget build(BuildContext context) {
+    return Observer(
+      builder: (context) {
+        final future = searchStore.tagFuture;
+
+        if (future == null) {
+          if (searchStore.isSearching) {
+            return _tagSkeletons();
+          }
+          return const SliverToBoxAdapter(child: SizedBox.shrink());
+        }
+
+        switch (future.status) {
+          case FutureStatus.pending:
+            return _tagSkeletons();
+          case FutureStatus.rejected:
+            return const SliverToBoxAdapter(
+              child: SizedBox(
+                height: 100.0,
+                child: AlertMessage(
+                  message: 'Unable to load tags',
+                  vertical: true,
+                ),
+              ),
+            );
+          case FutureStatus.fulfilled:
+            final List<String> tags = future.result as List<String>? ?? const [];
+
+            if (tags.isEmpty) {
+              return const SliverToBoxAdapter(
+                child: SizedBox(
+                  height: 100.0,
+                  child: AlertMessage(
+                    message: 'No matching tags',
+                    vertical: true,
+                  ),
+                ),
+              );
+            }
+
+            return SliverList.builder(
+              itemCount: tags.length,
+              itemBuilder: (context, index) {
+                final tag = tags[index];
+                return ListTile(
+                  leading: const Icon(Icons.tag_rounded),
+                  title: Text(tag),
+                  onTap: () {
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        settings: const RouteSettings(
+                          name: TagStreams.routeName,
+                        ),
+                        builder: (context) => TagStreams(tagName: tag),
+                      ),
+                    );
+                  },
+                );
+              },
+            );
+        }
+      },
+    );
+  }
+
+  Widget _tagSkeletons() {
+    return SliverList.builder(
+      itemCount: 4,
+      itemBuilder: (context, index) => ListTile(
+        leading: SkeletonLoader(
+          width: 24,
+          height: 24,
+          borderRadius: BorderRadius.circular(4),
+        ),
+        title: SkeletonLoader(
+          height: 16,
+          borderRadius: BorderRadius.circular(4),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/home/search/search_store.dart b/lib/screens/home/search/search_store.dart
index 28bf0a03..5969a495 100644
--- a/lib/screens/home/search/search_store.dart
+++ b/lib/screens/home/search/search_store.dart
@@ -1,5 +1,8 @@
+import 'dart:async';
+
 import 'package:flutter/widgets.dart';
 import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
 import 'package:frosty/models/category.dart';
 import 'package:frosty/models/channel.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
@@ -15,44 +18,83 @@ abstract class SearchStoreBase with Store {
 
   final TwitchApi twitchApi;
 
+  final TwitchGqlApi twitchGqlApi;
+
   final textEditingController = TextEditingController();
 
   final textFieldFocusNode = FocusNode();
 
+  Timer? _debounceTimer;
+
+  ReactionDisposer? _disposeReaction;
+
   @readonly
   var _searchText = '';
 
   @readonly
   var _searchHistory = ObservableList<String>();
 
+  @readonly
+  var _isSearching = false;
+
   @readonly
   ObservableFuture<List<ChannelQuery>>? _channelFuture;
 
   @readonly
   ObservableFuture<CategoriesTwitch?>? _categoryFuture;
 
-  SearchStoreBase({required this.authStore, required this.twitchApi}) {
+  @readonly
+  ObservableFuture<List<String>>? _tagFuture;
+
+  SearchStoreBase({
+    required this.authStore,
+    required this.twitchApi,
+    required this.twitchGqlApi,
+  }) {
     init();
   }
 
   @action
   Future<void> init() async {
-    // Retrieve the instance that will allow us to retrieve local search history.
+    // Load SharedPreferences for local search history.
     final prefs = await SharedPreferences.getInstance();
 
     // Retrieve the search history from local storage. If it doesn't exist, use an empty list.
-    _searchHistory = prefs.getStringList('search_history')?.asObservable() ??
+    _searchHistory =
+        prefs.getStringList('search_history')?.asObservable() ??
         ObservableList<String>();
 
     // Create a reaction that will limit the history to 8 entries and update it to local storage automatically.
-    autorun((_) {
+    _disposeReaction = autorun((_) {
       if (_searchHistory.length > 8) _searchHistory.removeLast();
       prefs.setStringList('search_history', _searchHistory);
     });
 
     // Add a listener to update the cancel button visibility whenever the text changes.
-    textEditingController
-        .addListener(() => _searchText = textEditingController.text);
+    textEditingController.addListener(
+      () => _searchText = textEditingController.text,
+    );
+  }
+
+  /// Debounced handler for search-as-you-type.
+  @action
+  void onSearchTextChanged(String query) {
+    _debounceTimer?.cancel();
+
+    if (query.isEmpty) {
+      _isSearching = false;
+      _channelFuture = null;
+      _categoryFuture = null;
+      _tagFuture = null;
+      return;
+    }
+
+    // Show loading state immediately for responsive feedback.
+    _isSearching = true;
+
+    _debounceTimer = Timer(const Duration(milliseconds: 300), () {
+      runInAction(() => _performSearch(query));
+    });
   }
 
   /// Obtain the channels and categories that match the provided [query].
@@ -60,42 +102,56 @@ abstract class SearchStoreBase with Store {
   void handleQuery(String query) {
     if (query.isEmpty) return;
 
+    // Cancel any pending debounce since we're searching immediately.
+    _debounceTimer?.cancel();
+
+    _performSearch(query);
+  }
+
+  /// Performs the actual search API calls and saves the query to history.
+  @action
+  void _performSearch(String query) {
+    // Futures are now pending, so isSearching can be cleared.
+    _isSearching = false;
+
     // Move the query to the most recent result (top of the stack).
     _searchHistory.remove(query);
     _searchHistory.insert(0, query);
 
     // Fetch the matching channels, sort it by live status, and then set it.
-    _channelFuture = twitchApi
-        .searchChannels(
-      query: query,
-      headers: authStore.headersTwitch,
-    )
-        .then(
-      (channels) {
-        channels.sort((c1, c2) => c2.isLive ? 1 : -1);
-        return channels;
-      },
-    ).asObservable();
+    _channelFuture = twitchApi.searchChannels(query: query).then((channels) {
+      channels.sort((c1, c2) => c2.isLive ? 1 : -1);
+      return channels;
+    }).asObservable();
 
     // Fetch and set the categories that match the query.
-    _categoryFuture = twitchApi
-        .searchCategories(
-          query: query,
-          headers: authStore.headersTwitch,
-        )
-        .asObservable();
+    _categoryFuture = twitchApi.searchCategories(query: query).then((
+      categories,
+    ) {
+      // Move exact matches to the first result
+      final matchingIndex = categories.data.indexWhere(
+        (c) => c.name.toLowerCase() == query.toLowerCase(),
+      );
+      if (matchingIndex >= 1) {
+        final matchingCategory = categories.data.removeAt(matchingIndex);
+        categories.data.insert(0, matchingCategory);
+      }
+      return categories;
+    }).asObservable();
+
+    _tagFuture = twitchGqlApi.searchFreeformTags(query: query).asObservable();
   }
 
   /// Find a specific channel provided the [query].
   /// This is used for channels that may not show up in the search results.
   Future<Channel> searchChannel(String query) async {
-    final user = await twitchApi.getUser(
-        userLogin: query, headers: authStore.headersTwitch);
-    return await twitchApi.getChannel(
-        userId: user.id, headers: authStore.headersTwitch);
+    final user = await twitchApi.getUser(userLogin: query);
+    return await twitchApi.getChannel(userId: user.id);
   }
 
   void dispose() {
+    _disposeReaction?.call();
+    _debounceTimer?.cancel();
     textEditingController.dispose();
     textFieldFocusNode.dispose();
   }
diff --git a/lib/screens/home/search/search_store.g.dart b/lib/screens/home/search/search_store.g.dart
index f114d0a1..ff03473e 100644
--- a/lib/screens/home/search/search_store.g.dart
+++ b/lib/screens/home/search/search_store.g.dart
@@ -9,8 +9,10 @@ part of 'search_store.dart';
 // ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
 
 mixin _$SearchStore on SearchStoreBase, Store {
-  late final _$_searchTextAtom =
-      Atom(name: 'SearchStoreBase._searchText', context: context);
+  late final _$_searchTextAtom = Atom(
+    name: 'SearchStoreBase._searchText',
+    context: context,
+  );
 
   String get searchText {
     _$_searchTextAtom.reportRead();
@@ -27,8 +29,10 @@ mixin _$SearchStore on SearchStoreBase, Store {
     });
   }
 
-  late final _$_searchHistoryAtom =
-      Atom(name: 'SearchStoreBase._searchHistory', context: context);
+  late final _$_searchHistoryAtom = Atom(
+    name: 'SearchStoreBase._searchHistory',
+    context: context,
+  );
 
   ObservableList<String> get searchHistory {
     _$_searchHistoryAtom.reportRead();
@@ -45,8 +49,30 @@ mixin _$SearchStore on SearchStoreBase, Store {
     });
   }
 
-  late final _$_channelFutureAtom =
-      Atom(name: 'SearchStoreBase._channelFuture', context: context);
+  late final _$_isSearchingAtom = Atom(
+    name: 'SearchStoreBase._isSearching',
+    context: context,
+  );
+
+  bool get isSearching {
+    _$_isSearchingAtom.reportRead();
+    return super._isSearching;
+  }
+
+  @override
+  bool get _isSearching => isSearching;
+
+  @override
+  set _isSearching(bool value) {
+    _$_isSearchingAtom.reportWrite(value, super._isSearching, () {
+      super._isSearching = value;
+    });
+  }
+
+  late final _$_channelFutureAtom = Atom(
+    name: 'SearchStoreBase._channelFuture',
+    context: context,
+  );
 
   ObservableFuture<List<ChannelQuery>>? get channelFuture {
     _$_channelFutureAtom.reportRead();
@@ -63,8 +89,10 @@ mixin _$SearchStore on SearchStoreBase, Store {
     });
   }
 
-  late final _$_categoryFutureAtom =
-      Atom(name: 'SearchStoreBase._categoryFuture', context: context);
+  late final _$_categoryFutureAtom = Atom(
+    name: 'SearchStoreBase._categoryFuture',
+    context: context,
+  );
 
   ObservableFuture<CategoriesTwitch?>? get categoryFuture {
     _$_categoryFutureAtom.reportRead();
@@ -81,21 +109,58 @@ mixin _$SearchStore on SearchStoreBase, Store {
     });
   }
 
-  late final _$initAsyncAction =
-      AsyncAction('SearchStoreBase.init', context: context);
+  late final _$_tagFutureAtom = Atom(
+    name: 'SearchStoreBase._tagFuture',
+    context: context,
+  );
+
+  ObservableFuture<List<String>>? get tagFuture {
+    _$_tagFutureAtom.reportRead();
+    return super._tagFuture;
+  }
+
+  @override
+  ObservableFuture<List<String>>? get _tagFuture => tagFuture;
+
+  @override
+  set _tagFuture(ObservableFuture<List<String>>? value) {
+    _$_tagFutureAtom.reportWrite(value, super._tagFuture, () {
+      super._tagFuture = value;
+    });
+  }
+
+  late final _$initAsyncAction = AsyncAction(
+    'SearchStoreBase.init',
+    context: context,
+  );
 
   @override
   Future<void> init() {
     return _$initAsyncAction.run(() => super.init());
   }
 
-  late final _$SearchStoreBaseActionController =
-      ActionController(name: 'SearchStoreBase', context: context);
+  late final _$SearchStoreBaseActionController = ActionController(
+    name: 'SearchStoreBase',
+    context: context,
+  );
+
+  @override
+  void onSearchTextChanged(String query) {
+    final _$actionInfo = _$SearchStoreBaseActionController.startAction(
+      name: 'SearchStoreBase.onSearchTextChanged',
+    );
+    try {
+      return super.onSearchTextChanged(query);
+    } finally {
+      _$SearchStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
 
   @override
   void handleQuery(String query) {
     final _$actionInfo = _$SearchStoreBaseActionController.startAction(
-        name: 'SearchStoreBase.handleQuery');
+      name: 'SearchStoreBase.handleQuery',
+    );
     try {
       return super.handleQuery(query);
     } finally {
@@ -103,6 +168,18 @@ mixin _$SearchStore on SearchStoreBase, Store {
     }
   }
 
+  @override
+  void _performSearch(String query) {
+    final _$actionInfo = _$SearchStoreBaseActionController.startAction(
+      name: 'SearchStoreBase._performSearch',
+    );
+    try {
+      return super._performSearch(query);
+    } finally {
+      _$SearchStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
   @override
   String toString() {
     return '''
diff --git a/lib/screens/home/search/tag_streams.dart b/lib/screens/home/search/tag_streams.dart
new file mode 100644
index 00000000..c78c9051
--- /dev/null
+++ b/lib/screens/home/search/tag_streams.dart
@@ -0,0 +1,83 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/home/stream_list/stream_list_store.dart';
+import 'package:frosty/screens/home/stream_list/streams_list.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/stream_sort_button.dart';
+import 'package:provider/provider.dart';
+
+/// Streams matching a freeform tag (search → tap tag).
+class TagStreams extends StatelessWidget {
+  static const routeName = 'TagStreams';
+
+  final String tagName;
+
+  const TagStreams({super.key, required this.tagName});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final settingsStore = context.watch<SettingsStore>();
+
+    return Scaffold(
+      backgroundColor: theme.scaffoldBackgroundColor,
+      extendBody: true,
+      extendBodyBehindAppBar: true,
+      body: Stack(
+        children: [
+          Positioned.fill(
+            child: Observer(
+              builder: (_) => StreamsList(
+                listType: ListType.tag,
+                freeformTag: tagName,
+                sortOrder: settingsStore.streamViewerSort,
+                showJumpButton: true,
+              ),
+            ),
+          ),
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: BlurredContainer(
+              gradientDirection: GradientDirection.up,
+              padding: EdgeInsets.only(
+                top: MediaQuery.of(context).padding.top,
+                left: MediaQuery.of(context).padding.left,
+                right: MediaQuery.of(context).padding.right,
+              ),
+              child: SizedBox(
+                height: kToolbarHeight,
+                child: Row(
+                  children: [
+                    IconButton(
+                      tooltip: 'Back',
+                      icon: Icon(Icons.adaptive.arrow_back_rounded),
+                      onPressed: Navigator.of(context).pop,
+                    ),
+                    Expanded(
+                      child: Text(
+                        tagName,
+                        style: theme.textTheme.titleLarge,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    Observer(
+                      builder: (_) => StreamSortButton(
+                        sortOrder: settingsStore.streamViewerSort,
+                        onChanged: (order) =>
+                            settingsStore.streamViewerSort = order,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/screens/home/stream_list/large_stream_card.dart b/lib/screens/home/stream_list/large_stream_card.dart
index e1ed3a53..ab09ce96 100644
--- a/lib/screens/home/stream_list/large_stream_card.dart
+++ b/lib/screens/home/stream_list/large_stream_card.dart
@@ -3,39 +3,44 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:frosty/constants.dart';
-import 'package:frosty/main.dart';
 import 'package:frosty/models/stream.dart';
 import 'package:frosty/screens/channel/channel.dart';
-import 'package:frosty/screens/channel/video/video_bar.dart';
+import 'package:frosty/screens/channel/video/stream_info_bar.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
-import 'package:frosty/widgets/animate_scale.dart';
-import 'package:frosty/widgets/block_report_modal.dart';
-import 'package:frosty/widgets/cached_image.dart';
-import 'package:frosty/widgets/loading_indicator.dart';
-import 'package:frosty/widgets/uptime.dart';
-import 'package:intl/intl.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
+import 'package:frosty/widgets/user_actions_modal.dart';
 import 'package:provider/provider.dart';
 
 class LargeStreamCard extends StatelessWidget {
   final StreamTwitch streamInfo;
   final bool showThumbnail;
   final bool showCategory;
+  final bool showPinOption;
+  final bool? isPinned;
+  final bool? initialIsFollowing;
+  final ValueChanged<bool>? onFollowChanged;
 
   const LargeStreamCard({
-    Key? key,
+    super.key,
     required this.streamInfo,
     required this.showThumbnail,
     this.showCategory = true,
-  }) : super(key: key);
+    this.showPinOption = false,
+    this.isPinned,
+    this.initialIsFollowing,
+    this.onFollowChanged,
+  });
 
   @override
   Widget build(BuildContext context) {
-    // Get a new URL for the thumbnail every 5 minutes so that the image is updated on refresh.
-    // This method adds a random value to the end of the URL to override the cached image.
+    // Generate a unique cache key for the thumbnail URL that updates every 5 minutes.
+    // This ensures the image is refreshed periodically to reflect the latest content.
     final time = DateTime.now();
-    final cacheUrlExtension = time.day.toString() +
-        time.hour.toString() +
-        (time.minute ~/ 5).toString();
+    final cacheKey =
+        '${streamInfo.thumbnailUrl}-${time.day}-${time.hour}-${time.minute ~/ 5}';
 
     // Calculate the width and height of the thumbnail based on the device width and the stream card size setting.
     // Constraint the resolution to 1920x1080 since that's the max resolution of the Twitch API.
@@ -44,101 +49,37 @@ class LargeStreamCard extends StatelessWidget {
     final thumbnailWidth = min((size.width * pixelRatio) ~/ 1, 1920);
     final thumbnailHeight = min((thumbnailWidth * (9 / 16)).toInt(), 1080);
 
-    final thumbnail = ClipRRect(
-      borderRadius: const BorderRadius.all(Radius.circular(10)),
-      child: Stack(
-        alignment: Alignment.bottomLeft,
-        children: [
-          Container(
-            foregroundDecoration: const BoxDecoration(
-              gradient: LinearGradient(
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
-                stops: [0.8, 1.0],
-                colors: [
-                  Colors.transparent,
-                  Colors.black,
-                ],
-              ),
+    final thumbnail = SizedBox(
+      width: double.infinity,
+      child: ClipRRect(
+        borderRadius: kCardBorderRadius,
+        child: AspectRatio(
+          aspectRatio: 16 / 9,
+          child: FrostyCachedNetworkImage(
+            imageUrl: streamInfo.thumbnailUrl.replaceFirst(
+              '-{width}x{height}',
+              '-${thumbnailWidth}x$thumbnailHeight',
             ),
-            child: AspectRatio(
-              aspectRatio: 16 / 9,
-              child: FrostyCachedNetworkImage(
-                imageUrl: streamInfo.thumbnailUrl.replaceFirst(
-                        '-{width}x{height}',
-                        '-${thumbnailWidth}x$thumbnailHeight') +
-                    cacheUrlExtension,
-                placeholder: (context, url) => const ColoredBox(
-                    color: lightGray, child: LoadingIndicator()),
-                useOldImageOnUrlChange: true,
-              ),
+            cacheKey: cacheKey,
+            placeholder: (context, url) => const SkeletonLoader(
+              borderRadius: kCardBorderRadius,
             ),
+            useOldImageOnUrlChange: true,
           ),
-          Padding(
-            padding: const EdgeInsets.only(left: 10.0, bottom: 12.0),
-            child: Row(
-              children: [
-                Tooltip(
-                  message: 'Stream uptime',
-                  preferBelow: false,
-                  child: Row(
-                    children: [
-                      const Padding(
-                        padding: EdgeInsets.all(2.0),
-                        child: Icon(
-                          Icons.circle,
-                          color: Colors.red,
-                          size: 10,
-                        ),
-                      ),
-                      const SizedBox(width: 3.0),
-                      Uptime(
-                        startTime: streamInfo.startedAt,
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontWeight: FontWeight.w500,
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(width: 10.0),
-                Tooltip(
-                  message: 'Viewer count',
-                  preferBelow: false,
-                  child: Row(
-                    children: [
-                      const Icon(
-                        Icons.visibility,
-                        size: 14,
-                        color: Colors.white,
-                      ),
-                      const SizedBox(width: 5),
-                      Text(
-                        NumberFormat().format(streamInfo.viewerCount),
-                        style: const TextStyle(
-                          color: Colors.white,
-                          fontWeight: FontWeight.w500,
-                        ),
-                      ),
-                    ],
-                  ),
-                )
-              ],
-            ),
-          ),
-        ],
+        ),
       ),
     );
 
-    final streamerName = regexEnglish.hasMatch(streamInfo.userName)
-        ? streamInfo.userName
-        : '${streamInfo.userName} (${streamInfo.userLogin})';
+    final streamerName = getReadableName(
+      streamInfo.userName,
+      streamInfo.userLogin,
+    );
 
-    return AnimateScale(
+    return InkWell(
       onTap: () => Navigator.push(
         context,
         MaterialPageRoute(
+          settings: const RouteSettings(name: VideoChat.routeName),
           builder: (context) => VideoChat(
             userId: streamInfo.userId,
             userName: streamInfo.userName,
@@ -149,26 +90,35 @@ class LargeStreamCard extends StatelessWidget {
       onLongPress: () {
         HapticFeedback.mediumImpact();
 
-        showModalBottomSheet(
-          backgroundColor: Colors.transparent,
+        showModalBottomSheetWithProperFocus(
           context: context,
-          builder: (context) => BlockReportModal(
+          builder: (context) => UserActionsModal(
             authStore: context.read<AuthStore>(),
             name: streamerName,
             userLogin: streamInfo.userLogin,
             userId: streamInfo.userId,
+            showPinOption: showPinOption,
+            isPinned: isPinned,
+            initialIsFollowing: initialIsFollowing,
+            onFollowChanged: onFollowChanged,
           ),
         );
       },
       child: Padding(
-        padding: EdgeInsets.symmetric(
-            vertical: showThumbnail ? 10.0 : 5.0, horizontal: 15.0),
+        padding: EdgeInsets.only(
+          top: showThumbnail ? 12 : 4,
+          bottom: showThumbnail ? 12 : 4,
+          left: 16 + MediaQuery.of(context).padding.left,
+          right: 16 + MediaQuery.of(context).padding.right,
+        ),
         child: Column(
           children: [
             if (showThumbnail) thumbnail,
-            VideoBar(
+            StreamInfoBar(
               streamInfo: streamInfo,
               showCategory: showCategory,
+              padding: const EdgeInsets.symmetric(vertical: 12),
+              tooltipTriggerMode: TooltipTriggerMode.longPress,
             ),
           ],
         ),
diff --git a/lib/screens/home/stream_list/offline_channel_card.dart b/lib/screens/home/stream_list/offline_channel_card.dart
new file mode 100644
index 00000000..2fe17d46
--- /dev/null
+++ b/lib/screens/home/stream_list/offline_channel_card.dart
@@ -0,0 +1,134 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:frosty/models/followed_channel.dart';
+import 'package:frosty/screens/channel/channel.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/profile_picture.dart';
+import 'package:frosty/widgets/user_actions_modal.dart';
+import 'package:provider/provider.dart';
+
+/// A tappable card widget that displays an offline followed channel's details.
+class OfflineChannelCard extends StatelessWidget {
+  final FollowedChannel channelInfo;
+  final bool showPinOption;
+  final bool? isPinned;
+  final bool showOfflineStatus;
+  final bool? initialIsFollowing;
+  final ValueChanged<bool>? onFollowChanged;
+
+  const OfflineChannelCard({
+    super.key,
+    required this.channelInfo,
+    required this.showPinOption,
+    this.isPinned,
+    this.showOfflineStatus = false,
+    this.initialIsFollowing,
+    this.onFollowChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final channelName = getReadableName(
+      channelInfo.broadcasterName,
+      channelInfo.broadcasterLogin,
+    );
+
+    final fontColor = DefaultTextStyle.of(context).style.color;
+    final followedDuration = DateTime.now().difference(channelInfo.followedAt);
+
+    String followedText;
+    if (followedDuration.inDays >= 365) {
+      final years = followedDuration.inDays ~/ 365;
+      followedText = 'Following for $years ${years == 1 ? 'year' : 'years'}';
+    } else if (followedDuration.inDays >= 30) {
+      final months = followedDuration.inDays ~/ 30;
+      followedText =
+          'Following for $months ${months == 1 ? 'month' : 'months'}';
+    } else if (followedDuration.inDays > 0) {
+      followedText =
+          'Following for ${followedDuration.inDays} ${followedDuration.inDays == 1 ? 'day' : 'days'}';
+    } else if (followedDuration.inHours > 0) {
+      followedText =
+          'Following for ${followedDuration.inHours} ${followedDuration.inHours == 1 ? 'hour' : 'hours'}';
+    } else {
+      followedText =
+          'Following for ${followedDuration.inMinutes} ${followedDuration.inMinutes == 1 ? 'minute' : 'minutes'}';
+    }
+
+    return InkWell(
+      onTap: () => Navigator.push(
+        context,
+        MaterialPageRoute(
+          settings: const RouteSettings(name: VideoChat.routeName),
+          builder: (context) => VideoChat(
+            userId: channelInfo.broadcasterId,
+            userName: channelInfo.broadcasterName,
+            userLogin: channelInfo.broadcasterLogin,
+          ),
+        ),
+      ),
+      onLongPress: () {
+        HapticFeedback.mediumImpact();
+
+        showModalBottomSheetWithProperFocus(
+          context: context,
+          builder: (context) => UserActionsModal(
+            authStore: context.read<AuthStore>(),
+            name: channelName,
+            userLogin: channelInfo.broadcasterLogin,
+            userId: channelInfo.broadcasterId,
+            showPinOption: showPinOption,
+            isPinned: isPinned,
+            initialIsFollowing: initialIsFollowing,
+            onFollowChanged: onFollowChanged,
+          ),
+        );
+      },
+      child: Padding(
+        padding: EdgeInsets.fromLTRB(
+          16 + MediaQuery.of(context).padding.left,
+          8,
+          16 + MediaQuery.of(context).padding.right,
+          8,
+        ),
+        child: Row(
+          spacing: 12,
+          children: [
+            // Profile picture
+            ProfilePicture(userLogin: channelInfo.broadcasterLogin),
+            // Channel info
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  // Channel name
+                  Text(
+                    channelName,
+                    style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                      color: fontColor,
+                    ),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                  // Status and follow duration
+                  Text(
+                    showOfflineStatus ? 'Offline' : followedText,
+                    style: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w500,
+                      color: fontColor?.withValues(alpha: 0.6),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/home/stream_list/stream_card.dart b/lib/screens/home/stream_list/stream_card.dart
index 949788a8..0ffa914c 100644
--- a/lib/screens/home/stream_list/stream_card.dart
+++ b/lib/screens/home/stream_list/stream_card.dart
@@ -1,225 +1,256 @@
-import 'dart:math';
-
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:frosty/constants.dart';
-import 'package:frosty/main.dart';
-import 'package:frosty/models/stream.dart';
-import 'package:frosty/screens/channel/channel.dart';
-import 'package:frosty/screens/home/top/categories/category_streams.dart';
-import 'package:frosty/screens/settings/stores/auth_store.dart';
-import 'package:frosty/widgets/animate_scale.dart';
-import 'package:frosty/widgets/block_report_modal.dart';
-import 'package:frosty/widgets/cached_image.dart';
-import 'package:frosty/widgets/loading_indicator.dart';
-import 'package:frosty/widgets/profile_picture.dart';
-import 'package:frosty/widgets/uptime.dart';
-import 'package:intl/intl.dart';
-import 'package:provider/provider.dart';
-
-/// A tappable card widget that displays a stream's thumbnail and details.
-class StreamCard extends StatelessWidget {
-  final StreamTwitch streamInfo;
-  final bool showThumbnail;
-  final bool showCategory;
-
-  const StreamCard({
-    Key? key,
-    required this.streamInfo,
-    required this.showThumbnail,
-    this.showCategory = true,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    // Get a new URL for the thumbnail every 5 minutes so that the image is updated on refresh.
-    // This method adds a random value to the end of the URL to override the cached image.
-    final time = DateTime.now();
-    final cacheUrlExtension = time.day.toString() +
-        time.hour.toString() +
-        (time.minute ~/ 5).toString();
-
-    // Calculate the width and height of the thumbnail based on the device width and the stream card size setting.
-    // Constraint the resolution to 1920x1080 since that's the max resolution of the Twitch API.
-    final size = MediaQuery.of(context).size;
-    final pixelRatio = MediaQuery.of(context).devicePixelRatio;
-    final thumbnailWidth = min((size.width * pixelRatio) ~/ 3, 1920);
-    final thumbnailHeight = min((thumbnailWidth * (9 / 16)).toInt(), 1080);
-
-    final thumbnail = AspectRatio(
-      aspectRatio: 16 / 9,
-      child: FrostyCachedNetworkImage(
-        imageUrl: streamInfo.thumbnailUrl.replaceFirst(
-                '-{width}x{height}', '-${thumbnailWidth}x$thumbnailHeight') +
-            cacheUrlExtension,
-        placeholder: (context, url) =>
-            const ColoredBox(color: lightGray, child: LoadingIndicator()),
-        useOldImageOnUrlChange: true,
-      ),
-    );
-
-    final streamerName = regexEnglish.hasMatch(streamInfo.userName)
-        ? streamInfo.userName
-        : '${streamInfo.userName} (${streamInfo.userLogin})';
-
-    const subFontSize = 14.0;
-
-    final fontColor = DefaultTextStyle.of(context).style.color;
-
-    final imageSection = ClipRRect(
-        borderRadius: const BorderRadius.all(Radius.circular(5.0)),
-        child: Stack(
-          alignment: AlignmentDirectional.bottomEnd,
-          children: [
-            thumbnail,
-            Container(
-              padding: const EdgeInsets.all(2.0),
-              decoration: const BoxDecoration(
-                color: Color.fromRGBO(0, 0, 0, 0.5),
-                borderRadius: BorderRadius.all(
-                  Radius.circular(3.0),
-                ),
-              ),
-              margin: const EdgeInsets.all(2.0),
-              child: Uptime(
-                startTime: streamInfo.startedAt,
-                style: const TextStyle(
-                  fontSize: 12,
-                  fontWeight: FontWeight.w500,
-                  color: Colors.white,
-                ),
-              ),
-            )
-          ],
-        ));
-
-    final streamInfoSection = Padding(
-      padding: const EdgeInsets.only(left: 10.0),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            children: [
-              ProfilePicture(
-                userLogin: streamInfo.userLogin,
-                radius: 10.0,
-              ),
-              const SizedBox(width: 5.0),
-              Flexible(
-                child: Tooltip(
-                  message: 'Streamer: $streamerName',
-                  preferBelow: false,
-                  child: Text(
-                    streamerName,
-                    overflow: TextOverflow.ellipsis,
-                    style: TextStyle(
-                      fontSize: 16.0,
-                      fontWeight: FontWeight.w600,
-                      color: fontColor,
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-          const SizedBox(height: 5.0),
-          Tooltip(
-            message: 'Title: ${streamInfo.title.trim()}',
-            preferBelow: false,
-            padding: const EdgeInsets.all(10.0),
-            child: Text(
-              streamInfo.title.trim(),
-              overflow: TextOverflow.ellipsis,
-              style: TextStyle(
-                fontSize: subFontSize,
-                color: fontColor?.withOpacity(0.8),
-              ),
-            ),
-          ),
-          const SizedBox(height: 5.0),
-          if (showCategory) ...[
-            InkWell(
-              onTap: streamInfo.gameName.isNotEmpty
-                  ? () => Navigator.push(
-                        context,
-                        MaterialPageRoute(
-                          builder: (context) => CategoryStreams(
-                            categoryName: streamInfo.gameName,
-                            categoryId: streamInfo.gameId,
-                          ),
-                        ),
-                      )
-                  : null,
-              child: Tooltip(
-                message:
-                    'Category: ${streamInfo.gameName.isNotEmpty ? streamInfo.gameName : 'None'}',
-                preferBelow: false,
-                child: Text(
-                  streamInfo.gameName.isNotEmpty
-                      ? streamInfo.gameName
-                      : 'No Category',
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                    fontSize: subFontSize,
-                    color: fontColor?.withOpacity(0.8),
-                  ),
-                ),
-              ),
-            ),
-            const SizedBox(height: 5.0),
-          ],
-          Text(
-            '${NumberFormat().format(streamInfo.viewerCount)} viewers',
-            style: TextStyle(
-              fontSize: subFontSize,
-              color: fontColor?.withOpacity(0.8),
-            ),
-          ),
-        ],
-      ),
-    );
-
-    return AnimateScale(
-      onTap: () => Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => VideoChat(
-            userId: streamInfo.userId,
-            userName: streamInfo.userName,
-            userLogin: streamInfo.userLogin,
-          ),
-        ),
-      ),
-      onLongPress: () {
-        HapticFeedback.mediumImpact();
-
-        showModalBottomSheet(
-          backgroundColor: Colors.transparent,
-          context: context,
-          builder: (context) => BlockReportModal(
-            authStore: context.read<AuthStore>(),
-            name: streamerName,
-            userLogin: streamInfo.userLogin,
-            userId: streamInfo.userId,
-          ),
-        );
-      },
-      child: Padding(
-        padding: EdgeInsets.symmetric(
-            vertical: 10.0, horizontal: showThumbnail ? 15.0 : 5.0),
-        child: Row(
-          children: [
-            if (showThumbnail)
-              Flexible(
-                child: imageSection,
-              ),
-            Flexible(
-              flex: 2,
-              child: streamInfoSection,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:frosty/constants.dart';
+import 'package:frosty/models/stream.dart';
+import 'package:frosty/screens/channel/channel.dart';
+import 'package:frosty/screens/home/top/categories/category_streams.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/utils.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
+import 'package:frosty/widgets/frosty_photo_view_dialog.dart';
+import 'package:frosty/widgets/profile_picture.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
+import 'package:frosty/widgets/uptime.dart';
+import 'package:frosty/widgets/user_actions_modal.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+
+/// A tappable card widget that displays a stream's thumbnail and details.
+class StreamCard extends StatelessWidget {
+  final StreamTwitch streamInfo;
+  final bool showThumbnail;
+  final bool showCategory;
+  final bool showPinOption;
+  final bool? isPinned;
+  final bool? initialIsFollowing;
+  final ValueChanged<bool>? onFollowChanged;
+
+  const StreamCard({
+    super.key,
+    required this.streamInfo,
+    required this.showThumbnail,
+    this.showCategory = true,
+    this.showPinOption = false,
+    this.isPinned,
+    this.initialIsFollowing,
+    this.onFollowChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // Generate a unique cache key for the thumbnail URL that updates every 5 minutes.
+    // This ensures the image is refreshed periodically to reflect the latest content.
+    final time = DateTime.now();
+    final cacheKey =
+        '${streamInfo.thumbnailUrl}-${time.day}-${time.hour}-${time.minute ~/ 5}';
+
+    // Calculate the width and height of the thumbnail based on the device width and the stream card size setting.
+    // Constraint the resolution to 1920x1080 since that's the max resolution of the Twitch API.
+    final size = MediaQuery.of(context).size;
+    final pixelRatio = MediaQuery.of(context).devicePixelRatio;
+    final thumbnailWidth = min((size.width * pixelRatio) ~/ 3, 1920);
+    final thumbnailHeight = min((thumbnailWidth * (9 / 16)).toInt(), 1080);
+
+    final thumbnail = AspectRatio(
+      aspectRatio: 16 / 9,
+      child: FrostyCachedNetworkImage(
+        imageUrl: streamInfo.thumbnailUrl.replaceFirst(
+          '-{width}x{height}',
+          '-${thumbnailWidth}x$thumbnailHeight',
+        ),
+        cacheKey: cacheKey,
+        placeholder: (context, url) => const SkeletonLoader(
+          borderRadius: kCardBorderRadius,
+        ),
+        useOldImageOnUrlChange: true,
+      ),
+    );
+
+    final streamerName = getReadableName(
+      streamInfo.userName,
+      streamInfo.userLogin,
+    );
+
+    final streamTitle = streamInfo.title.trim();
+    final category = streamInfo.gameName.isNotEmpty
+        ? streamInfo.gameName
+        : 'No Category';
+
+    const subFontSize = 14.0;
+
+    final fontColor = DefaultTextStyle.of(context).style.color;
+
+    final imageSection = ClipRRect(
+      borderRadius: kCardBorderRadius,
+      child: Stack(
+        alignment: AlignmentDirectional.bottomEnd,
+        children: [
+          GestureDetector(
+            onLongPress: () {
+              HapticFeedback.lightImpact();
+              showDialog(
+                context: context,
+                builder: (context) => FrostyPhotoViewDialog(
+                  imageUrl: streamInfo
+                      .thumbnailUrl, // Pass original URL with {width}x{height} placeholder
+                  cacheKey: cacheKey,
+                ),
+              );
+            },
+            child: thumbnail,
+          ),
+          Container(
+            margin: const EdgeInsets.all(3),
+            padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 1),
+            decoration: BoxDecoration(
+              color: Colors.black.withValues(alpha: 0.55),
+              borderRadius: BorderRadius.circular(6),
+              border: Border.all(
+                color: Colors.white.withValues(alpha: 0.08),
+                width: 0.5,
+              ),
+            ),
+            child: Uptime(
+              startTime: streamInfo.startedAt,
+              style: TextStyle(
+                fontSize: 12,
+                fontWeight: FontWeight.w500,
+                color: context.frostyColors.overlayOnSurface,
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+
+    final streamInfoSection = Padding(
+      padding: const EdgeInsets.only(left: 12),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        spacing: 2,
+        children: [
+          Row(
+            spacing: 4,
+            children: [
+              ProfilePicture(userLogin: streamInfo.userLogin, radius: 10),
+              Flexible(
+                child: Tooltip(
+                  message: streamerName,
+                  preferBelow: false,
+                  child: Text(
+                    streamerName,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                      color: fontColor,
+                    ),
+                  ),
+                ),
+              ),
+            ],
+          ),
+          Tooltip(
+            message: streamTitle,
+            preferBelow: false,
+            child: Text(
+              streamTitle,
+              overflow: TextOverflow.ellipsis,
+              style: TextStyle(
+                fontSize: subFontSize,
+                color: fontColor?.withValues(alpha: 0.8),
+              ),
+            ),
+          ),
+          if (showCategory) ...[
+            InkWell(
+              onTap: streamInfo.gameName.isNotEmpty
+                  ? () => Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        settings: const RouteSettings(name: CategoryStreams.routeName),
+                        builder: (context) =>
+                            CategoryStreams(categoryId: streamInfo.gameId),
+                      ),
+                    )
+                  : null,
+              child: Tooltip(
+                message: category,
+                preferBelow: false,
+                child: Text(
+                  category,
+                  overflow: TextOverflow.ellipsis,
+                  style: TextStyle(
+                    fontSize: subFontSize,
+                    color: fontColor?.withValues(alpha: 0.8),
+                  ),
+                ),
+              ),
+            ),
+          ],
+          Text(
+            '${NumberFormat().format(streamInfo.viewerCount)} viewers',
+            style: TextStyle(
+              fontSize: subFontSize,
+              color: fontColor?.withValues(alpha: 0.8),
+              fontFeatures: const [FontFeature.tabularFigures()],
+            ),
+          ),
+        ],
+      ),
+    );
+
+    return InkWell(
+      onTap: () => Navigator.push(
+        context,
+        MaterialPageRoute(
+          settings: const RouteSettings(name: VideoChat.routeName),
+          builder: (context) => VideoChat(
+            userId: streamInfo.userId,
+            userName: streamInfo.userName,
+            userLogin: streamInfo.userLogin,
+          ),
+        ),
+      ),
+      onLongPress: () {
+        HapticFeedback.mediumImpact();
+
+        showModalBottomSheetWithProperFocus(
+          context: context,
+          builder: (context) => UserActionsModal(
+            authStore: context.read<AuthStore>(),
+            name: streamerName,
+            userLogin: streamInfo.userLogin,
+            userId: streamInfo.userId,
+            showPinOption: showPinOption,
+            isPinned: isPinned,
+            initialIsFollowing: initialIsFollowing,
+            onFollowChanged: onFollowChanged,
+          ),
+        );
+      },
+      child: Padding(
+        padding: EdgeInsets.only(
+          top: 8,
+          bottom: 8,
+          left: showThumbnail
+              ? 16 + MediaQuery.of(context).padding.left
+              : 4 + MediaQuery.of(context).padding.left,
+          right: showThumbnail
+              ? 16 + MediaQuery.of(context).padding.right
+              : 4 + MediaQuery.of(context).padding.right,
+        ),
+        child: Row(
+          children: [
+            if (showThumbnail) Flexible(child: imageSection),
+            Flexible(flex: 2, child: streamInfoSection),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/home/stream_list/stream_list_store.dart b/lib/screens/home/stream_list/stream_list_store.dart
index 39985548..f7165dd4 100644
--- a/lib/screens/home/stream_list/stream_list_store.dart
+++ b/lib/screens/home/stream_list/stream_list_store.dart
@@ -1,9 +1,14 @@
 import 'dart:io';
 
 import 'package:flutter/widgets.dart';
+import 'package:frosty/apis/base_api_client.dart';
 import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/models/category.dart';
+import 'package:frosty/models/followed_channel.dart';
 import 'package:frosty/models/stream.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:mobx/mobx.dart';
 
 part 'stream_list_store.g.dart';
@@ -14,128 +19,538 @@ abstract class ListStoreBase with Store {
   /// The authentication store.
   final AuthStore authStore;
 
+  final SettingsStore settingsStore;
+
   /// Twitch API service class for making requests.
   final TwitchApi twitchApi;
 
+  /// GQL client for tag streams and ascending viewer sort (Helix has neither).
+  final TwitchGqlApi? twitchGqlApi;
+
   /// The type of list that this store is handling.
   final ListType listType;
 
   /// The category id to use when fetching streams if the [listType] is [ListType.category].
   final String? categoryId;
 
+  /// Freeform tag name when [listType] is [ListType.tag].
+  final String? freeformTag;
+
+  /// Viewer sort for top / category / tag lists.
+  @observable
+  StreamViewerSort sortOrder;
+
   /// The scroll controller used for handling scroll to top (if provided).
   /// If provided, will use the [ScrollToTop] widget to scroll to the top of the list instead of the bottom tab bar.
   final ScrollController? scrollController;
 
+  /// When true, [dispose] will dispose [scrollController]. Shared controllers
+  /// from Home must not be disposed here.
+  final bool ownsScrollController;
+
   /// The pagination cursor for the streams.
   String? _streamsCursor;
 
+  /// When true, pages come from Helix (GQL cursor/integrity unavailable).
+  /// ASC Helix fill starts from the top; duplicates are skipped and the list
+  /// is re-sorted client-side.
+  var _helixFill = false;
+
+  /// Last page was served by GQL with server-side sort — append in API order.
+  var _lastPageWasGql = false;
+
+  /// The pagination cursor for the offline followed channels.
+  String? _offlineChannelsCursor;
+
   /// The last time the streams were refreshed/updated.
   var lastTimeRefreshed = DateTime.now();
 
   /// Returns whether or not there are more streams and loading status for pagination.
   @computed
-  bool get hasMore => _isLoading == false && _streamsCursor != null;
+  bool get hasMore =>
+      isLoading == false && (_streamsCursor != null || _helixFill);
+
+  @computed
+  bool get isLoading =>
+      _isAllStreamsLoading ||
+      _isPinnedStreamsLoading ||
+      _isCategoryDetailsLoading ||
+      _isOfflineChannelsLoading;
+
+  /// Selected stream language codes from settings (lowercase ISO 639-1).
+  List<String> get _languageFilter => settingsStore.streamLanguages
+      .map((l) => l.trim().toLowerCase())
+      .where((l) => l.isNotEmpty)
+      .toList();
 
   /// The loading status for pagination.
-  @readonly
-  bool _isLoading = false;
 
   /// The list of the fetched streams.
   @readonly
   var _allStreams = ObservableList<StreamTwitch>();
 
+  @readonly
+  bool _isAllStreamsLoading = false;
+
+  @readonly
+  var _pinnedStreams = ObservableList<StreamTwitch>();
+
+  @readonly
+  bool _isPinnedStreamsLoading = false;
+
+  @readonly
+  CategoryTwitch? _categoryDetails;
+
+  @readonly
+  var _isCategoryDetailsLoading = false;
+
+  /// The list of offline followed channels.
+  @readonly
+  var _allOfflineChannels = ObservableList<FollowedChannel>();
+
+  @readonly
+  bool _isOfflineChannelsLoading = false;
+
+  /// Whether or not there are more offline channels for pagination.
+  @computed
+  bool get hasMoreOfflineChannels =>
+      _isOfflineChannelsLoading == false && _offlineChannelsCursor != null;
+
   /// Whether or not the scroll to top button is visible.
   @observable
   var showJumpButton = false;
 
+  /// Whether the offline channels section is expanded.
+  @observable
+  var isOfflineChannelsExpanded = false;
+
   /// The list of the fetched streams with blocked users filtered out.
   @computed
   ObservableList<StreamTwitch> get streams => _allStreams
-      .where((streamInfo) => !authStore.user.blockedUsers
-          .map((blockedUser) => blockedUser.userId)
-          .contains(streamInfo.userId))
+      .where(
+        (streamInfo) => !authStore.user.blockedUsers
+            .map((blockedUser) => blockedUser.userId)
+            .contains(streamInfo.userId),
+      )
       .toList()
       .asObservable();
 
+  /// All pinned channels (only live streams).
+  @computed
+  List<dynamic> get allPinnedChannels {
+    final blockedUserIds = authStore.user.blockedUsers
+        .map((blockedUser) => blockedUser.userId)
+        .toSet();
+
+    // Get live pinned streams only
+    return _pinnedStreams
+        .where((stream) => !blockedUserIds.contains(stream.userId))
+        .toList();
+  }
+
+  /// The list of offline followed channels with blocked users filtered out
+  /// and excluding channels that are currently live or pinned.
+  @computed
+  ObservableList<FollowedChannel> get offlineChannels {
+    final liveChannelIds = streams.map((stream) => stream.userId).toSet();
+    final pinnedChannelIds = settingsStore.pinnedChannelIds.toSet();
+    final blockedUserIds = authStore.user.blockedUsers
+        .map((blockedUser) => blockedUser.userId)
+        .toSet();
+
+    return _allOfflineChannels
+        .where(
+          (channel) =>
+              !liveChannelIds.contains(channel.broadcasterId) &&
+              !pinnedChannelIds.contains(channel.broadcasterId) &&
+              !blockedUserIds.contains(channel.broadcasterId),
+        )
+        .toList()
+        .asObservable();
+  }
+
   /// The error message to show if any. Will be non-null if there is an error.
   @readonly
   String? _error;
 
+  ReactionDisposer? _pinnedStreamsReactionDisposer;
+  ReactionDisposer? _offlineChannelsExpansionDisposer;
+  ReactionDisposer? _languageFilterReactionDisposer;
+
   ListStoreBase({
     required this.authStore,
+    required this.settingsStore,
     required this.twitchApi,
     required this.listType,
+    this.twitchGqlApi,
     this.categoryId,
+    this.freeformTag,
+    this.sortOrder = StreamViewerSort.viewersDesc,
     this.scrollController,
+    this.ownsScrollController = false,
   }) {
     if (scrollController != null) {
-      scrollController!.addListener(() {
-        if (scrollController!.position.atEdge ||
-            scrollController!.position.outOfRange) {
-          showJumpButton = false;
-        } else {
-          showJumpButton = true;
-        }
-      });
+      scrollController!.addListener(_onScroll);
+    }
+
+    if (listType == ListType.followed) {
+      _pinnedStreamsReactionDisposer = reaction(
+        (_) => settingsStore.pinnedChannelIds,
+        (_) => getPinnedStreams(),
+      );
+
+      getPinnedStreams();
+
+      // Fetch offline channels only when expanded
+      _offlineChannelsExpansionDisposer = reaction(
+        (_) => isOfflineChannelsExpanded,
+        (expanded) {
+          if (expanded) {
+            // Fetch offline channels when expanded (only if not already loaded)
+            if (_allOfflineChannels.isEmpty) {
+              getOfflineChannels();
+            }
+          } else {
+            // Clear offline channels when collapsed to save memory
+            _allOfflineChannels.clear();
+            _offlineChannelsCursor = null;
+          }
+        },
+      );
+    }
+
+    if (listType == ListType.category) {
+      _getCategoryDetails();
+    }
+
+    // Reload directory lists when the language filter or sort changes.
+    if (listType != ListType.followed) {
+      sortOrder = settingsStore.streamViewerSort;
+      _languageFilterReactionDisposer = reaction(
+        (_) => [
+          ...settingsStore.streamLanguages,
+          settingsStore.streamViewerSort,
+        ],
+        (_) {
+          sortOrder = settingsStore.streamViewerSort;
+          refreshStreams();
+        },
+      );
     }
 
     getStreams();
   }
 
+  void _onScroll() {
+    final controller = scrollController;
+    if (controller == null || !controller.hasClients) return;
+
+    final position = controller.position;
+    if (position.atEdge || position.outOfRange) {
+      showJumpButton = false;
+    } else {
+      showJumpButton = true;
+    }
+
+    // Backup pagination trigger (in addition to SliverList near-end builds).
+    if (hasMore &&
+        position.pixels >= position.maxScrollExtent - 800) {
+      getStreams();
+    }
+  }
+
+  /// Prefer GQL for tag directories (both sorts) and for ascending Top/category.
+  bool get _preferGqlDirectory {
+    if (twitchGqlApi == null || _helixFill) return false;
+    if (listType == ListType.tag) return true;
+    return listType != ListType.followed &&
+        sortOrder == StreamViewerSort.viewersAsc;
+  }
+
   /// Fetches the streams based on the type and current cursor.
   @action
   Future<void> getStreams() async {
-    _isLoading = true;
+    if (_isAllStreamsLoading) return;
+
+    _isAllStreamsLoading = true;
 
     try {
-      final StreamsTwitch newStreams;
-      switch (listType) {
-        case ListType.followed:
-          newStreams = await twitchApi.getFollowedStreams(
-            id: authStore.user.details!.id,
-            headers: authStore.headersTwitch,
-            cursor: _streamsCursor,
-          );
-          break;
-        case ListType.top:
-          newStreams = await twitchApi.getTopStreams(
-            headers: authStore.headersTwitch,
-            cursor: _streamsCursor,
-          );
-          break;
-        case ListType.category:
-          newStreams = await twitchApi.getStreamsUnderCategory(
-            gameId: categoryId!,
-            headers: authStore.headersTwitch,
-            cursor: _streamsCursor,
-          );
-          break;
+      final languages = _languageFilter;
+      final isAsc = sortOrder == StreamViewerSort.viewersAsc;
+      final useGql = _preferGqlDirectory;
+      _lastPageWasGql = false;
+
+      StreamsTwitch? newStreams;
+      if (listType == ListType.followed) {
+        newStreams = await twitchApi.getFollowedStreams(
+          id: authStore.user.details!.id,
+          cursor: _streamsCursor,
+        );
+      } else if (useGql) {
+        newStreams = await _fetchGqlDirectory(languages: languages);
+        if (newStreams != null) {
+          _lastPageWasGql = true;
+        }
       }
 
-      if (_streamsCursor == null) {
-        _allStreams = newStreams.data.asObservable();
-      } else {
-        _allStreams.addAll(newStreams.data);
+      // Helix: Top/category DESC, or GQL unavailable / integrity fallback.
+      newStreams ??= await twitchApi.getDirectoryStreams(
+        languages: languages,
+        gameId: listType == ListType.category ? categoryId : null,
+        freeformTag: listType == ListType.tag ? freeformTag : null,
+        cursor: _streamsCursor,
+        minCount: listType == ListType.tag ? 40 : (isAsc ? 30 : 50),
+        maxPages: listType == ListType.tag ? 25 : (isAsc ? 20 : 12),
+      );
+
+      final next = newStreams.pagination['cursor'];
+      final hasCursor = next != null && next.isNotEmpty;
+
+      // Empty Helix window with cursor left ⇒ keep scanning (sparse tags).
+      final isHelixContinuation = !_lastPageWasGql &&
+          (_streamsCursor != null ||
+              (_helixFill && _allStreams.isNotEmpty));
+      if (isHelixContinuation && newStreams.data.isEmpty) {
+        if (hasCursor) {
+          _streamsCursor = next;
+          _error = null;
+          _isAllStreamsLoading = false;
+          await getStreams();
+          return;
+        }
+        _streamsCursor = null;
+        _helixFill = false;
+        _error = null;
+        return;
+      }
+
+      // GQL pages are already server-sorted — keep API order.
+      // Helix ASC fill: sort page + full list so late matches land correctly.
+      final pageData = (!_lastPageWasGql && isAsc)
+          ? (List<StreamTwitch>.of(newStreams.data)..sort(
+              (a, b) => a.viewerCount.compareTo(b.viewerCount),
+            ))
+          : newStreams.data;
+
+      if (_allStreams.isEmpty && !_helixFill) {
+        _allStreams = pageData.asObservable();
+      } else {
+        final existingIds = _allStreams.map((s) => s.userId).toSet();
+        _allStreams.addAll(
+          pageData.where((s) => !existingIds.contains(s.userId)),
+        );
+      }
+
+      if (!_lastPageWasGql && isAsc && _allStreams.length > 1) {
+        final sorted = _allStreams.toList()
+          ..sort((a, b) => a.viewerCount.compareTo(b.viewerCount));
+        _allStreams = sorted.asObservable();
+      }
+
+      _streamsCursor = hasCursor ? next : null;
+      if (_streamsCursor == null) {
+        _helixFill = false;
+      } else if (!_lastPageWasGql && isAsc) {
+        _helixFill = true;
       }
-      _streamsCursor = newStreams.pagination['cursor'];
 
       _error = null;
     } on SocketException {
-      _error = 'Failed to connect';
+      _error = 'Unable to connect to Twitch';
+      debugPrint('Streams SocketException: No internet connection');
+      if (_streamsCursor != null && _allStreams.isNotEmpty) {
+        _streamsCursor = null;
+        _helixFill = false;
+      }
+    } on ApiException catch (e) {
+      _error = e.message;
+      debugPrint('Streams ApiException: $e');
+      if (_allStreams.isNotEmpty) {
+        // Mid-scroll GQL failure: fall back to Helix fill when useful.
+        if (!_helixFill &&
+            (listType == ListType.tag || isAscDirectory)) {
+          _helixFill = true;
+          _streamsCursor = null;
+          _error = null;
+          _isAllStreamsLoading = false;
+          await getStreams();
+          return;
+        }
+        _streamsCursor = null;
+        _helixFill = false;
+        _error = null;
+      }
     } catch (e) {
-      _error = e.toString();
+      _error = 'Something went wrong loading streams';
+      debugPrint('Streams error: $e');
+      if (_streamsCursor != null && _allStreams.isNotEmpty) {
+        _streamsCursor = null;
+        _helixFill = false;
+        _error = null;
+      }
+    } finally {
+      _isAllStreamsLoading = false;
+    }
+  }
+
+  /// GQL directory page with integrity retry. Returns null to trigger Helix.
+  Future<StreamsTwitch?> _fetchGqlDirectory({
+    required List<String> languages,
+  }) async {
+    final gql = twitchGqlApi;
+    if (gql == null) return null;
+
+    final langs = languages.isEmpty ? null : languages;
+
+    try {
+      return await authStore.user.runWithGqlIntegrity(
+        gqlToken: authStore.gqlToken,
+        action: ({authToken, integrityToken, deviceId}) {
+          switch (listType) {
+            case ListType.tag:
+              return gql.getStreams(
+                freeformTags: [freeformTag!],
+                sort: sortOrder,
+                languages: langs,
+                cursor: _streamsCursor,
+                authToken: authToken,
+                integrityToken: integrityToken,
+                deviceId: deviceId,
+              );
+            case ListType.category:
+              return gql.getGameStreams(
+                gameId: categoryId!,
+                sort: sortOrder,
+                languages: langs,
+                cursor: _streamsCursor,
+                authToken: authToken,
+                integrityToken: integrityToken,
+                deviceId: deviceId,
+              );
+            case ListType.top:
+              return gql.getStreams(
+                sort: sortOrder,
+                languages: langs,
+                cursor: _streamsCursor,
+                authToken: authToken,
+                integrityToken: integrityToken,
+                deviceId: deviceId,
+              );
+            case ListType.followed:
+              throw StateError('GQL directory not used for followed');
+          }
+        },
+      );
+    } on IntegrityCheckException catch (e) {
+      debugPrint('Streams GQL integrity: $e — falling back to Helix');
+      _helixFill = true;
+      // Keep cursor null so Helix starts from the top (dedupe handles overlap).
+      _streamsCursor = null;
+      return null;
+    }
+  }
+
+  bool get isAscDirectory =>
+      sortOrder == StreamViewerSort.viewersAsc &&
+      listType != ListType.followed;
+
+  /// Persists viewer sort and reloads via the settings reaction.
+  @action
+  Future<void> setSortOrder(StreamViewerSort order) async {
+    settingsStore.streamViewerSort = order;
+  }
+
+  @action
+  Future<void> getPinnedStreams() async {
+    if (settingsStore.pinnedChannelIds.isEmpty) {
+      _pinnedStreams.clear();
+      return;
     }
 
-    _isLoading = false;
+    _isPinnedStreamsLoading = true;
+
+    try {
+      _pinnedStreams = (await twitchApi.getStreamsByIds(
+        userIds: settingsStore.pinnedChannelIds,
+      )).data.asObservable();
+
+      _error = null;
+    } on SocketException {
+      _error = 'Unable to connect to Twitch';
+      debugPrint('Pinned streams SocketException: No internet connection');
+    } on ApiException catch (e) {
+      _error = e.message;
+      debugPrint('Pinned streams ApiException: $e');
+    } catch (e) {
+      _error = 'Something went wrong loading pinned streams';
+      debugPrint('Pinned streams error: $e');
+    }
+
+    _isPinnedStreamsLoading = false;
+  }
+
+  @action
+  Future<void> getOfflineChannels() async {
+    _isOfflineChannelsLoading = true;
+
+    try {
+      final followedChannels = await twitchApi.getFollowedChannels(
+        userId: authStore.user.details!.id,
+        cursor: _offlineChannelsCursor,
+      );
+
+      if (_offlineChannelsCursor == null) {
+        _allOfflineChannels = followedChannels.data.asObservable();
+      } else {
+        _allOfflineChannels.addAll(followedChannels.data);
+      }
+      _offlineChannelsCursor = followedChannels.pagination['cursor'];
+
+      _error = null;
+    } on SocketException {
+      _error = 'Unable to connect to Twitch';
+      debugPrint('Offline channels SocketException: No internet connection');
+    } on ApiException catch (e) {
+      _error = e.message;
+      debugPrint('Offline channels ApiException: $e');
+    } catch (e) {
+      _error = 'Something went wrong loading offline channels';
+      debugPrint('Offline channels error: $e');
+    }
+
+    _isOfflineChannelsLoading = false;
   }
 
   /// Resets the cursor and then fetches the streams.
   @action
-  Future<void> refreshStreams() {
-    _streamsCursor = null;
+  Future<void> refreshStreams() async {
+    if (listType == ListType.followed) {
+      await getPinnedStreams();
 
-    return getStreams();
+      // Only refresh offline channels if they are currently expanded
+      if (isOfflineChannelsExpanded) {
+        _offlineChannelsCursor = null;
+        await getOfflineChannels();
+      }
+    }
+
+    _streamsCursor = null;
+    _helixFill = false;
+    _lastPageWasGql = false;
+    await getStreams();
+  }
+
+  @action
+  Future<void> _getCategoryDetails() async {
+    if (categoryId == null) return;
+
+    _isCategoryDetailsLoading = true;
+
+    final categoryDetails = await twitchApi.getCategory(gameId: categoryId!);
+
+    _categoryDetails = categoryDetails.data.first;
+
+    _isCategoryDetailsLoading = false;
   }
 
   /// Checks the last time the streams were refreshed and updates them if it has been more than 5 minutes.
@@ -148,7 +563,18 @@ abstract class ListStoreBase with Store {
     lastTimeRefreshed = now;
   }
 
-  void dispose() => scrollController?.dispose();
+  void dispose() {
+    _pinnedStreamsReactionDisposer?.call();
+    _offlineChannelsExpansionDisposer?.call();
+    _languageFilterReactionDisposer?.call();
+
+    if (scrollController != null) {
+      scrollController!.removeListener(_onScroll);
+      if (ownsScrollController) {
+        scrollController!.dispose();
+      }
+    }
+  }
 }
 
 /// The possible types of lists that can be displayed.
@@ -156,8 +582,5 @@ abstract class ListStoreBase with Store {
 /// [ListType.followed] is the list of streams that the user is following.
 /// [ListType.top] is the list of top streams.
 /// [ListType.category] is the list of streams under a category.
-enum ListType {
-  followed,
-  top,
-  category,
-}
+/// [ListType.tag] is streams matching a freeform tag (GQL sort + tags; Helix fallback).
+enum ListType { followed, top, category, tag }
diff --git a/lib/screens/home/stream_list/stream_list_store.g.dart b/lib/screens/home/stream_list/stream_list_store.g.dart
index 91e08af9..3ae70481 100644
--- a/lib/screens/home/stream_list/stream_list_store.g.dart
+++ b/lib/screens/home/stream_list/stream_list_store.g.dart
@@ -12,37 +12,72 @@ mixin _$ListStore on ListStoreBase, Store {
   Computed<bool>? _$hasMoreComputed;
 
   @override
-  bool get hasMore => (_$hasMoreComputed ??=
-          Computed<bool>(() => super.hasMore, name: 'ListStoreBase.hasMore'))
-      .value;
+  bool get hasMore => (_$hasMoreComputed ??= Computed<bool>(
+    () => super.hasMore,
+    name: 'ListStoreBase.hasMore',
+  )).value;
+  Computed<bool>? _$isLoadingComputed;
+
+  @override
+  bool get isLoading => (_$isLoadingComputed ??= Computed<bool>(
+    () => super.isLoading,
+    name: 'ListStoreBase.isLoading',
+  )).value;
+  Computed<bool>? _$hasMoreOfflineChannelsComputed;
+
+  @override
+  bool get hasMoreOfflineChannels =>
+      (_$hasMoreOfflineChannelsComputed ??= Computed<bool>(
+        () => super.hasMoreOfflineChannels,
+        name: 'ListStoreBase.hasMoreOfflineChannels',
+      )).value;
   Computed<ObservableList<StreamTwitch>>? _$streamsComputed;
 
   @override
-  ObservableList<StreamTwitch> get streams => (_$streamsComputed ??=
-          Computed<ObservableList<StreamTwitch>>(() => super.streams,
-              name: 'ListStoreBase.streams'))
-      .value;
+  ObservableList<StreamTwitch> get streams =>
+      (_$streamsComputed ??= Computed<ObservableList<StreamTwitch>>(
+        () => super.streams,
+        name: 'ListStoreBase.streams',
+      )).value;
+  Computed<List<dynamic>>? _$allPinnedChannelsComputed;
 
-  late final _$_isLoadingAtom =
-      Atom(name: 'ListStoreBase._isLoading', context: context);
+  @override
+  List<dynamic> get allPinnedChannels =>
+      (_$allPinnedChannelsComputed ??= Computed<List<dynamic>>(
+        () => super.allPinnedChannels,
+        name: 'ListStoreBase.allPinnedChannels',
+      )).value;
+  Computed<ObservableList<FollowedChannel>>? _$offlineChannelsComputed;
 
-  bool get isLoading {
-    _$_isLoadingAtom.reportRead();
-    return super._isLoading;
+  @override
+  ObservableList<FollowedChannel> get offlineChannels =>
+      (_$offlineChannelsComputed ??= Computed<ObservableList<FollowedChannel>>(
+        () => super.offlineChannels,
+        name: 'ListStoreBase.offlineChannels',
+      )).value;
+
+  late final _$sortOrderAtom = Atom(
+    name: 'ListStoreBase.sortOrder',
+    context: context,
+  );
+
+  @override
+  StreamViewerSort get sortOrder {
+    _$sortOrderAtom.reportRead();
+    return super.sortOrder;
   }
 
   @override
-  bool get _isLoading => isLoading;
-
-  @override
-  set _isLoading(bool value) {
-    _$_isLoadingAtom.reportWrite(value, super._isLoading, () {
-      super._isLoading = value;
+  set sortOrder(StreamViewerSort value) {
+    _$sortOrderAtom.reportWrite(value, super.sortOrder, () {
+      super.sortOrder = value;
     });
   }
 
-  late final _$_allStreamsAtom =
-      Atom(name: 'ListStoreBase._allStreams', context: context);
+  late final _$_allStreamsAtom = Atom(
+    name: 'ListStoreBase._allStreams',
+    context: context,
+  );
 
   ObservableList<StreamTwitch> get allStreams {
     _$_allStreamsAtom.reportRead();
@@ -59,8 +94,166 @@ mixin _$ListStore on ListStoreBase, Store {
     });
   }
 
-  late final _$showJumpButtonAtom =
-      Atom(name: 'ListStoreBase.showJumpButton', context: context);
+  late final _$_isAllStreamsLoadingAtom = Atom(
+    name: 'ListStoreBase._isAllStreamsLoading',
+    context: context,
+  );
+
+  bool get isAllStreamsLoading {
+    _$_isAllStreamsLoadingAtom.reportRead();
+    return super._isAllStreamsLoading;
+  }
+
+  @override
+  bool get _isAllStreamsLoading => isAllStreamsLoading;
+
+  @override
+  set _isAllStreamsLoading(bool value) {
+    _$_isAllStreamsLoadingAtom.reportWrite(
+      value,
+      super._isAllStreamsLoading,
+      () {
+        super._isAllStreamsLoading = value;
+      },
+    );
+  }
+
+  late final _$_pinnedStreamsAtom = Atom(
+    name: 'ListStoreBase._pinnedStreams',
+    context: context,
+  );
+
+  ObservableList<StreamTwitch> get pinnedStreams {
+    _$_pinnedStreamsAtom.reportRead();
+    return super._pinnedStreams;
+  }
+
+  @override
+  ObservableList<StreamTwitch> get _pinnedStreams => pinnedStreams;
+
+  @override
+  set _pinnedStreams(ObservableList<StreamTwitch> value) {
+    _$_pinnedStreamsAtom.reportWrite(value, super._pinnedStreams, () {
+      super._pinnedStreams = value;
+    });
+  }
+
+  late final _$_isPinnedStreamsLoadingAtom = Atom(
+    name: 'ListStoreBase._isPinnedStreamsLoading',
+    context: context,
+  );
+
+  bool get isPinnedStreamsLoading {
+    _$_isPinnedStreamsLoadingAtom.reportRead();
+    return super._isPinnedStreamsLoading;
+  }
+
+  @override
+  bool get _isPinnedStreamsLoading => isPinnedStreamsLoading;
+
+  @override
+  set _isPinnedStreamsLoading(bool value) {
+    _$_isPinnedStreamsLoadingAtom.reportWrite(
+      value,
+      super._isPinnedStreamsLoading,
+      () {
+        super._isPinnedStreamsLoading = value;
+      },
+    );
+  }
+
+  late final _$_categoryDetailsAtom = Atom(
+    name: 'ListStoreBase._categoryDetails',
+    context: context,
+  );
+
+  CategoryTwitch? get categoryDetails {
+    _$_categoryDetailsAtom.reportRead();
+    return super._categoryDetails;
+  }
+
+  @override
+  CategoryTwitch? get _categoryDetails => categoryDetails;
+
+  @override
+  set _categoryDetails(CategoryTwitch? value) {
+    _$_categoryDetailsAtom.reportWrite(value, super._categoryDetails, () {
+      super._categoryDetails = value;
+    });
+  }
+
+  late final _$_isCategoryDetailsLoadingAtom = Atom(
+    name: 'ListStoreBase._isCategoryDetailsLoading',
+    context: context,
+  );
+
+  bool get isCategoryDetailsLoading {
+    _$_isCategoryDetailsLoadingAtom.reportRead();
+    return super._isCategoryDetailsLoading;
+  }
+
+  @override
+  bool get _isCategoryDetailsLoading => isCategoryDetailsLoading;
+
+  @override
+  set _isCategoryDetailsLoading(bool value) {
+    _$_isCategoryDetailsLoadingAtom.reportWrite(
+      value,
+      super._isCategoryDetailsLoading,
+      () {
+        super._isCategoryDetailsLoading = value;
+      },
+    );
+  }
+
+  late final _$_allOfflineChannelsAtom = Atom(
+    name: 'ListStoreBase._allOfflineChannels',
+    context: context,
+  );
+
+  ObservableList<FollowedChannel> get allOfflineChannels {
+    _$_allOfflineChannelsAtom.reportRead();
+    return super._allOfflineChannels;
+  }
+
+  @override
+  ObservableList<FollowedChannel> get _allOfflineChannels => allOfflineChannels;
+
+  @override
+  set _allOfflineChannels(ObservableList<FollowedChannel> value) {
+    _$_allOfflineChannelsAtom.reportWrite(value, super._allOfflineChannels, () {
+      super._allOfflineChannels = value;
+    });
+  }
+
+  late final _$_isOfflineChannelsLoadingAtom = Atom(
+    name: 'ListStoreBase._isOfflineChannelsLoading',
+    context: context,
+  );
+
+  bool get isOfflineChannelsLoading {
+    _$_isOfflineChannelsLoadingAtom.reportRead();
+    return super._isOfflineChannelsLoading;
+  }
+
+  @override
+  bool get _isOfflineChannelsLoading => isOfflineChannelsLoading;
+
+  @override
+  set _isOfflineChannelsLoading(bool value) {
+    _$_isOfflineChannelsLoadingAtom.reportWrite(
+      value,
+      super._isOfflineChannelsLoading,
+      () {
+        super._isOfflineChannelsLoading = value;
+      },
+    );
+  }
+
+  late final _$showJumpButtonAtom = Atom(
+    name: 'ListStoreBase.showJumpButton',
+    context: context,
+  );
 
   @override
   bool get showJumpButton {
@@ -75,8 +268,32 @@ mixin _$ListStore on ListStoreBase, Store {
     });
   }
 
-  late final _$_errorAtom =
-      Atom(name: 'ListStoreBase._error', context: context);
+  late final _$isOfflineChannelsExpandedAtom = Atom(
+    name: 'ListStoreBase.isOfflineChannelsExpanded',
+    context: context,
+  );
+
+  @override
+  bool get isOfflineChannelsExpanded {
+    _$isOfflineChannelsExpandedAtom.reportRead();
+    return super.isOfflineChannelsExpanded;
+  }
+
+  @override
+  set isOfflineChannelsExpanded(bool value) {
+    _$isOfflineChannelsExpandedAtom.reportWrite(
+      value,
+      super.isOfflineChannelsExpanded,
+      () {
+        super.isOfflineChannelsExpanded = value;
+      },
+    );
+  }
+
+  late final _$_errorAtom = Atom(
+    name: 'ListStoreBase._error',
+    context: context,
+  );
 
   String? get error {
     _$_errorAtom.reportRead();
@@ -93,34 +310,82 @@ mixin _$ListStore on ListStoreBase, Store {
     });
   }
 
-  late final _$getStreamsAsyncAction =
-      AsyncAction('ListStoreBase.getStreams', context: context);
+  late final _$getStreamsAsyncAction = AsyncAction(
+    'ListStoreBase.getStreams',
+    context: context,
+  );
 
   @override
   Future<void> getStreams() {
     return _$getStreamsAsyncAction.run(() => super.getStreams());
   }
 
-  late final _$ListStoreBaseActionController =
-      ActionController(name: 'ListStoreBase', context: context);
+  late final _$setSortOrderAsyncAction = AsyncAction(
+    'ListStoreBase.setSortOrder',
+    context: context,
+  );
+
+  @override
+  Future<void> setSortOrder(StreamViewerSort order) {
+    return _$setSortOrderAsyncAction.run(() => super.setSortOrder(order));
+  }
+
+  late final _$getPinnedStreamsAsyncAction = AsyncAction(
+    'ListStoreBase.getPinnedStreams',
+    context: context,
+  );
+
+  @override
+  Future<void> getPinnedStreams() {
+    return _$getPinnedStreamsAsyncAction.run(() => super.getPinnedStreams());
+  }
+
+  late final _$getOfflineChannelsAsyncAction = AsyncAction(
+    'ListStoreBase.getOfflineChannels',
+    context: context,
+  );
+
+  @override
+  Future<void> getOfflineChannels() {
+    return _$getOfflineChannelsAsyncAction.run(
+      () => super.getOfflineChannels(),
+    );
+  }
+
+  late final _$refreshStreamsAsyncAction = AsyncAction(
+    'ListStoreBase.refreshStreams',
+    context: context,
+  );
 
   @override
   Future<void> refreshStreams() {
-    final _$actionInfo = _$ListStoreBaseActionController.startAction(
-        name: 'ListStoreBase.refreshStreams');
-    try {
-      return super.refreshStreams();
-    } finally {
-      _$ListStoreBaseActionController.endAction(_$actionInfo);
-    }
+    return _$refreshStreamsAsyncAction.run(() => super.refreshStreams());
+  }
+
+  late final _$_getCategoryDetailsAsyncAction = AsyncAction(
+    'ListStoreBase._getCategoryDetails',
+    context: context,
+  );
+
+  @override
+  Future<void> _getCategoryDetails() {
+    return _$_getCategoryDetailsAsyncAction.run(
+      () => super._getCategoryDetails(),
+    );
   }
 
   @override
   String toString() {
     return '''
+sortOrder: ${sortOrder},
 showJumpButton: ${showJumpButton},
+isOfflineChannelsExpanded: ${isOfflineChannelsExpanded},
 hasMore: ${hasMore},
-streams: ${streams}
+isLoading: ${isLoading},
+hasMoreOfflineChannels: ${hasMoreOfflineChannels},
+streams: ${streams},
+allPinnedChannels: ${allPinnedChannels},
+offlineChannels: ${offlineChannels}
     ''';
   }
 }
diff --git a/lib/screens/home/stream_list/streams_list.dart b/lib/screens/home/stream_list/streams_list.dart
index 062a6472..46c1ffc1 100644
--- a/lib/screens/home/stream_list/streams_list.dart
+++ b/lib/screens/home/stream_list/streams_list.dart
@@ -2,13 +2,20 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/models/stream.dart';
 import 'package:frosty/screens/home/stream_list/large_stream_card.dart';
+import 'package:frosty/screens/home/stream_list/offline_channel_card.dart';
 import 'package:frosty/screens/home/stream_list/stream_card.dart';
 import 'package:frosty/screens/home/stream_list/stream_list_store.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/loading_indicator.dart';
+import 'package:frosty/widgets/expandable_section_header.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
+import 'package:frosty/widgets/scroll_to_top_button.dart';
+import 'package:frosty/widgets/section_header.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
 import 'package:provider/provider.dart';
 
 /// A widget that displays a list of followed or top streams based on the provided [listType].
@@ -17,14 +24,28 @@ class StreamsList extends StatefulWidget {
   /// The type of list to display.
   final ListType listType;
 
+  final String? categoryId;
+
+  /// Freeform tag when [listType] is [ListType.tag].
+  final String? freeformTag;
+
+  /// Viewer sort for top / category / tag lists.
+  final StreamViewerSort sortOrder;
+
   /// The scroll controller to use for scroll to top functionality.
-  final ScrollController scrollController;
+  final ScrollController? scrollController;
+
+  final bool showJumpButton;
 
   const StreamsList({
-    Key? key,
+    super.key,
     required this.listType,
-    required this.scrollController,
-  }) : super(key: key);
+    this.categoryId,
+    this.freeformTag,
+    this.sortOrder = StreamViewerSort.viewersDesc,
+    this.scrollController,
+    this.showJumpButton = false,
+  });
 
   @override
   State<StreamsList> createState() => _StreamsListState();
@@ -32,11 +53,8 @@ class StreamsList extends StatefulWidget {
 
 class _StreamsListState extends State<StreamsList>
     with AutomaticKeepAliveClientMixin, WidgetsBindingObserver {
-  late final _listStore = ListStore(
-    authStore: context.read<AuthStore>(),
-    twitchApi: context.read<TwitchApi>(),
-    listType: widget.listType,
-  );
+  late final ListStore _listStore;
+  ScrollController? _scrollController;
 
   @override
   bool get wantKeepAlive => true;
@@ -45,6 +63,34 @@ class _StreamsListState extends State<StreamsList>
   void initState() {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
+
+    if (widget.scrollController == null && widget.showJumpButton) {
+      _scrollController = ScrollController();
+    }
+
+    _listStore = ListStore(
+      authStore: context.read<AuthStore>(),
+      settingsStore: context.read<SettingsStore>(),
+      twitchApi: context.read<TwitchApi>(),
+      twitchGqlApi: context.read<TwitchGqlApi>(),
+      listType: widget.listType,
+      categoryId: widget.categoryId,
+      freeformTag: widget.freeformTag,
+      sortOrder: widget.sortOrder,
+      scrollController: widget.scrollController ?? _scrollController,
+      ownsScrollController: widget.scrollController == null && widget.showJumpButton,
+    );
+  }
+
+  @override
+  void dispose() {
+    // ListStore disposes the controller when it owns it.
+    if (!_listStore.ownsScrollController) {
+      _scrollController?.dispose();
+    }
+    WidgetsBinding.instance.removeObserver(this);
+    _listStore.dispose();
+    super.dispose();
   }
 
   @override
@@ -62,7 +108,18 @@ class _StreamsListState extends State<StreamsList>
 
     _listStore.checkLastTimeRefreshedAndUpdate();
 
-    return RefreshIndicator(
+    final extraTopPadding = widget.listType == ListType.top
+        ? kToolbarHeight
+        : widget.listType == ListType.category
+        ? kToolbarHeight + 122
+        : widget.listType == ListType.tag
+        ? kToolbarHeight
+        : 0.0;
+
+    final topPadding = MediaQuery.of(context).padding.top + extraTopPadding;
+
+    return RefreshIndicator.adaptive(
+      edgeOffset: topPadding,
       onRefresh: () async {
         HapticFeedback.lightImpact();
 
@@ -70,11 +127,11 @@ class _StreamsListState extends State<StreamsList>
 
         if (_listStore.error != null) {
           final snackBar = SnackBar(
-            content: AlertMessage(message: _listStore.error!),
-            behavior: SnackBarBehavior.floating,
+            content: AlertMessage(message: _listStore.error!, centered: false),
           );
 
-          if (!mounted) return;
+          if (!context.mounted) return;
+
           ScaffoldMessenger.of(context).showSnackBar(snackBar);
         }
       },
@@ -83,71 +140,376 @@ class _StreamsListState extends State<StreamsList>
           Widget? statusWidget;
 
           if (_listStore.error != null) {
-            statusWidget = AlertMessage(message: _listStore.error!);
+            statusWidget = AlertMessage(
+              message: _listStore.error!,
+              vertical: true,
+            );
           }
 
           if (_listStore.streams.isEmpty) {
             if (_listStore.isLoading && _listStore.error == null) {
-              statusWidget =
-                  const LoadingIndicator(subtitle: 'Loading streams...');
+              // Show skeleton loaders while loading
+              final settingsStore = context.watch<SettingsStore>();
+              final isLargeCard = settingsStore.largeStreamCard;
+              final isFollowingTab = widget.listType == ListType.followed;
+              final pinnedChannelCount = settingsStore.pinnedChannelIds.length;
+
+              return CustomScrollView(
+                slivers: [
+                  // Add padding for app bar
+                  SliverTopPadding(extraTopPadding: extraTopPadding),
+
+                  // Show pinned section if following tab and has pinned channels
+                  if (isFollowingTab && pinnedChannelCount > 0) ...[
+                    SliverToBoxAdapter(
+                      child: Builder(
+                        builder: (context) => SectionHeader(
+                          'Pinned',
+                          isFirst: true,
+                          padding: EdgeInsets.fromLTRB(
+                            16 + MediaQuery.of(context).padding.left,
+                            8,
+                            16 + MediaQuery.of(context).padding.right,
+                            8,
+                          ),
+                        ),
+                      ),
+                    ),
+                    SliverList.builder(
+                      itemCount: pinnedChannelCount,
+                      itemBuilder: (context, index) {
+                        if (isLargeCard) {
+                          return LargeStreamCardSkeletonLoader(
+                            showThumbnail: settingsStore.showThumbnails,
+                            showCategory: widget.listType != ListType.category,
+                          );
+                        } else {
+                          return StreamCardSkeletonLoader(
+                            showThumbnail: settingsStore.showThumbnails,
+                            showCategory: widget.listType != ListType.category,
+                          );
+                        }
+                      },
+                    ),
+                    SliverToBoxAdapter(
+                      child: Builder(
+                        builder: (context) => SectionHeader(
+                          'All',
+                          isFirst: true,
+                          padding: EdgeInsets.fromLTRB(
+                            16 + MediaQuery.of(context).padding.left,
+                            8,
+                            16 + MediaQuery.of(context).padding.right,
+                            8,
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+
+                  SliverList.builder(
+                    itemCount: isFollowingTab && pinnedChannelCount > 0 ? 5 : 8,
+                    itemBuilder: (context, index) {
+                      if (isLargeCard) {
+                        return LargeStreamCardSkeletonLoader(
+                          showThumbnail: settingsStore.showThumbnails,
+                          showCategory: widget.listType != ListType.category,
+                        );
+                      } else {
+                        return StreamCardSkeletonLoader(
+                          showThumbnail: settingsStore.showThumbnails,
+                          showCategory: widget.listType != ListType.category,
+                        );
+                      }
+                    },
+                  ),
+                  SliverBottomPadding(),
+                ],
+              );
             } else {
               statusWidget = AlertMessage(
-                  message: widget.listType == ListType.followed
-                      ? 'No followed streams'
-                      : 'No top streams');
+                message: switch (widget.listType) {
+                  ListType.followed => 'No followed streams',
+                  ListType.tag => 'No streams with this tag',
+                  ListType.category => 'No streams in this category',
+                  ListType.top => 'No top streams',
+                },
+                vertical: true,
+              );
             }
           }
 
           if (statusWidget != null) {
             return CustomScrollView(
               slivers: [
-                SliverFillRemaining(
-                  child: Center(
-                    child: statusWidget,
-                  ),
-                )
+                SliverFillRemaining(child: Center(child: statusWidget)),
               ],
             );
           }
 
-          return ListView.builder(
-            physics: const AlwaysScrollableScrollPhysics(),
-            controller: widget.scrollController,
-            itemCount: _listStore.streams.length,
-            itemBuilder: (context, index) {
-              if (index > _listStore.streams.length - 10 &&
-                  _listStore.hasMore) {
-                debugPrint('$index ${_listStore.streams.length}');
+          final settingsStore = context.watch<SettingsStore>();
 
-                _listStore.getStreams();
-              }
-              return Observer(
-                builder: (context) =>
-                    context.read<SettingsStore>().largeStreamCard
-                        ? LargeStreamCard(
-                            key: ValueKey(_listStore.streams[index].userId),
-                            streamInfo: _listStore.streams[index],
-                            showThumbnail:
-                                context.read<SettingsStore>().showThumbnails,
-                          )
-                        : StreamCard(
-                            key: ValueKey(_listStore.streams[index].userId),
-                            streamInfo: _listStore.streams[index],
-                            showThumbnail:
-                                context.read<SettingsStore>().showThumbnails,
+          final unpinnedStreams = widget.listType == ListType.followed
+              ? _listStore.streams
+                    .where(
+                      (stream) => !settingsStore.pinnedChannelIds.contains(
+                        stream.userId,
+                      ),
+                    )
+                    .toList()
+              : _listStore.streams;
+
+          final isFollowingTab = widget.listType == ListType.followed;
+          // Refresh following lists after unfollow so live/offline rows drop.
+          void onFollowChanged(bool following) {
+            if (isFollowingTab && !following) {
+              _listStore.refreshStreams();
+            }
+          }
+
+          return Stack(
+            alignment: AlignmentDirectional.bottomCenter,
+            children: [
+              Column(
+                children: [
+                  Expanded(
+                    child: FrostyScrollbar(
+                      controller: _listStore.scrollController,
+                      padding: EdgeInsets.only(
+                        top:
+                            MediaQuery.of(context).padding.top +
+                            extraTopPadding,
+                        bottom: MediaQuery.of(context).padding.bottom,
+                      ),
+                      child: CustomScrollView(
+                        physics: const AlwaysScrollableScrollPhysics(),
+                        controller: _listStore.scrollController,
+                        slivers: [
+                          SliverTopPadding(extraTopPadding: extraTopPadding),
+                          if (isFollowingTab &&
+                              _listStore.allPinnedChannels.isNotEmpty) ...[
+                            SliverToBoxAdapter(
+                              child: Builder(
+                                builder: (context) => SectionHeader(
+                                  'Pinned',
+                                  isFirst: true,
+                                  padding: EdgeInsets.fromLTRB(
+                                    16 + MediaQuery.of(context).padding.left,
+                                    8,
+                                    16 + MediaQuery.of(context).padding.right,
+                                    8,
+                                  ),
+                                ),
+                              ),
+                            ),
+                            Observer(
+                              builder: (context) {
+                                // Show actual pinned channels (live streams only)
+                                return SliverList.builder(
+                                  itemCount:
+                                      _listStore.allPinnedChannels.length,
+                                  itemBuilder: (context, index) {
+                                    final stream =
+                                        _listStore.allPinnedChannels[index]
+                                            as StreamTwitch;
+                                    return Observer(
+                                      builder: (context) {
+                                        // Only live stream cards since we removed offline pinned channels
+                                        return settingsStore.largeStreamCard
+                                            ? LargeStreamCard(
+                                                key: ValueKey(stream.userId),
+                                                streamInfo: stream,
+                                                showThumbnail: context
+                                                    .read<SettingsStore>()
+                                                    .showThumbnails,
+                                                showCategory:
+                                                    widget.categoryId == null,
+                                                showPinOption: true,
+                                                isPinned: true,
+                                                initialIsFollowing: true,
+                                                onFollowChanged:
+                                                    onFollowChanged,
+                                              )
+                                            : StreamCard(
+                                                key: ValueKey(stream.userId),
+                                                streamInfo: stream,
+                                                showThumbnail: context
+                                                    .read<SettingsStore>()
+                                                    .showThumbnails,
+                                                showCategory:
+                                                    widget.categoryId == null,
+                                                showPinOption: true,
+                                                isPinned: true,
+                                                initialIsFollowing: true,
+                                                onFollowChanged:
+                                                    onFollowChanged,
+                                              );
+                                      },
+                                    );
+                                  },
+                                );
+                              },
+                            ),
+                            SliverToBoxAdapter(
+                              child: Builder(
+                                builder: (context) => SectionHeader(
+                                  'All',
+                                  isFirst: true,
+                                  padding: EdgeInsets.fromLTRB(
+                                    16 + MediaQuery.of(context).padding.left,
+                                    8,
+                                    16 + MediaQuery.of(context).padding.right,
+                                    8,
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                          SliverList.builder(
+                            itemCount: unpinnedStreams.length,
+                            itemBuilder: (context, index) {
+                              if (index > unpinnedStreams.length - 10 &&
+                                  _listStore.hasMore) {
+                                _listStore.getStreams();
+                              }
+                              return Observer(
+                                builder: (context) =>
+                                    settingsStore.largeStreamCard
+                                    ? LargeStreamCard(
+                                        key: ValueKey(
+                                          unpinnedStreams[index].userId,
+                                        ),
+                                        streamInfo: unpinnedStreams[index],
+                                        showThumbnail:
+                                            settingsStore.showThumbnails,
+                                        showCategory: widget.categoryId == null,
+                                        showPinOption: isFollowingTab,
+                                        isPinned: false,
+                                        initialIsFollowing:
+                                            isFollowingTab ? true : null,
+                                        onFollowChanged: onFollowChanged,
+                                      )
+                                    : StreamCard(
+                                        key: ValueKey(
+                                          unpinnedStreams[index].userId,
+                                        ),
+                                        streamInfo: unpinnedStreams[index],
+                                        showThumbnail:
+                                            settingsStore.showThumbnails,
+                                        showCategory: widget.categoryId == null,
+                                        showPinOption: isFollowingTab,
+                                        isPinned: false,
+                                        initialIsFollowing:
+                                            isFollowingTab ? true : null,
+                                        onFollowChanged: onFollowChanged,
+                                      ),
+                              );
+                            },
                           ),
-              );
-            },
+                          // Add offline followed channels section for following tab
+                          if (isFollowingTab) ...[
+                            SliverToBoxAdapter(
+                              child: Observer(
+                                builder: (context) => ExpandableSectionHeader(
+                                  'Offline',
+                                  isFirst: true,
+                                  padding: EdgeInsets.fromLTRB(
+                                    16 + MediaQuery.of(context).padding.left,
+                                    16,
+                                    16 + MediaQuery.of(context).padding.right,
+                                    8,
+                                  ),
+                                  isExpanded:
+                                      _listStore.isOfflineChannelsExpanded,
+                                  onToggle: () =>
+                                      _listStore.isOfflineChannelsExpanded =
+                                          !_listStore.isOfflineChannelsExpanded,
+                                ),
+                              ),
+                            ),
+                            if (_listStore.isOfflineChannelsExpanded)
+                              SliverList.builder(
+                                itemCount: _listStore.offlineChannels.length,
+                                itemBuilder: (context, index) {
+                                  // Load more offline channels when nearing the end
+                                  if (index >
+                                          _listStore.offlineChannels.length -
+                                              5 &&
+                                      _listStore.hasMoreOfflineChannels) {
+                                    _listStore.getOfflineChannels();
+                                  }
+
+                                  return Observer(
+                                    builder: (context) => OfflineChannelCard(
+                                      key: ValueKey(
+                                        _listStore
+                                            .offlineChannels[index]
+                                            .broadcasterId,
+                                      ),
+                                      channelInfo:
+                                          _listStore.offlineChannels[index],
+                                      showPinOption: false,
+                                      isPinned: false,
+                                      initialIsFollowing: true,
+                                      onFollowChanged: onFollowChanged,
+                                    ),
+                                  );
+                                },
+                              ),
+                          ],
+                          // Add padding for bottom navigation bar
+                          const SliverBottomPadding(),
+                        ],
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+              if (widget.showJumpButton)
+                Observer(
+                  builder: (context) => AnimatedSwitcher(
+                    duration: const Duration(milliseconds: 300),
+                    switchInCurve: Curves.easeOut,
+                    switchOutCurve: Curves.easeIn,
+                    child: _listStore.showJumpButton
+                        ? ScrollToTopButton(
+                            scrollController: _listStore.scrollController!,
+                          )
+                        : null,
+                  ),
+                ),
+            ],
           );
         },
       ),
     );
   }
+}
+
+/// Helper widget for consistent top padding in sliver lists
+class SliverTopPadding extends StatelessWidget {
+  final double extraTopPadding;
+
+  const SliverTopPadding({super.key, this.extraTopPadding = 0.0});
 
   @override
-  void dispose() {
-    WidgetsBinding.instance.removeObserver(this);
-    _listStore.dispose();
-    super.dispose();
+  Widget build(BuildContext context) {
+    return SliverToBoxAdapter(
+      child: SizedBox(
+        height: MediaQuery.of(context).padding.top + extraTopPadding,
+      ),
+    );
+  }
+}
+
+/// Helper widget for consistent bottom padding in sliver lists
+class SliverBottomPadding extends StatelessWidget {
+  const SliverBottomPadding({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverToBoxAdapter(
+      child: SizedBox(height: MediaQuery.of(context).padding.bottom),
+    );
   }
 }
diff --git a/lib/screens/home/top/categories/categories.dart b/lib/screens/home/top/categories/categories.dart
index 356c3499..39748a62 100644
--- a/lib/screens/home/top/categories/categories.dart
+++ b/lib/screens/home/top/categories/categories.dart
@@ -2,20 +2,19 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/screens/home/stream_list/streams_list.dart';
 import 'package:frosty/screens/home/top/categories/categories_store.dart';
 import 'package:frosty/screens/home/top/categories/category_card.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/loading_indicator.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
 import 'package:provider/provider.dart';
 
 class Categories extends StatefulWidget {
   final ScrollController scrollController;
 
-  const Categories({
-    Key? key,
-    required this.scrollController,
-  }) : super(key: key);
+  const Categories({super.key, required this.scrollController});
 
   @override
   State<Categories> createState() => _CategoriesState();
@@ -52,18 +51,24 @@ class _CategoriesState extends State<Categories>
 
     _categoriesStore.checkLastTimeRefreshedAndUpdate();
 
-    return RefreshIndicator(
+    final topPadding = MediaQuery.of(context).padding.top + kToolbarHeight;
+
+    return RefreshIndicator.adaptive(
+      edgeOffset: topPadding,
       onRefresh: () async {
         HapticFeedback.lightImpact();
         await _categoriesStore.refreshCategories();
 
         if (_categoriesStore.error != null) {
           final snackBar = SnackBar(
-            content: AlertMessage(message: _categoriesStore.error!),
-            behavior: SnackBarBehavior.floating,
+            content: AlertMessage(
+              message: _categoriesStore.error!,
+              centered: false,
+            ),
           );
 
-          if (!mounted) return;
+          if (!context.mounted) return;
+
           ScaffoldMessenger.of(context).showSnackBar(snackBar);
         }
       },
@@ -72,47 +77,70 @@ class _CategoriesState extends State<Categories>
           Widget? statusWidget;
 
           if (_categoriesStore.error != null) {
-            statusWidget = AlertMessage(message: _categoriesStore.error!);
+            statusWidget = AlertMessage(
+              message: _categoriesStore.error!,
+              vertical: true,
+            );
           }
 
           if (_categoriesStore.categories.isEmpty) {
             if (_categoriesStore.isLoading && _categoriesStore.error == null) {
-              statusWidget =
-                  const LoadingIndicator(subtitle: 'Loading categories...');
+              // Show skeleton loaders while loading
+              return CustomScrollView(
+                controller: widget.scrollController,
+                slivers: [
+                  const SliverTopPadding(extraTopPadding: kToolbarHeight),
+                  SliverList.builder(
+                    itemCount: 10,
+                    itemBuilder: (context, index) =>
+                        const CategorySkeletonLoader(),
+                  ),
+                  const SliverBottomPadding(),
+                ],
+              );
             } else {
-              statusWidget = const AlertMessage(message: 'No top categories');
+              statusWidget = const AlertMessage(
+                message: 'No top categories',
+                vertical: true,
+              );
             }
           }
 
           if (statusWidget != null) {
             return CustomScrollView(
               slivers: [
-                SliverFillRemaining(
-                  child: Center(
-                    child: statusWidget,
-                  ),
-                )
+                SliverFillRemaining(child: Center(child: statusWidget)),
               ],
             );
           }
 
-          return GridView.builder(
-            physics: const AlwaysScrollableScrollPhysics(),
+          return FrostyScrollbar(
             controller: widget.scrollController,
-            gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-              crossAxisCount: 2,
+            padding: EdgeInsets.only(
+              top: MediaQuery.of(context).padding.top + kToolbarHeight,
+              bottom: 64 + MediaQuery.of(context).padding.bottom,
+            ),
+            child: CustomScrollView(
+              physics: const AlwaysScrollableScrollPhysics(),
+              controller: widget.scrollController,
+              slivers: [
+                const SliverTopPadding(extraTopPadding: kToolbarHeight),
+                SliverList.builder(
+                  itemCount: _categoriesStore.categories.length,
+                  itemBuilder: (context, index) {
+                    if (index > _categoriesStore.categories.length - 10 &&
+                        _categoriesStore.hasMore) {
+                      _categoriesStore.getCategories();
+                    }
+                    return CategoryCard(
+                      key: ValueKey(_categoriesStore.categories[index].id),
+                      category: _categoriesStore.categories[index],
+                    );
+                  },
+                ),
+                const SliverBottomPadding(),
+              ],
             ),
-            itemCount: _categoriesStore.categories.length,
-            itemBuilder: (context, index) {
-              if (index > _categoriesStore.categories.length - 10 &&
-                  _categoriesStore.hasMore) {
-                _categoriesStore.getCategories();
-              }
-              return CategoryCard(
-                key: ValueKey(_categoriesStore.categories[index].id),
-                category: _categoriesStore.categories[index],
-              );
-            },
           );
         },
       ),
diff --git a/lib/screens/home/top/categories/categories_store.dart b/lib/screens/home/top/categories/categories_store.dart
index b1757f4c..3667da50 100644
--- a/lib/screens/home/top/categories/categories_store.dart
+++ b/lib/screens/home/top/categories/categories_store.dart
@@ -1,5 +1,7 @@
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
+import 'package:frosty/apis/base_api_client.dart';
 import 'package:frosty/apis/twitch_api.dart';
 import 'package:frosty/models/category.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
@@ -49,7 +51,6 @@ abstract class CategoriesStoreBase with Store {
 
     try {
       final result = await twitchApi.getTopCategories(
-        headers: authStore.headersTwitch,
         cursor: _categoriesCursor,
       );
 
@@ -62,9 +63,14 @@ abstract class CategoriesStoreBase with Store {
 
       _error = null;
     } on SocketException {
-      _error = 'Failed to connect';
+      _error = 'Unable to connect to Twitch';
+      debugPrint('Categories SocketException: No internet connection');
+    } on ApiException catch (e) {
+      _error = e.message;
+      debugPrint('Categories ApiException: $e');
     } catch (e) {
-      _error = e.toString();
+      _error = 'Something went wrong loading categories';
+      debugPrint('Categories error: $e');
     }
 
     _isLoading = false;
diff --git a/lib/screens/home/top/categories/categories_store.g.dart b/lib/screens/home/top/categories/categories_store.g.dart
index 30e0a904..83ecbc90 100644
--- a/lib/screens/home/top/categories/categories_store.g.dart
+++ b/lib/screens/home/top/categories/categories_store.g.dart
@@ -12,12 +12,15 @@ mixin _$CategoriesStore on CategoriesStoreBase, Store {
   Computed<bool>? _$hasMoreComputed;
 
   @override
-  bool get hasMore => (_$hasMoreComputed ??= Computed<bool>(() => super.hasMore,
-          name: 'CategoriesStoreBase.hasMore'))
-      .value;
+  bool get hasMore => (_$hasMoreComputed ??= Computed<bool>(
+    () => super.hasMore,
+    name: 'CategoriesStoreBase.hasMore',
+  )).value;
 
-  late final _$_isLoadingAtom =
-      Atom(name: 'CategoriesStoreBase._isLoading', context: context);
+  late final _$_isLoadingAtom = Atom(
+    name: 'CategoriesStoreBase._isLoading',
+    context: context,
+  );
 
   bool get isLoading {
     _$_isLoadingAtom.reportRead();
@@ -34,8 +37,10 @@ mixin _$CategoriesStore on CategoriesStoreBase, Store {
     });
   }
 
-  late final _$_categoriesAtom =
-      Atom(name: 'CategoriesStoreBase._categories', context: context);
+  late final _$_categoriesAtom = Atom(
+    name: 'CategoriesStoreBase._categories',
+    context: context,
+  );
 
   ObservableList<CategoryTwitch> get categories {
     _$_categoriesAtom.reportRead();
@@ -52,8 +57,10 @@ mixin _$CategoriesStore on CategoriesStoreBase, Store {
     });
   }
 
-  late final _$_errorAtom =
-      Atom(name: 'CategoriesStoreBase._error', context: context);
+  late final _$_errorAtom = Atom(
+    name: 'CategoriesStoreBase._error',
+    context: context,
+  );
 
   String? get error {
     _$_errorAtom.reportRead();
@@ -70,21 +77,26 @@ mixin _$CategoriesStore on CategoriesStoreBase, Store {
     });
   }
 
-  late final _$getCategoriesAsyncAction =
-      AsyncAction('CategoriesStoreBase.getCategories', context: context);
+  late final _$getCategoriesAsyncAction = AsyncAction(
+    'CategoriesStoreBase.getCategories',
+    context: context,
+  );
 
   @override
   Future<void> getCategories() {
     return _$getCategoriesAsyncAction.run(() => super.getCategories());
   }
 
-  late final _$CategoriesStoreBaseActionController =
-      ActionController(name: 'CategoriesStoreBase', context: context);
+  late final _$CategoriesStoreBaseActionController = ActionController(
+    name: 'CategoriesStoreBase',
+    context: context,
+  );
 
   @override
   Future<void> refreshCategories() {
     final _$actionInfo = _$CategoriesStoreBaseActionController.startAction(
-        name: 'CategoriesStoreBase.refreshCategories');
+      name: 'CategoriesStoreBase.refreshCategories',
+    );
     try {
       return super.refreshCategories();
     } finally {
diff --git a/lib/screens/home/top/categories/category_card.dart b/lib/screens/home/top/categories/category_card.dart
index a4fd584d..88daa502 100644
--- a/lib/screens/home/top/categories/category_card.dart
+++ b/lib/screens/home/top/categories/category_card.dart
@@ -1,66 +1,74 @@
 import 'package:flutter/material.dart';
-import 'package:frosty/main.dart';
+import 'package:frosty/constants.dart';
 import 'package:frosty/models/category.dart';
 import 'package:frosty/screens/home/top/categories/category_streams.dart';
-import 'package:frosty/widgets/cached_image.dart';
-import 'package:frosty/widgets/loading_indicator.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
 
 /// A tappable card widget that displays a category's box art and name under.
 class CategoryCard extends StatelessWidget {
   final CategoryTwitch category;
+  final bool isTappable;
 
   const CategoryCard({
-    Key? key,
+    super.key,
     required this.category,
-  }) : super(key: key);
+    this.isTappable = true,
+  });
 
   @override
   Widget build(BuildContext context) {
-    // Calculate the dimmensions of the box art based on the current dimmensions of the screen.
+    // Calculate the dimensions of the box art based on the current dimensions of the screen.
     final size = MediaQuery.of(context).size;
     final pixelRatio = MediaQuery.of(context).devicePixelRatio;
-    final artWidth = (size.width * pixelRatio) ~/ 3;
+    final artWidth = (size.width * pixelRatio) ~/ 5;
     final artHeight = (artWidth * (4 / 3)).toInt();
 
     return InkWell(
-      onTap: () => Navigator.push(
-        context,
-        MaterialPageRoute(
-          builder: (context) => CategoryStreams(
-            categoryName: category.name,
-            categoryId: category.id,
-          ),
-        ),
-      ),
+      onTap: isTappable
+          ? () => Navigator.push(
+              context,
+              MaterialPageRoute(
+                settings: const RouteSettings(name: CategoryStreams.routeName),
+                builder: (context) => CategoryStreams(categoryId: category.id),
+              ),
+            )
+          : null,
       child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 20.0),
-        child: Column(
+        padding: EdgeInsets.only(
+          top: 8,
+          bottom: 8,
+          left: 16 + MediaQuery.of(context).padding.left,
+          right: 16 + MediaQuery.of(context).padding.right,
+        ),
+        child: Row(
+          spacing: 16,
           children: [
-            Expanded(
+            SizedBox(
+              width: 80,
               child: ClipRRect(
-                borderRadius: const BorderRadius.all(Radius.circular(10.0)),
+                borderRadius: kCardBorderRadius,
                 child: AspectRatio(
                   aspectRatio: 3 / 4,
                   child: FrostyCachedNetworkImage(
                     imageUrl: category.boxArtUrl.replaceRange(
-                        category.boxArtUrl.lastIndexOf('-') + 1,
-                        null,
-                        '${artWidth}x$artHeight.jpg'),
-                    placeholder: (context, url) => const ColoredBox(
-                        color: lightGray, child: LoadingIndicator()),
+                      category.boxArtUrl.lastIndexOf('-') + 1,
+                      null,
+                      '${artWidth}x$artHeight.jpg',
+                    ),
+                    placeholder: (context, url) => const SkeletonLoader(
+                      borderRadius: kCardBorderRadius,
+                    ),
                   ),
                 ),
               ),
             ),
-            const SizedBox(height: 5.0),
-            Tooltip(
-              message: category.name,
-              preferBelow: false,
-              padding: const EdgeInsets.all(10.0),
+            Flexible(
               child: Text(
                 category.name,
-                style: const TextStyle(fontWeight: FontWeight.w600),
-                overflow: TextOverflow.ellipsis,
+                style: Theme.of(
+                  context,
+                ).textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w600),
               ),
             ),
           ],
diff --git a/lib/screens/home/top/categories/category_streams.dart b/lib/screens/home/top/categories/category_streams.dart
index bfcca929..d5a1edf0 100644
--- a/lib/screens/home/top/categories/category_streams.dart
+++ b/lib/screens/home/top/categories/category_streams.dart
@@ -1,211 +1,157 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/apis/twitch_api.dart';
-import 'package:frosty/main.dart';
-import 'package:frosty/models/category.dart';
-import 'package:frosty/screens/home/stream_list/large_stream_card.dart';
-import 'package:frosty/screens/home/stream_list/stream_card.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/constants.dart';
 import 'package:frosty/screens/home/stream_list/stream_list_store.dart';
+import 'package:frosty/screens/home/stream_list/streams_list.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
-import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/cached_image.dart';
-import 'package:frosty/widgets/loading_indicator.dart';
-import 'package:frosty/widgets/scroll_to_top_button.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
+import 'package:frosty/widgets/skeleton_loader.dart';
+import 'package:frosty/widgets/stream_sort_button.dart';
 import 'package:provider/provider.dart';
 
 /// A widget that displays a list of streams under the provided [categoryId].
-/// This differs from the normal [StreamsList] in that it uses slivers to display the box art on top.
 class CategoryStreams extends StatefulWidget {
-  /// The category name, used for the header on the box art sliver.
-  final String categoryName;
+  static const routeName = 'CategoryStreams';
 
   /// The category id, used for fetching the relevant streams in the [ListStore].
   final String categoryId;
 
-  const CategoryStreams({
-    Key? key,
-    required this.categoryName,
-    required this.categoryId,
-  }) : super(key: key);
+  const CategoryStreams({super.key, required this.categoryId});
 
   @override
   State<CategoryStreams> createState() => _CategoryStreamsState();
 }
 
 class _CategoryStreamsState extends State<CategoryStreams> {
+  late final _settingsStore = context.read<SettingsStore>();
+
   late final _listStore = ListStore(
-    authStore: context.read<AuthStore>(),
-    twitchApi: context.read<TwitchApi>(),
     listType: ListType.category,
     categoryId: widget.categoryId,
-    scrollController: ScrollController(),
+    authStore: context.read<AuthStore>(),
+    twitchApi: context.read<TwitchApi>(),
+    twitchGqlApi: context.read<TwitchGqlApi>(),
+    settingsStore: _settingsStore,
+    sortOrder: _settingsStore.streamViewerSort,
   );
 
   @override
   Widget build(BuildContext context) {
-    // Calculate the dimensions of the box art based on the screen width.
-    final size = MediaQuery.of(context).size;
-    final pixelRatio = MediaQuery.of(context).devicePixelRatio;
-    final artWidth = (size.width * pixelRatio).toInt();
-    final artHeight = (artWidth * (4 / 3)).toInt();
+    final theme = Theme.of(context);
 
     return Scaffold(
-      body: RefreshIndicator(
-        onRefresh: () async {
-          HapticFeedback.lightImpact();
-          await _listStore.refreshStreams();
-
-          if (_listStore.error != null) {
-            final snackBar = SnackBar(
-              content: AlertMessage(message: _listStore.error!),
-              behavior: SnackBarBehavior.floating,
-            );
-
-            if (!mounted) return;
-            ScaffoldMessenger.of(context).showSnackBar(snackBar);
-          }
-        },
-        child: Observer(
-          builder: (context) {
-            return Stack(
-              alignment: AlignmentDirectional.bottomCenter,
-              children: [
-                CustomScrollView(
-                  physics: const BouncingScrollPhysics(
-                      parent: AlwaysScrollableScrollPhysics()),
-                  controller: _listStore.scrollController,
-                  slivers: [
-                    SliverAppBar(
-                      leading: IconButton(
-                        icon: Icon(Icons.adaptive.arrow_back_rounded),
-                        onPressed: Navigator.of(context).pop,
-                      ),
-                      stretch: true,
-                      pinned: true,
-                      expandedHeight: MediaQuery.of(context).size.height / 3,
-                      flexibleSpace: FlexibleSpaceBar(
-                        stretchModes: const [
-                          StretchMode.fadeTitle,
-                          StretchMode.zoomBackground,
-                        ],
-                        centerTitle: true,
-                        title: Text(
-                          widget.categoryName,
-                          style: Theme.of(context)
-                              .textTheme
-                              .titleLarge
-                              ?.copyWith(fontWeight: FontWeight.bold),
-                          maxLines: 1,
-                          overflow: TextOverflow.ellipsis,
+      backgroundColor: theme.scaffoldBackgroundColor,
+      extendBody: true,
+      extendBodyBehindAppBar: true,
+      body: Stack(
+        children: [
+          // Stream list content behind the pinned elements
+          Positioned.fill(
+            child: Observer(
+              builder: (_) => StreamsList(
+                listType: ListType.category,
+                categoryId: widget.categoryId,
+                sortOrder: _settingsStore.streamViewerSort,
+                showJumpButton: true,
+              ),
+            ),
+          ),
+          // Single blurred background spanning app bar and category card
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: BlurredContainer(
+              gradientDirection: GradientDirection.up,
+              padding: EdgeInsets.only(
+                top: MediaQuery.of(context).padding.top,
+                left: MediaQuery.of(context).padding.left,
+                right: MediaQuery.of(context).padding.right,
+              ),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  // App bar section
+                  SizedBox(
+                    height: kToolbarHeight,
+                    child: Row(
+                      children: [
+                        IconButton(
+                          tooltip: 'Back',
+                          icon: Icon(Icons.adaptive.arrow_back_rounded),
+                          onPressed: Navigator.of(context).pop,
                         ),
-                        background: FutureBuilder(
-                          future: context.read<TwitchApi>().getCategory(
-                                headers:
-                                    context.read<AuthStore>().headersTwitch,
-                                gameId: _listStore.categoryId!,
-                              ),
-                          builder: (context,
-                              AsyncSnapshot<CategoriesTwitch> snapshot) {
-                            return snapshot.hasData
-                                ? FrostyCachedNetworkImage(
-                                    imageUrl: snapshot
-                                        .data!.data.first.boxArtUrl
-                                        .replaceRange(
-                                      snapshot.data!.data.first.boxArtUrl
-                                              .lastIndexOf('-') +
-                                          1,
-                                      null,
-                                      '${artWidth}x$artHeight.jpg',
-                                    ),
-                                    placeholder: (context, url) =>
-                                        const ColoredBox(
-                                            color: lightGray,
-                                            child: LoadingIndicator()),
-                                    color: const Color.fromRGBO(
-                                        255, 255, 255, 0.5),
-                                    colorBlendMode: BlendMode.modulate,
-                                    fit: BoxFit.cover,
-                                  )
-                                : const SizedBox();
-                          },
-                        ),
-                      ),
-                    ),
-                    if (_listStore.error != null)
-                      SliverFillRemaining(
-                        hasScrollBody: false,
-                        child: AlertMessage(message: _listStore.error!),
-                      )
-                    else if (_listStore.streams.isEmpty)
-                      if (_listStore.isLoading && _listStore.error == null)
-                        const SliverFillRemaining(
-                          hasScrollBody: false,
-                          child: LoadingIndicator(
-                            subtitle: 'Loading streams...',
-                          ),
-                        )
-                      else
-                        const SliverFillRemaining(
-                          hasScrollBody: false,
-                          child: AlertMessage(
-                            message: 'No streams found',
-                          ),
-                        )
-                    else
-                      SliverSafeArea(
-                        top: false,
-                        sliver: SliverList(
-                          delegate: SliverChildBuilderDelegate(
-                            (context, index) {
-                              if (index > _listStore.streams.length - 10 &&
-                                  _listStore.hasMore) {
-                                _listStore.getStreams();
-                              }
-                              return Observer(
-                                builder: (context) => context
-                                        .read<SettingsStore>()
-                                        .largeStreamCard
-                                    ? LargeStreamCard(
-                                        streamInfo: _listStore.streams[index],
-                                        showThumbnail: context
-                                            .read<SettingsStore>()
-                                            .showThumbnails,
-                                        showCategory: false,
-                                      )
-                                    : StreamCard(
-                                        streamInfo: _listStore.streams[index],
-                                        showThumbnail: context
-                                            .read<SettingsStore>()
-                                            .showThumbnails,
-                                        showCategory: false,
-                                      ),
-                              );
-                            },
-                            childCount: _listStore.streams.length,
+                        const Spacer(),
+                        Observer(
+                          builder: (_) => StreamSortButton(
+                            sortOrder: _settingsStore.streamViewerSort,
+                            onChanged: (order) =>
+                                _settingsStore.streamViewerSort = order,
                           ),
                         ),
-                      ),
-                  ],
-                ),
-                SafeArea(
-                  child: Observer(
-                    builder: (context) => AnimatedSwitcher(
-                      duration: const Duration(milliseconds: 200),
-                      switchInCurve: Curves.easeOut,
-                      switchOutCurve: Curves.easeIn,
-                      child: _listStore.showJumpButton
-                          ? ScrollToTopButton(
-                              scrollController: _listStore.scrollController!)
-                          : null,
+                      ],
                     ),
                   ),
-                ),
-              ],
-            );
-          },
-        ),
+                  // Category card section
+                  Observer(
+                    builder: (_) {
+                      if (_listStore.categoryDetails != null) {
+                        return _TransparentCategoryCard(
+                          category: _listStore.categoryDetails!,
+                        );
+                      } else {
+                        // Skeleton loader for category card
+                        return Padding(
+                          padding: const EdgeInsets.only(
+                            bottom: 16,
+                            left: 16,
+                            right: 16,
+                          ),
+                          child: Row(
+                            spacing: 12,
+                            children: [
+                              const SizedBox(
+                                width: 80,
+                                child: AspectRatio(
+                                  aspectRatio: 3 / 4,
+                                  child: SkeletonLoader(
+                                    borderRadius: kCardBorderRadius,
+                                  ),
+                                ),
+                              ),
+                              Expanded(
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  spacing: 8,
+                                  children: [
+                                    SkeletonLoader(
+                                      height: 20,
+                                      width: double.infinity,
+                                      borderRadius: BorderRadius.circular(4),
+                                    ),
+                                    SkeletonLoader(
+                                      height: 16,
+                                      width: 120,
+                                      borderRadius: BorderRadius.circular(4),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ],
+                          ),
+                        );
+                      }
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ],
       ),
     );
   }
@@ -216,3 +162,61 @@ class _CategoryStreamsState extends State<CategoryStreams> {
     super.dispose();
   }
 }
+
+/// A transparent version of CategoryCard for use in blurred overlays
+class _TransparentCategoryCard extends StatelessWidget {
+  final dynamic category;
+
+  const _TransparentCategoryCard({required this.category});
+
+  @override
+  Widget build(BuildContext context) {
+    // Calculate the dimensions of the box art based on the current dimensions of the screen.
+    final size = MediaQuery.of(context).size;
+    final pixelRatio = MediaQuery.of(context).devicePixelRatio;
+    final artWidth = (size.width * pixelRatio) ~/ 5;
+    final artHeight = (artWidth * (4 / 3)).toInt();
+
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 16, left: 16, right: 16),
+      child: Row(
+        spacing: 12,
+        children: [
+          SizedBox(
+            width: 80,
+            child: ClipRRect(
+              borderRadius: kCardBorderRadius,
+              child: AspectRatio(
+                aspectRatio: 3 / 4,
+                child: FrostyCachedNetworkImage(
+                  imageUrl: category.boxArtUrl.replaceRange(
+                    category.boxArtUrl.lastIndexOf('-') + 1,
+                    null,
+                    '${artWidth}x$artHeight.jpg',
+                  ),
+                  placeholder: (context, url) => const SkeletonLoader(
+                    borderRadius: kCardBorderRadius,
+                  ),
+                  fit: BoxFit.cover,
+                ),
+              ),
+            ),
+          ),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  category.name,
+                  style: Theme.of(context).textTheme.titleMedium,
+                  maxLines: 2,
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/screens/home/top/top.dart b/lib/screens/home/top/top.dart
index 686464e3..5f4d51a1 100644
--- a/lib/screens/home/top/top.dart
+++ b/lib/screens/home/top/top.dart
@@ -1,17 +1,18 @@
 import 'package:flutter/material.dart';
-import 'package:frosty/main.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/screens/home/home_store.dart';
 import 'package:frosty/screens/home/stream_list/stream_list_store.dart';
 import 'package:frosty/screens/home/stream_list/streams_list.dart';
 import 'package:frosty/screens/home/top/categories/categories.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/stream_sort_button.dart';
+import 'package:provider/provider.dart';
 
 class TopSection extends StatefulWidget {
   final HomeStore homeStore;
 
-  const TopSection({
-    Key? key,
-    required this.homeStore,
-  }) : super(key: key);
+  const TopSection({super.key, required this.homeStore});
 
   @override
   State<TopSection> createState() => _TopSectionState();
@@ -24,36 +25,30 @@ class _TopSectionState extends State<TopSection>
   @override
   void initState() {
     super.initState();
-    _tabBarController.addListener(() =>
-        widget.homeStore.topSectionCurrentIndex = _tabBarController.index);
+    _tabBarController.addListener(() {
+      widget.homeStore.topSectionCurrentIndex = _tabBarController.index;
+      setState(() {});
+    });
   }
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
+    final settingsStore = context.watch<SettingsStore>();
+    final showSort = _tabBarController.index == 0;
+
+    return Stack(
       children: [
-        TabBar(
-          controller: _tabBarController,
-          labelStyle: const TextStyle(
-            fontWeight: FontWeight.w600,
-            fontSize: 16.0,
-          ),
-          indicatorSize: TabBarIndicatorSize.label,
-          indicatorColor: purple,
-          tabs: const [
-            Tab(child: Text('Streams')),
-            Tab(child: Text('Categories')),
-          ],
-        ),
-        Expanded(
+        Positioned.fill(
           child: TabBarView(
             controller: _tabBarController,
             children: [
-              StreamsList(
-                listType: ListType.top,
-                scrollController:
-                    widget.homeStore.topSectionScrollControllers[0],
+              Observer(
+                builder: (_) => StreamsList(
+                  listType: ListType.top,
+                  sortOrder: settingsStore.streamViewerSort,
+                  scrollController:
+                      widget.homeStore.topSectionScrollControllers[0],
+                ),
               ),
               Categories(
                 scrollController:
@@ -62,6 +57,41 @@ class _TopSectionState extends State<TopSection>
             ],
           ),
         ),
+        Positioned(
+          top: 0,
+          left: 0,
+          right: 0,
+          child: BlurredContainer(
+            gradientDirection: GradientDirection.up,
+            padding: EdgeInsets.only(
+              top: MediaQuery.of(context).padding.top,
+              left: MediaQuery.of(context).padding.left,
+              right: MediaQuery.of(context).padding.right,
+            ),
+            child: Row(
+              children: [
+                Expanded(
+                  child: TabBar(
+                    isScrollable: true,
+                    controller: _tabBarController,
+                    tabs: const [
+                      Tab(child: Text('Streams')),
+                      Tab(child: Text('Categories')),
+                    ],
+                  ),
+                ),
+                if (showSort)
+                  Observer(
+                    builder: (_) => StreamSortButton(
+                      sortOrder: settingsStore.streamViewerSort,
+                      onChanged: (order) =>
+                          settingsStore.streamViewerSort = order,
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        ),
       ],
     );
   }
diff --git a/lib/screens/onboarding/login_webview.dart b/lib/screens/onboarding/login_webview.dart
new file mode 100644
index 00000000..b631544d
--- /dev/null
+++ b/lib/screens/onboarding/login_webview.dart
@@ -0,0 +1,79 @@
+import 'package:flutter/material.dart';
+import 'package:frosty/main.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/widgets/frosty_app_bar.dart';
+import 'package:frosty/widgets/frosty_dialog.dart';
+import 'package:provider/provider.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+/// Pushes the atomic moderator-scopes upgrade WebView.
+void openEnableModeratorTools(AuthStore authStore, {BuildContext? context}) {
+  final navContext = context ?? navigatorKey.currentContext;
+  if (navContext == null) return;
+  Navigator.of(navContext).push(
+    MaterialPageRoute(
+      builder: (context) => Provider<AuthStore>.value(
+        value: authStore,
+        child: const LoginWebView(upgradeModeratorScopes: true),
+      ),
+    ),
+  );
+}
+
+/// Reusable WebView widget for Twitch OAuth login flow
+class LoginWebView extends StatelessWidget {
+  /// Optional widget to navigate to after successful login
+  final Widget? routeAfter;
+
+  /// When true, requests core + moderator scopes and runs the atomic upgrade
+  /// commit instead of a full [AuthStore.login].
+  final bool upgradeModeratorScopes;
+
+  const LoginWebView({
+    super.key,
+    this.routeAfter,
+    this.upgradeModeratorScopes = false,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final authStore = context.read<AuthStore>();
+
+    return Scaffold(
+      appBar: FrostyAppBar(
+        title: Text(
+          upgradeModeratorScopes
+              ? 'Enable moderator tools'
+              : 'Connect with Twitch',
+        ),
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.help_rounded),
+            onPressed: () => showDialog(
+              context: context,
+              builder: (context) {
+                return FrostyDialog(
+                  title: 'Workaround for the Twitch cookie banner',
+                  message:
+                      'If the Twitch cookie banner is still blocking the login, try clicking one of the links in the cookie policy description and navigating until you reach the Twitch home page. From there, try logging in from the top-right profile icon. Once logged in, go back to the first onboarding step and try again.',
+                  actions: [
+                    TextButton(
+                      onPressed: Navigator.of(context).pop,
+                      child: const Text('Close'),
+                    ),
+                  ],
+                );
+              },
+            ),
+          ),
+        ],
+      ),
+      body: WebViewWidget(
+        controller: authStore.createAuthWebViewController(
+          routeAfter: routeAfter,
+          upgradeModeratorScopes: upgradeModeratorScopes,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/screens/onboarding/onboarding_intro.dart b/lib/screens/onboarding/onboarding_intro.dart
index 29fef250..b09cc714 100644
--- a/lib/screens/onboarding/onboarding_intro.dart
+++ b/lib/screens/onboarding/onboarding_intro.dart
@@ -4,7 +4,7 @@ import 'package:frosty/screens/onboarding/onboarding_scaffold.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
 class OnboardingIntro extends StatelessWidget {
-  const OnboardingIntro({Key? key}) : super(key: key);
+  const OnboardingIntro({super.key});
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/screens/onboarding/onboarding_login.dart b/lib/screens/onboarding/onboarding_login.dart
index 4e7b7408..f51de4ac 100644
--- a/lib/screens/onboarding/onboarding_login.dart
+++ b/lib/screens/onboarding/onboarding_login.dart
@@ -1,39 +1,24 @@
 import 'package:flutter/material.dart';
+import 'package:frosty/screens/onboarding/login_webview.dart';
 import 'package:frosty/screens/onboarding/onboarding_scaffold.dart';
 import 'package:frosty/screens/onboarding/onboarding_setup.dart';
-import 'package:frosty/screens/settings/stores/auth_store.dart';
-import 'package:frosty/widgets/app_bar.dart';
-import 'package:provider/provider.dart';
 import 'package:simple_icons/simple_icons.dart';
-import 'package:webview_flutter/webview_flutter.dart';
 
 class OnboardingLogin extends StatelessWidget {
-  const OnboardingLogin({Key? key}) : super(key: key);
+  const OnboardingLogin({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final authStore = context.read<AuthStore>();
-
     return OnboardingScaffold(
       header: 'Log in',
       subtitle:
-          'Frosty needs your permission in order to enable the ability to chat, view followed streams, and more.',
+          'Frosty needs permission to chat, view followed streams, and more.',
       disclaimer:
           'Frosty only asks for the necessary permissions through the official Twitch API. You\'ll be able to review them before authorizing.',
       buttonText: 'Connect with Twitch',
       buttonIcon: const Icon(SimpleIcons.twitch),
       skipRoute: const OnboardingSetup(),
-      route: Scaffold(
-        appBar: const FrostyAppBar(
-          title: Text('Connect with Twitch'),
-        ),
-        body: WebView(
-          initialUrl: authStore.loginUri.toString(),
-          navigationDelegate: (navigation) => authStore.handleNavigation(
-              navigation: navigation, routeAfter: const OnboardingSetup()),
-          javascriptMode: JavascriptMode.unrestricted,
-        ),
-      ),
+      route: LoginWebView(routeAfter: const OnboardingSetup()),
     );
   }
 }
diff --git a/lib/screens/onboarding/onboarding_scaffold.dart b/lib/screens/onboarding/onboarding_scaffold.dart
index d156c547..02921dad 100644
--- a/lib/screens/onboarding/onboarding_scaffold.dart
+++ b/lib/screens/onboarding/onboarding_scaffold.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:frosty/widgets/button.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class OnboardingScaffold extends StatelessWidget {
@@ -17,7 +16,7 @@ class OnboardingScaffold extends StatelessWidget {
   final bool isLast;
 
   const OnboardingScaffold({
-    Key? key,
+    super.key,
     required this.header,
     this.subtitle,
     this.disclaimer,
@@ -28,7 +27,7 @@ class OnboardingScaffold extends StatelessWidget {
     this.skipRoute,
     this.showLogo = false,
     this.isLast = false,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -38,12 +37,13 @@ class OnboardingScaffold extends StatelessWidget {
     ]);
 
     if (isLast) {
-      SharedPreferences.getInstance()
-          .then((prefs) => prefs.setBool('first_run', false));
+      SharedPreferences.getInstance().then(
+        (prefs) => prefs.setBool('first_run', false),
+      );
     }
 
     return Scaffold(
-      appBar: AppBar(),
+      appBar: AppBar(shape: const Border()),
       body: SafeArea(
         child: SizedBox(
           width: double.infinity,
@@ -52,16 +52,14 @@ class OnboardingScaffold extends StatelessWidget {
               Padding(
                 padding: const EdgeInsets.fromLTRB(20, 50, 20, 20),
                 child: Column(
+                  spacing: 24,
                   children: [
                     Row(
                       mainAxisAlignment: MainAxisAlignment.center,
+                      spacing: 12,
                       children: [
                         if (showLogo) ...[
-                          SvgPicture.asset(
-                            'assets/icons/logo.svg',
-                            height: 80,
-                          ),
-                          const SizedBox(width: 10),
+                          SvgPicture.asset('assets/icons/logo.svg', height: 80),
                         ],
                         Text(
                           header,
@@ -73,7 +71,6 @@ class OnboardingScaffold extends StatelessWidget {
                       ],
                     ),
                     if (subtitle != null) ...[
-                      const SizedBox(height: 20),
                       Opacity(
                         opacity: 0.8,
                         child: Text(
@@ -89,14 +86,17 @@ class OnboardingScaffold extends StatelessWidget {
               Expanded(
                 child: Padding(
                   padding: EdgeInsets.symmetric(
-                      vertical: content == null ? 20.0 : 0.0),
+                    vertical: content == null ? 20 : 0,
+                  ),
                   child: content ?? const SizedBox(),
                 ),
               ),
               if (disclaimer != null)
                 Padding(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 20, vertical: 5.0),
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 12,
+                    vertical: 8,
+                  ),
                   child: Opacity(
                     opacity: 0.5,
                     child: Text(
@@ -107,9 +107,9 @@ class OnboardingScaffold extends StatelessWidget {
                   ),
                 ),
               Container(
-                padding: const EdgeInsets.all(10),
+                margin: const EdgeInsets.symmetric(horizontal: 12),
                 width: double.infinity,
-                child: Button(
+                child: FilledButton.icon(
                   onPressed: () => isLast
                       ? Navigator.pushAndRemoveUntil(
                           context,
@@ -118,29 +118,24 @@ class OnboardingScaffold extends StatelessWidget {
                         )
                       : Navigator.push(
                           context,
-                          MaterialPageRoute(
-                            builder: (context) => route,
-                          ),
+                          MaterialPageRoute(builder: (context) => route),
                         ),
-                  icon: buttonIcon,
-                  child: Text(buttonText ?? 'Next'),
+                  icon: buttonIcon ?? const SizedBox(),
+                  label: Text(buttonText ?? 'Next'),
                 ),
               ),
               if (skipRoute != null)
                 Container(
-                  padding: const EdgeInsets.fromLTRB(10, 0, 10, 10),
+                  margin: const EdgeInsets.symmetric(horizontal: 12),
                   width: double.infinity,
-                  child: Button(
-                    color: Colors.grey,
+                  child: TextButton(
                     onPressed: () => Navigator.push(
                       context,
-                      MaterialPageRoute(
-                        builder: (context) => skipRoute!,
-                      ),
+                      MaterialPageRoute(builder: (context) => skipRoute!),
                     ),
                     child: const Text('Skip'),
                   ),
-                )
+                ),
             ],
           ),
         ),
diff --git a/lib/screens/onboarding/onboarding_setup.dart b/lib/screens/onboarding/onboarding_setup.dart
index 56526f58..5a227f60 100644
--- a/lib/screens/onboarding/onboarding_setup.dart
+++ b/lib/screens/onboarding/onboarding_setup.dart
@@ -1,17 +1,22 @@
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_performance/firebase_performance.dart';
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+// import removed: flutter_colorpicker
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/screens/onboarding/onboarding_scaffold.dart';
 import 'package:frosty/screens/onboarding/onboarding_welcome.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
-import 'package:frosty/screens/settings/widgets/settings_list_select.dart';
 import 'package:frosty/screens/settings/widgets/settings_list_switch.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/widgets/accent_color_setting.dart';
+import 'package:frosty/widgets/theme_selection_setting.dart';
 import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class OnboardingSetup extends StatelessWidget {
-  const OnboardingSetup({Key? key}) : super(key: key);
+  const OnboardingSetup({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -20,32 +25,60 @@ class OnboardingSetup extends StatelessWidget {
     return OnboardingScaffold(
       header: 'Setup',
       subtitle:
-          'Let\'s tweak some settings before you get started. You can always change these later.',
+          'Let\'s tweak some settings before you get started. You can always change these and more later.',
       content: Observer(
         builder: (context) {
           return ListView(
             children: [
-              SettingsListSelect(
-                title: 'Theme',
-                selectedOption: themeNames[settingsStore.themeType.index],
-                options: themeNames,
-                onChanged: (newTheme) => settingsStore.themeType =
-                    ThemeType.values[themeNames.indexOf(newTheme)],
+              ThemeSelectionSetting(settingsStore: settingsStore),
+              AccentColorSetting(settingsStore: settingsStore),
+              SettingsListSwitch(
+                title: 'Show historical recent messages',
+                subtitle: Text.rich(
+                  TextSpan(
+                    text:
+                        'Loads historical recent messages in chat through a third-party API service at ',
+                    children: [
+                      TextSpan(
+                        text: 'https://recent-messages.robotty.de/',
+                        style: TextStyle(
+                          color: context.colorScheme.primary,
+                          decoration: TextDecoration.underline,
+                          decorationColor: context.colorScheme.primary,
+                        ),
+                        recognizer: TapGestureRecognizer()
+                          ..onTap = () => launchUrl(
+                            Uri.parse('https://recent-messages.robotty.de/'),
+                            mode: settingsStore.launchUrlExternal
+                                ? LaunchMode.externalApplication
+                                : LaunchMode.inAppBrowserView,
+                          ),
+                      ),
+                    ],
+                  ),
+                ),
+                value: settingsStore.showRecentMessages,
+                onChanged: (newValue) =>
+                    settingsStore.showRecentMessages = newValue,
               ),
               SettingsListSwitch(
                 title: 'Share crash logs and analytics',
                 subtitle: const Text(
-                    'Help improve Frosty by sending anonymous crash logs and analytics through Firebase.'),
+                  'Help improve Frosty by sending anonymous crash logs and analytics through Firebase.',
+                ),
                 value: settingsStore.shareCrashLogsAndAnalytics,
                 onChanged: (newValue) {
                   settingsStore.shareCrashLogsAndAnalytics = newValue;
 
-                  FirebaseCrashlytics.instance
-                      .setCrashlyticsCollectionEnabled(newValue);
-                  FirebaseAnalytics.instance
-                      .setAnalyticsCollectionEnabled(newValue);
-                  FirebasePerformance.instance
-                      .setPerformanceCollectionEnabled(newValue);
+                  FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(
+                    newValue,
+                  );
+                  FirebaseAnalytics.instance.setAnalyticsCollectionEnabled(
+                    newValue,
+                  );
+                  FirebasePerformance.instance.setPerformanceCollectionEnabled(
+                    newValue,
+                  );
                 },
               ),
             ],
diff --git a/lib/screens/onboarding/onboarding_welcome.dart b/lib/screens/onboarding/onboarding_welcome.dart
index aeb2f324..976fda9a 100644
--- a/lib/screens/onboarding/onboarding_welcome.dart
+++ b/lib/screens/onboarding/onboarding_welcome.dart
@@ -4,14 +4,14 @@ import 'package:frosty/screens/home/home.dart';
 import 'package:frosty/screens/onboarding/onboarding_scaffold.dart';
 
 class OnboardingWelcome extends StatelessWidget {
-  const OnboardingWelcome({Key? key}) : super(key: key);
+  const OnboardingWelcome({super.key});
 
   @override
   Widget build(BuildContext context) {
     const text = [
       'Check out the GitHub repo at the top-right of the settings page to explore Frosty\'s source code, report bugs, make feature requests, and more.',
       'Links to the full changelog and FAQ are in the settings page under "Other".',
-      'Don\'t forget to leave a rating and/or review on the app store!'
+      'Don\'t forget to leave a rating and/or review on the app store!',
     ];
 
     return OnboardingScaffold(
@@ -20,21 +20,23 @@ class OnboardingWelcome extends StatelessWidget {
       content: Opacity(
         opacity: 0.8,
         child: ListView(
-          padding: const EdgeInsets.symmetric(horizontal: 20.0),
+          padding: const EdgeInsets.symmetric(horizontal: 12),
           children: text
-              .mapIndexed((index, sentence) => Padding(
-                    padding: const EdgeInsets.symmetric(vertical: 10.0),
-                    child: ListTile(
-                      leading: Text(
-                        '${index + 1}.',
-                        style: const TextStyle(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w600,
-                        ),
+              .mapIndexed(
+                (index, sentence) => Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 8),
+                  child: ListTile(
+                    leading: Text(
+                      '${index + 1}.',
+                      style: const TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w600,
                       ),
-                      title: Text(sentence),
                     ),
-                  ))
+                    title: Text(sentence),
+                  ),
+                ),
+              )
               .toList(),
         ),
       ),
diff --git a/lib/screens/settings/account/account_options.dart b/lib/screens/settings/account/account_options.dart
index c3d2e6a9..2b4cc6a0 100644
--- a/lib/screens/settings/account/account_options.dart
+++ b/lib/screens/settings/account/account_options.dart
@@ -1,36 +1,35 @@
 import 'package:flutter/material.dart';
+import 'package:frosty/screens/channel/channel.dart';
 import 'package:frosty/screens/settings/account/blocked_users.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/screens/settings/widgets/settings_tile_route.dart';
-import 'package:frosty/widgets/button.dart';
-import 'package:frosty/widgets/dialog.dart';
-import 'package:frosty/widgets/list_tile.dart';
+import 'package:frosty/widgets/frosty_dialog.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
 
 class AccountOptions extends StatelessWidget {
   final AuthStore authStore;
 
-  const AccountOptions({Key? key, required this.authStore}) : super(key: key);
+  const AccountOptions({super.key, required this.authStore});
 
   Future<void> _showLogoutDialog(BuildContext context) {
     return showDialog(
       context: context,
       builder: (context) => FrostyDialog(
-        title: 'Log Out',
+        title: 'Log out',
         message: 'Are you sure you want to log out?',
         actions: [
-          Button(
+          TextButton(
+            onPressed: Navigator.of(context).pop,
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
             onPressed: () {
               authStore.logout();
               Navigator.pop(context);
               Navigator.pop(context);
             },
-            child: const Text('Yes'),
+            child: const Text('Log out'),
           ),
-          Button(
-            onPressed: Navigator.of(context).pop,
-            color: Colors.grey,
-            child: const Text('Cancel'),
-          )
         ],
       ),
     );
@@ -38,22 +37,33 @@ class AccountOptions extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ListView(
-      children: [
-        SettingsTileRoute(
-          leading: const Icon(Icons.block_rounded),
-          title: 'Blocked',
-          child: BlockedUsers(
-            authStore: authStore,
+    return FrostyScrollbar(
+      child: ListView(
+        shrinkWrap: true,
+        primary: false,
+        children: [
+          SettingsTileRoute(
+            leading: const Icon(Icons.person_rounded),
+            title: 'My channel',
+            useScaffold: false,
+            child: VideoChat(
+              userId: authStore.user.details!.id,
+              userName: authStore.user.details!.displayName,
+              userLogin: authStore.user.details!.login,
+            ),
           ),
-        ),
-        FrostyListTile(
-          leading: const Icon(Icons.logout_rounded),
-          title: 'Log out',
-          trailing: const Icon(Icons.chevron_right_rounded),
-          onTap: () => _showLogoutDialog(context),
-        )
-      ],
+          SettingsTileRoute(
+            leading: const Icon(Icons.block_rounded),
+            title: 'Blocked users',
+            child: BlockedUsers(authStore: authStore),
+          ),
+          ListTile(
+            leading: const Icon(Icons.logout_rounded),
+            title: const Text('Log out'),
+            onTap: () => _showLogoutDialog(context),
+          ),
+        ],
+      ),
     );
   }
 }
diff --git a/lib/screens/settings/account/blocked_users.dart b/lib/screens/settings/account/blocked_users.dart
index e28da0fc..b8fa5ebf 100644
--- a/lib/screens/settings/account/blocked_users.dart
+++ b/lib/screens/settings/account/blocked_users.dart
@@ -1,63 +1,61 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:frosty/constants.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/utils.dart';
 import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/button.dart';
-import 'package:frosty/widgets/list_tile.dart';
+import 'package:frosty/widgets/settings_page_layout.dart';
 
 class BlockedUsers extends StatelessWidget {
   final AuthStore authStore;
 
-  const BlockedUsers({
-    Key? key,
-    required this.authStore,
-  }) : super(key: key);
+  const BlockedUsers({super.key, required this.authStore});
 
   @override
   Widget build(BuildContext context) {
-    return RefreshIndicator(
-      onRefresh: () async {
-        HapticFeedback.lightImpact();
+    return Observer(
+      builder: (context) {
+        if (authStore.user.blockedUsers.isEmpty) {
+          return RefreshIndicator.adaptive(
+            onRefresh: () async {
+              HapticFeedback.lightImpact();
+              await authStore.user.refreshBlockedUsers();
+            },
+            child: const Center(
+              child: AlertMessage(message: 'No blocked users', vertical: true),
+            ),
+          );
+        }
 
-        await authStore.user
-            .refreshBlockedUsers(headers: authStore.headersTwitch);
-      },
-      child: Observer(
-        builder: (context) {
-          if (authStore.user.blockedUsers.isEmpty) {
-            return const Center(
-              child: AlertMessage(
-                message: 'No blocked users',
+        return SettingsPageLayout(
+          hasBottomPadding: false,
+          onRefresh: () async {
+            HapticFeedback.lightImpact();
+            await authStore.user.refreshBlockedUsers();
+          },
+          children: authStore.user.blockedUsers.map((blockedUser) {
+            final displayName = getReadableName(
+              blockedUser.displayName,
+              blockedUser.userLogin,
+            );
+
+            return ListTile(
+              title: Text(displayName),
+              trailing: TextButton(
+                style: TextButton.styleFrom(
+                  foregroundColor: Theme.of(context).colorScheme.error,
+                ),
+                onPressed: () => authStore.showBlockDialog(
+                  context,
+                  targetUser: displayName,
+                  targetUserId: blockedUser.userId,
+                ),
+                child: const Text('Unblock'),
               ),
             );
-          }
-          return ListView(
-            children: authStore.user.blockedUsers.map(
-              (blockedUser) {
-                final displayName = regexEnglish
-                        .hasMatch(blockedUser.displayName)
-                    ? blockedUser.displayName
-                    : '${blockedUser.displayName} (${blockedUser.userLogin})';
-
-                return FrostyListTile(
-                  title: displayName,
-                  trailing: Button(
-                    color: Colors.red,
-                    onPressed: () => authStore.showBlockDialog(
-                      context,
-                      targetUser: displayName,
-                      targetUserId: blockedUser.userId,
-                    ),
-                    child: const Text('Unblock'),
-                  ),
-                );
-              },
-            ).toList(),
-          );
-        },
-      ),
+          }).toList(),
+        );
+      },
     );
   }
 }
diff --git a/lib/screens/settings/account/widgets/profile_card.dart b/lib/screens/settings/account/widgets/profile_card.dart
index 8ccceaed..36d024b2 100644
--- a/lib/screens/settings/account/widgets/profile_card.dart
+++ b/lib/screens/settings/account/widgets/profile_card.dart
@@ -1,81 +1,24 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/onboarding/login_webview.dart';
 import 'package:frosty/screens/settings/account/account_options.dart';
 import 'package:frosty/screens/settings/stores/auth_store.dart';
-import 'package:frosty/screens/settings/widgets/settings_tile_route.dart';
-import 'package:frosty/widgets/app_bar.dart';
-import 'package:frosty/widgets/button.dart';
-import 'package:frosty/widgets/dialog.dart';
-import 'package:frosty/widgets/list_tile.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/frosty_dialog.dart';
 import 'package:frosty/widgets/profile_picture.dart';
-import 'package:simple_icons/simple_icons.dart';
-import 'package:webview_flutter/webview_flutter.dart';
 
 class ProfileCard extends StatelessWidget {
   final AuthStore authStore;
 
-  const ProfileCard({Key? key, required this.authStore}) : super(key: key);
+  const ProfileCard({super.key, required this.authStore});
 
-  Future<void> _showLoginDialog(BuildContext context) {
-    return showDialog(
+  Future<void> _showAccountOptionsModalBottomSheet(BuildContext context) {
+    return showModalBottomSheetWithProperFocus(
       context: context,
-      builder: (context) => FrostyDialog(
-        title: 'Log In',
-        content: Column(
-          children: [
-            Button(
-              padding:
-                  const EdgeInsets.symmetric(horizontal: 30.0, vertical: 15.0),
-              onPressed: () => Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) {
-                    return Scaffold(
-                      appBar: const FrostyAppBar(
-                        title: Text('Connect with Twitch'),
-                      ),
-                      body: WebView(
-                        initialUrl: authStore.loginUri.toString(),
-                        navigationDelegate: (navigation) =>
-                            authStore.handleNavigation(navigation: navigation),
-                        javascriptMode: JavascriptMode.unrestricted,
-                      ),
-                    );
-                  },
-                ),
-              ),
-              icon: const Icon(SimpleIcons.twitch),
-              child: const Text(
-                'Connect with Twitch',
-                style: TextStyle(
-                  fontSize: 16,
-                  color: Colors.white,
-                  fontWeight: FontWeight.w600,
-                ),
-              ),
-            ),
-            const SizedBox(height: 20.0),
-            const Center(
-              child: Text(
-                'Or',
-                style: TextStyle(fontWeight: FontWeight.w600),
-              ),
-            ),
-            const SizedBox(height: 20.0),
-            TextField(
-              autocorrect: false,
-              textAlign: TextAlign.center,
-              decoration: const InputDecoration(
-                hintText: 'Token',
-              ),
-              onSubmitted: (token) {
-                authStore.login(token: token);
-                Navigator.pop(context);
-              },
-            )
-          ],
-        ),
-      ),
+      builder: (context) {
+        return AccountOptions(authStore: authStore);
+      },
     );
   }
 
@@ -84,39 +27,118 @@ class ProfileCard extends StatelessWidget {
     return Observer(
       builder: (context) {
         if (authStore.error != null) {
-          return FrostyListTile(
-            leading: const Icon(
+          return ListTile(
+            leading: Icon(
               Icons.error_outline_rounded,
-              color: Colors.red,
+              color: Theme.of(context).colorScheme.error,
             ),
-            title: 'Failed to connect',
-            trailing: Button(
+            title: const Text('Unable to connect to Twitch'),
+            trailing: FilledButton.tonal(
               onPressed: authStore.init,
-              padding: const EdgeInsets.symmetric(horizontal: 15.0),
               child: const Text('Reconnect'),
             ),
           );
         }
         if (authStore.isLoggedIn && authStore.user.details != null) {
-          return SettingsTileRoute(
+          final hasToken = authStore.gqlToken != null;
+          return ListTile(
             leading: ProfilePicture(
               userLogin: authStore.user.details!.login,
               radius: 12,
             ),
-            title: authStore.user.details!.displayName,
-            child: AccountOptions(authStore: authStore),
+            title: Text.rich(
+              TextSpan(
+                text: authStore.user.details!.displayName,
+                children: [
+                  const WidgetSpan(child: SizedBox(width: 6)),
+                  WidgetSpan(
+                    alignment: PlaceholderAlignment.middle,
+                    child: GestureDetector(
+                      behavior: HitTestBehavior.opaque,
+                      onTap: () {
+                        final navigator = Navigator.of(context);
+                        showDialog(
+                          context: context,
+                          builder: (dialogContext) => FrostyDialog(
+                            title: 'Web session',
+                            message: hasToken
+                                ? 'Your Twitch web session is linked. When using the native player, ads will be avoided on channels where you have a subscription or Twitch Turbo.'
+                                : 'Your Twitch web session is not linked. Log in again to avoid ads when using the native player on channels where you have a subscription or Twitch Turbo.',
+                            actions: hasToken
+                                ? [
+                                    TextButton(
+                                      onPressed:
+                                          Navigator.of(dialogContext).pop,
+                                      child: const Text('OK'),
+                                    ),
+                                  ]
+                                : [
+                                    TextButton(
+                                      onPressed:
+                                          Navigator.of(dialogContext).pop,
+                                      child: const Text('Cancel'),
+                                    ),
+                                    FilledButton(
+                                      onPressed: () {
+                                        Navigator.of(dialogContext).pop();
+                                        navigator.push(
+                                          MaterialPageRoute(
+                                            builder: (context) =>
+                                                LoginWebView(),
+                                          ),
+                                        );
+                                      },
+                                      child: const Text('Log in'),
+                                    ),
+                                  ],
+                          ),
+                        );
+                      },
+                      // Padding enlarges the hit target without stealing taps
+                      // on the display name / surrounding ListTile.
+                      child: Padding(
+                        padding: const EdgeInsets.all(4),
+                        child: Icon(
+                          hasToken
+                              ? Icons.check_circle_outline_rounded
+                              : Icons.info_outline_rounded,
+                          size: 16,
+                          color: hasToken ? Colors.green : Colors.amber,
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+              overflow: TextOverflow.ellipsis,
+            ),
+            trailing: const Icon(Icons.chevron_right_rounded),
+            onTap: () => _showAccountOptionsModalBottomSheet(context),
           );
         }
-        return FrostyListTile(
+        return ListTile(
           leading: const Icon(Icons.no_accounts_rounded),
-          title: 'Anonymous',
+          title: const Text('Anonymous'),
           subtitle: const Text(
-              'Tap to log in and enable the ability to chat, view followed streams, and more.'),
+            'Log in to chat, view followed streams, and more.',
+          ),
           trailing: const SizedBox(
             height: double.infinity,
             child: Icon(Icons.chevron_right_rounded),
           ),
-          onTap: () => _showLoginDialog(context),
+          onTap: () => Navigator.push(
+            context,
+            MaterialPageRoute(builder: (context) => LoginWebView()),
+          ),
+          onLongPress: () async {
+            final clipboardText = (await Clipboard.getData(
+              Clipboard.kTextPlain,
+            ))?.text;
+
+            if (clipboardText == null) return;
+
+            authStore.login(token: clipboardText);
+          },
         );
       },
     );
diff --git a/lib/screens/settings/chat_settings.dart b/lib/screens/settings/chat_settings.dart
index 70319f43..2cd98029 100644
--- a/lib/screens/settings/chat_settings.dart
+++ b/lib/screens/settings/chat_settings.dart
@@ -1,278 +1,389 @@
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:frosty/constants.dart';
-import 'package:frosty/screens/settings/stores/settings_store.dart';
-import 'package:frosty/screens/settings/widgets/settings_list_select.dart';
-import 'package:frosty/screens/settings/widgets/settings_list_slider.dart';
-import 'package:frosty/screens/settings/widgets/settings_list_switch.dart';
-import 'package:frosty/widgets/cached_image.dart';
-import 'package:frosty/widgets/section_header.dart';
-
-class ChatSettings extends StatefulWidget {
-  final SettingsStore settingsStore;
-
-  const ChatSettings({Key? key, required this.settingsStore}) : super(key: key);
-
-  @override
-  State<ChatSettings> createState() => _ChatSettingsState();
-}
-
-class _ChatSettingsState extends State<ChatSettings> {
-  var showPreview = false;
-
-  @override
-  Widget build(BuildContext context) {
-    final settingsStore = widget.settingsStore;
-
-    return Observer(
-      builder: (context) => ListView(
-        children: [
-          const SectionHeader('Message sizing'),
-          ExpansionTile(
-            title: const Text('Preview',
-                style: TextStyle(fontWeight: FontWeight.w500)),
-            children: [
-              Container(
-                width: double.infinity,
-                padding: const EdgeInsets.all(16),
-                child: DefaultTextStyle(
-                  style: DefaultTextStyle.of(context)
-                      .style
-                      .copyWith(fontSize: settingsStore.fontSize),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text.rich(
-                        TextSpan(
-                          children: [
-                            WidgetSpan(
-                              alignment: PlaceholderAlignment.middle,
-                              child: FrostyCachedNetworkImage(
-                                imageUrl:
-                                    'https://static-cdn.jtvnw.net/badges/v1/bbbe0db0-a598-423e-86d0-f9fb98ca1933/3',
-                                height:
-                                    defaultBadgeSize * settingsStore.badgeScale,
-                                width:
-                                    defaultBadgeSize * settingsStore.badgeScale,
-                              ),
-                            ),
-                            const TextSpan(text: ' Badge and emote preview. '),
-                            WidgetSpan(
-                              alignment: PlaceholderAlignment.middle,
-                              child: FrostyCachedNetworkImage(
-                                imageUrl:
-                                    'https://static-cdn.jtvnw.net/emoticons/v2/425618/default/dark/3.0',
-                                height:
-                                    defaultEmoteSize * settingsStore.emoteScale,
-                                width:
-                                    defaultEmoteSize * settingsStore.emoteScale,
-                              ),
-                            ),
-                          ],
-                        ),
-                        textScaleFactor: settingsStore.messageScale,
-                      ),
-                      SizedBox(height: settingsStore.messageSpacing),
-                      Text(
-                        'Hello! Here\'s a text preview.',
-                        textScaleFactor: settingsStore.messageScale,
-                      ),
-                      SizedBox(height: settingsStore.messageSpacing),
-                      Text(
-                        'And another for spacing without an emote!',
-                        textScaleFactor: settingsStore.messageScale,
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-          SettingsListSlider(
-            title: 'Badge scale',
-            trailing: '${settingsStore.badgeScale.toStringAsFixed(2)}x',
-            value: settingsStore.badgeScale,
-            min: 0.25,
-            max: 3.0,
-            divisions: 11,
-            onChanged: (newValue) => settingsStore.badgeScale = newValue,
-          ),
-          SettingsListSlider(
-            title: 'Emote scale',
-            trailing: '${settingsStore.emoteScale.toStringAsFixed(2)}x',
-            value: settingsStore.emoteScale,
-            min: 0.25,
-            max: 3.0,
-            divisions: 11,
-            onChanged: (newValue) => settingsStore.emoteScale = newValue,
-          ),
-          SettingsListSlider(
-            title: 'Message scale',
-            trailing: '${settingsStore.messageScale.toStringAsFixed(2)}x',
-            value: settingsStore.messageScale,
-            min: 0.5,
-            max: 2.0,
-            divisions: 6,
-            onChanged: (newValue) => settingsStore.messageScale = newValue,
-          ),
-          SettingsListSlider(
-            title: 'Message spacing',
-            trailing: '${settingsStore.messageSpacing.toStringAsFixed(0)}px',
-            value: settingsStore.messageSpacing,
-            max: 30.0,
-            divisions: 6,
-            onChanged: (newValue) => settingsStore.messageSpacing = newValue,
-          ),
-          SettingsListSlider(
-            title: 'Font size',
-            trailing: settingsStore.fontSize.toInt().toString(),
-            value: settingsStore.fontSize,
-            min: 5,
-            max: 20,
-            divisions: 15,
-            onChanged: (newValue) => settingsStore.fontSize = newValue,
-          ),
-          const SectionHeader('Message appearance'),
-          SettingsListSwitch(
-            title: 'Use readable name colors',
-            subtitle: const Text(
-                'Adjusts the lightness value of overly bright and dark names.'),
-            value: settingsStore.useReadableColors,
-            onChanged: (newValue) => settingsStore.useReadableColors = newValue,
-          ),
-          SettingsListSwitch(
-            title: 'Show deleted messages',
-            subtitle: const Text(
-                'Restores the original message of deleted messages.'),
-            value: settingsStore.showDeletedMessages,
-            onChanged: (newValue) =>
-                settingsStore.showDeletedMessages = newValue,
-          ),
-          SettingsListSwitch(
-            title: 'Show message dividers',
-            value: settingsStore.showChatMessageDividers,
-            onChanged: (newValue) =>
-                settingsStore.showChatMessageDividers = newValue,
-          ),
-          SettingsListSelect(
-            title: 'Message timestamps',
-            selectedOption: timestampNames[settingsStore.timestampType.index],
-            options: timestampNames,
-            onChanged: (newValue) => settingsStore.timestampType =
-                TimestampType.values[timestampNames.indexOf(newValue)],
-          ),
-          const SectionHeader('Delay'),
-          SettingsListSlider(
-            title: 'Message delay',
-            trailing: '${settingsStore.chatDelay.toInt()}s',
-            subtitle:
-                'Adds a delay (in seconds) before each message is rendered in chat. ${Platform.isIOS ? '15 seconds is recommended for iOS.' : ''}',
-            value: settingsStore.chatDelay,
-            max: 30.0,
-            divisions: 30,
-            onChanged: (newValue) => settingsStore.chatDelay = newValue,
-          ),
-          const SectionHeader('Alerts'),
-          SettingsListSwitch(
-            title: 'Highlight first time chatters',
-            value: settingsStore.highlightFirstTimeChatter,
-            onChanged: (newValue) =>
-                settingsStore.highlightFirstTimeChatter = newValue,
-          ),
-          SettingsListSwitch(
-            title: 'Show notices',
-            subtitle: const Text(
-                'Shows notices such as subs and re-subs, announcements, and raids.'),
-            value: settingsStore.showUserNotices,
-            onChanged: (newValue) => settingsStore.showUserNotices = newValue,
-          ),
-          const SectionHeader('Layout'),
-          SettingsListSwitch(
-            title: 'Show bottom bar',
-            value: settingsStore.showBottomBar,
-            onChanged: (newValue) => settingsStore.showBottomBar = newValue,
-          ),
-          SettingsListSwitch(
-            title: 'Move emote menu button left',
-            subtitle: const Text(
-                'Places the emote menu button on the left side to avoid accidental presses.'),
-            value: settingsStore.emoteMenuButtonOnLeft,
-            onChanged: (newValue) =>
-                settingsStore.emoteMenuButtonOnLeft = newValue,
-          ),
-          SettingsListSwitch(
-            title: 'Move notifications to bottom',
-            value: settingsStore.chatNotificationsOnBottom,
-            onChanged: (newValue) =>
-                settingsStore.chatNotificationsOnBottom = newValue,
-          ),
-          const SectionHeader('Landscape mode'),
-          SettingsListSwitch(
-            title: 'Move chat left',
-            value: settingsStore.landscapeChatLeftSide,
-            onChanged: (newValue) =>
-                settingsStore.landscapeChatLeftSide = newValue,
-          ),
-          SettingsListSwitch(
-            title: 'Force vertical chat',
-            subtitle:
-                const Text('Intended for tablets and other larger displays.'),
-            value: settingsStore.landscapeForceVerticalChat,
-            onChanged: (newValue) =>
-                settingsStore.landscapeForceVerticalChat = newValue,
-          ),
-          SettingsListSelect(
-            title: 'Fill notch side',
-            subtitle:
-                'Overrides and fills the available space in devices with a display notch.',
-            selectedOption:
-                landscapeCutoutNames[settingsStore.landscapeCutout.index],
-            options: landscapeCutoutNames,
-            onChanged: (newValue) => settingsStore.landscapeCutout =
-                LandscapeCutoutType
-                    .values[landscapeCutoutNames.indexOf(newValue)],
-          ),
-          SettingsListSlider(
-            title: 'Chat width',
-            trailing: '${(settingsStore.chatWidth * 100).toStringAsFixed(0)}%',
-            value: settingsStore.chatWidth,
-            min: 0.2,
-            max: 0.6,
-            divisions: 8,
-            onChanged: (newValue) => settingsStore.chatWidth = newValue,
-          ),
-          SettingsListSlider(
-            title: 'Chat overlay opacity',
-            trailing:
-                '${(settingsStore.fullScreenChatOverlayOpacity * 100).toStringAsFixed(0)}%',
-            subtitle:
-                'Sets the opacity (transparency) of the overlay chat in fullscreen mode.',
-            value: settingsStore.fullScreenChatOverlayOpacity,
-            divisions: 10,
-            onChanged: (newValue) =>
-                settingsStore.fullScreenChatOverlayOpacity = newValue,
-          ),
-          const SectionHeader('Sleep'),
-          SettingsListSwitch(
-            title: 'Prevent sleep in chat-only mode',
-            subtitle: const Text(
-                'Requires restarting the chat in order to take effect.'),
-            value: settingsStore.chatOnlyPreventSleep,
-            onChanged: (newValue) =>
-                settingsStore.chatOnlyPreventSleep = newValue,
-          ),
-          const SectionHeader('Autocomplete'),
-          SettingsListSwitch(
-            title: 'Show autocomplete bar',
-            subtitle: const Text(
-                'Shows a bar containing matching emotes and mentions while typing.'),
-            value: settingsStore.autocomplete,
-            onChanged: (newValue) => settingsStore.autocomplete = newValue,
-          ),
-        ],
-      ),
-    );
-  }
-}
+import 'dart:io';
+
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/constants.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/screens/settings/widgets/settings_list_select.dart';
+import 'package:frosty/screens/settings/widgets/settings_list_slider.dart';
+import 'package:frosty/screens/settings/widgets/settings_list_switch.dart';
+import 'package:frosty/screens/settings/widgets/settings_muted_words.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
+import 'package:frosty/widgets/section_header.dart';
+import 'package:frosty/widgets/settings_page_layout.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class ChatSettings extends StatelessWidget {
+  final SettingsStore settingsStore;
+
+  const ChatSettings({super.key, required this.settingsStore});
+
+  @override
+  Widget build(BuildContext context) {
+    return Observer(
+      builder: (context) => SettingsPageLayout(
+        children: [
+          const SectionHeader('General', isFirst: true),
+          SettingsListSwitch(
+            title: 'Keep screen on',
+            subtitle: const Text(
+              'Prevents the screen from sleeping while a channel is open.',
+            ),
+            value: settingsStore.keepScreenAwake,
+            onChanged: (newValue) =>
+                settingsStore.keepScreenAwake = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'Autocomplete',
+            subtitle: const Text(
+              'Shows matching emotes and mentions while typing.',
+            ),
+            value: settingsStore.autocomplete,
+            onChanged: (newValue) =>
+                settingsStore.autocomplete = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'Load recent messages',
+            subtitle: Text.rich(
+              TextSpan(
+                text:
+                    'Loads historical recent messages in chat through a third-party API service at ',
+                children: [
+                  TextSpan(
+                    text: 'https://recent-messages.robotty.de/',
+                    style: TextStyle(
+                      color: context.colorScheme.primary,
+                      decoration: TextDecoration.underline,
+                      decorationColor: context.colorScheme.primary,
+                    ),
+                    recognizer: TapGestureRecognizer()
+                      ..onTap = () => launchUrl(
+                        Uri.parse(
+                          'https://recent-messages.robotty.de/',
+                        ),
+                        mode: settingsStore.launchUrlExternal
+                            ? LaunchMode.externalApplication
+                            : LaunchMode.inAppBrowserView,
+                      ),
+                  ),
+                ],
+              ),
+            ),
+            value: settingsStore.showRecentMessages,
+            onChanged: (newValue) =>
+                settingsStore.showRecentMessages = newValue,
+          ),
+          const SectionHeader('Message sizing'),
+          ExpansionTile(
+            title: const Text('Preview'),
+            children: [
+              Container(
+                width: double.infinity,
+                padding: const EdgeInsets.all(16),
+                child: DefaultTextStyle(
+                  style: DefaultTextStyle.of(
+                    context,
+                  ).style.copyWith(fontSize: settingsStore.fontSize),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text.rich(
+                        TextSpan(
+                          children: [
+                            WidgetSpan(
+                              alignment: PlaceholderAlignment.middle,
+                              child: FrostyCachedNetworkImage(
+                                imageUrl:
+                                    'https://static-cdn.jtvnw.net/badges/v1/bbbe0db0-a598-423e-86d0-f9fb98ca1933/3',
+                                height:
+                                    defaultBadgeSize *
+                                    settingsStore.badgeScale,
+                                width:
+                                    defaultBadgeSize *
+                                    settingsStore.badgeScale,
+                              ),
+                            ),
+                            const TextSpan(
+                              text: ' Badge and emote preview. ',
+                            ),
+                            WidgetSpan(
+                              alignment: PlaceholderAlignment.middle,
+                              child: FrostyCachedNetworkImage(
+                                imageUrl:
+                                    'https://static-cdn.jtvnw.net/emoticons/v2/425618/default/dark/3.0',
+                                height:
+                                    defaultEmoteSize *
+                                    settingsStore.emoteScale,
+                                width:
+                                    defaultEmoteSize *
+                                    settingsStore.emoteScale,
+                              ),
+                            ),
+                          ],
+                        ),
+                        textScaler: settingsStore.messageScale.textScaler,
+                      ),
+                      SizedBox(height: settingsStore.messageSpacing),
+                      Text(
+                        'Hello! Here\'s a text preview.',
+                        textScaler: settingsStore.messageScale.textScaler,
+                      ),
+                      SizedBox(height: settingsStore.messageSpacing),
+                      Text(
+                        'And another for spacing without an emote!',
+                        textScaler: settingsStore.messageScale.textScaler,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ],
+          ),
+          SettingsListSlider(
+            title: 'Badge scale',
+            trailing: '${settingsStore.badgeScale.toStringAsFixed(2)}x',
+            value: settingsStore.badgeScale,
+            min: 0.25,
+            max: 3.0,
+            divisions: 11,
+            onChanged: (newValue) => settingsStore.badgeScale = newValue,
+          ),
+          SettingsListSlider(
+            title: 'Emote scale',
+            trailing: '${settingsStore.emoteScale.toStringAsFixed(2)}x',
+            value: settingsStore.emoteScale,
+            min: 0.25,
+            max: 3.0,
+            divisions: 11,
+            onChanged: (newValue) => settingsStore.emoteScale = newValue,
+          ),
+          SettingsListSlider(
+            title: 'Message scale',
+            trailing: '${settingsStore.messageScale.toStringAsFixed(2)}x',
+            value: settingsStore.messageScale,
+            min: 0.5,
+            max: 2.0,
+            divisions: 6,
+            onChanged: (newValue) => settingsStore.messageScale = newValue,
+          ),
+          SettingsListSlider(
+            title: 'Message spacing',
+            trailing:
+                '${settingsStore.messageSpacing.toStringAsFixed(0)}px',
+            value: settingsStore.messageSpacing,
+            max: 30.0,
+            divisions: 15,
+            onChanged: (newValue) =>
+                settingsStore.messageSpacing = newValue,
+          ),
+          SettingsListSlider(
+            title: 'Font size',
+            trailing: settingsStore.fontSize.toInt().toString(),
+            value: settingsStore.fontSize,
+            min: 5,
+            max: 20,
+            divisions: 15,
+            onChanged: (newValue) => settingsStore.fontSize = newValue,
+          ),
+          const SectionHeader('Message appearance'),
+          SettingsListSwitch(
+            title: 'Show deleted messages',
+            subtitle: const Text(
+              'Restores the original message of deleted messages.',
+            ),
+            value: settingsStore.showDeletedMessages,
+            onChanged: (newValue) =>
+                settingsStore.showDeletedMessages = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'Show message dividers',
+            value: settingsStore.showChatMessageDividers,
+            onChanged: (newValue) =>
+                settingsStore.showChatMessageDividers = newValue,
+          ),
+          SettingsListSelect(
+            title: 'Timestamps',
+            selectedOption:
+                timestampNames[settingsStore.timestampType.index],
+            options: timestampNames,
+            onChanged: (newValue) => settingsStore.timestampType =
+                TimestampType.values[timestampNames.indexOf(newValue)],
+          ),
+          SettingsListSwitch(
+            title: 'Show timestamps on historical messages',
+            subtitle: const Text(
+              'Always show timestamps on messages loaded from chat history, '
+              'even when timestamps are disabled above.',
+            ),
+            value: settingsStore.showHistoricalTimestamps,
+            onChanged: (newValue) =>
+                settingsStore.showHistoricalTimestamps = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'Focus current channel',
+            subtitle: const Text(
+              'Fades messages from other channels in merged chat, '
+              'so the current channel stands out.',
+            ),
+            value: settingsStore.focusCurrentChannel,
+            onChanged: (newValue) =>
+                settingsStore.focusCurrentChannel = newValue,
+          ),
+          const SectionHeader('Delay'),
+          SettingsListSwitch(
+            title: 'Auto-sync chat delay',
+            value: settingsStore.autoSyncChatDelay,
+            onChanged: (newValue) =>
+                settingsStore.autoSyncChatDelay = newValue,
+          ),
+          if (!settingsStore.autoSyncChatDelay)
+            SettingsListSlider(
+              title: 'Chat delay',
+              trailing: '${settingsStore.chatDelay.toInt()} seconds',
+              subtitle:
+                  'Adds a delay before each message is rendered in chat. ${Platform.isIOS ? '15 seconds is recommended for iOS.' : ''}',
+              value: settingsStore.chatDelay,
+              max: 30.0,
+              divisions: 30,
+              onChanged: (newValue) =>
+                  settingsStore.chatDelay = newValue,
+            ),
+          const SectionHeader('Alerts'),
+          SettingsListSwitch(
+            title: 'Highlight first-time chatters',
+            value: settingsStore.highlightFirstTimeChatter,
+            onChanged: (newValue) =>
+                settingsStore.highlightFirstTimeChatter = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'Show notices',
+            subtitle: const Text(
+              'Shows notices such as subs, announcements, and raids.',
+            ),
+            value: settingsStore.showUserNotices,
+            onChanged: (newValue) =>
+                settingsStore.showUserNotices = newValue,
+          ),
+          const SectionHeader('Layout'),
+          SettingsListSwitch(
+            title: 'Emote menu on left',
+            subtitle: const Text(
+              'Places the emote menu button on the left side.',
+            ),
+            value: settingsStore.emoteMenuButtonOnLeft,
+            onChanged: (newValue) =>
+                settingsStore.emoteMenuButtonOnLeft = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'Remember chat tabs',
+            subtitle: const Text(
+              'Secondary chat tabs are kept when switching channels.',
+            ),
+            value: settingsStore.persistChatTabs,
+            onChanged: (newValue) {
+              settingsStore.persistChatTabs = newValue;
+              if (!newValue) {
+                settingsStore.secondaryTabs = [];
+              }
+            },
+          ),
+          const SectionHeader('Landscape'),
+          SettingsListSwitch(
+            title: 'Chat on left side',
+            value: settingsStore.landscapeChatLeftSide,
+            onChanged: (newValue) =>
+                settingsStore.landscapeChatLeftSide = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'Force vertical chat',
+            subtitle: const Text(
+              'Intended for tablets and larger displays.',
+            ),
+            value: settingsStore.landscapeForceVerticalChat,
+            onChanged: (newValue) =>
+                settingsStore.landscapeForceVerticalChat = newValue,
+          ),
+          SettingsListSelect(
+            title: 'Notch fill',
+            subtitle:
+                'Fills the display cutout area on the selected side.',
+            selectedOption:
+                landscapeCutoutNames[settingsStore.landscapeCutout.index],
+            options: landscapeCutoutNames,
+            onChanged: (newValue) => settingsStore.landscapeCutout =
+                LandscapeCutoutType.values[landscapeCutoutNames.indexOf(
+                  newValue,
+                )],
+          ),
+          SettingsListSlider(
+            title: 'Overlay chat opacity',
+            trailing:
+                '${(settingsStore.fullScreenChatOverlayOpacity * 100).toStringAsFixed(0)}%',
+            subtitle:
+                'Opacity of the chat overlay in fullscreen mode.',
+            value: settingsStore.fullScreenChatOverlayOpacity,
+            divisions: 10,
+            onChanged: (newValue) =>
+                settingsStore.fullScreenChatOverlayOpacity = newValue,
+          ),
+          const SectionHeader('Filtering'),
+          SettingsMutedWords(settingsStore: settingsStore),
+          SettingsListSwitch(
+            title: 'Match whole words',
+            subtitle: const Text(
+              'Only matches whole words instead of partial matches.',
+            ),
+            value: settingsStore.matchWholeWord,
+            onChanged: (newValue) =>
+                settingsStore.matchWholeWord = newValue,
+          ),
+          const SectionHeader('Emotes and badges'),
+          SettingsListSwitch(
+            title: 'Twitch emotes',
+            value: settingsStore.showTwitchEmotes,
+            onChanged: (newValue) =>
+                settingsStore.showTwitchEmotes = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'Twitch badges',
+            value: settingsStore.showTwitchBadges,
+            onChanged: (newValue) =>
+                settingsStore.showTwitchBadges = newValue,
+          ),
+          SettingsListSwitch(
+            title: '7TV emotes',
+            value: settingsStore.show7TVEmotes,
+            onChanged: (newValue) =>
+                settingsStore.show7TVEmotes = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'BTTV emotes',
+            value: settingsStore.showBTTVEmotes,
+            onChanged: (newValue) =>
+                settingsStore.showBTTVEmotes = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'BTTV badges',
+            value: settingsStore.showBTTVBadges,
+            onChanged: (newValue) =>
+                settingsStore.showBTTVBadges = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'FFZ emotes',
+            value: settingsStore.showFFZEmotes,
+            onChanged: (newValue) =>
+                settingsStore.showFFZEmotes = newValue,
+          ),
+          SettingsListSwitch(
+            title: 'FFZ badges',
+            value: settingsStore.showFFZBadges,
+            onChanged: (newValue) =>
+                settingsStore.showFFZBadges = newValue,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/screens/settings/general_settings.dart b/lib/screens/settings/general_settings.dart
index 5ef30522..96d5f8c9 100644
--- a/lib/screens/settings/general_settings.dart
+++ b/lib/screens/settings/general_settings.dart
@@ -1,46 +1,82 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/models/stream_languages.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
-import 'package:frosty/screens/settings/widgets/settings_list_select.dart';
 import 'package:frosty/screens/settings/widgets/settings_list_switch.dart';
+import 'package:frosty/widgets/accent_color_setting.dart';
+import 'package:frosty/widgets/external_browser_setting.dart';
 import 'package:frosty/widgets/section_header.dart';
+import 'package:frosty/widgets/settings_page_layout.dart';
+import 'package:frosty/widgets/theme_selection_setting.dart';
 
 class GeneralSettings extends StatelessWidget {
   final SettingsStore settingsStore;
 
-  const GeneralSettings({Key? key, required this.settingsStore})
-      : super(key: key);
+  const GeneralSettings({super.key, required this.settingsStore});
 
   @override
   Widget build(BuildContext context) {
     return Observer(
-      builder: (context) => ListView(
+      builder: (context) => SettingsPageLayout(
         children: [
-          const SectionHeader('Display'),
-          SettingsListSelect(
-            title: 'Theme',
-            selectedOption: themeNames[settingsStore.themeType.index],
-            options: themeNames,
-            onChanged: (newTheme) => settingsStore.themeType =
-                ThemeType.values[themeNames.indexOf(newTheme)],
-          ),
+          const SectionHeader('Theme', isFirst: true),
+          ThemeSelectionSetting(settingsStore: settingsStore),
+          AccentColorSetting(settingsStore: settingsStore),
           const SectionHeader('Stream card'),
           SettingsListSwitch(
-            title: 'Use large stream card',
+            title: 'Large stream cards',
             value: settingsStore.largeStreamCard,
             onChanged: (newValue) => settingsStore.largeStreamCard = newValue,
           ),
           SettingsListSwitch(
-            title: 'Show thumbnail',
+            title: 'Show thumbnails',
             value: settingsStore.showThumbnails,
             onChanged: (newValue) => settingsStore.showThumbnails = newValue,
           ),
-          const SectionHeader('Links'),
-          SettingsListSwitch(
-            title: 'Open links in external browser',
-            value: settingsStore.launchUrlExternal,
-            onChanged: (newValue) => settingsStore.launchUrlExternal = newValue,
+          const SectionHeader('Stream languages'),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 0, 16, 8),
+            child: Text(
+              settingsStore.streamLanguages.isEmpty
+                  ? 'Showing all languages. Select one or more to filter Top, category, and tag lists (like Twitch).'
+                  : 'Only streams in the selected languages appear in Top, category, and tag lists.',
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
           ),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(12, 0, 12, 8),
+            child: Wrap(
+              spacing: 8,
+              runSpacing: 8,
+              children: [
+                for (final entry in StreamLanguages.all)
+                  FilterChip(
+                    label: Text(entry.label),
+                    selected: settingsStore.streamLanguages.contains(entry.code),
+                    onSelected: (selected) {
+                      final next = [...settingsStore.streamLanguages];
+                      if (selected) {
+                        if (!next.contains(entry.code)) next.add(entry.code);
+                      } else {
+                        next.remove(entry.code);
+                      }
+                      settingsStore.streamLanguages = next;
+                    },
+                  ),
+              ],
+            ),
+          ),
+          if (settingsStore.streamLanguages.isNotEmpty)
+            Align(
+              alignment: Alignment.centerLeft,
+              child: TextButton(
+                onPressed: () =>
+                    settingsStore.streamLanguages = const <String>[],
+                child: const Text('Clear language filter'),
+              ),
+            ),
+          const SectionHeader('Links'),
+          ExternalBrowserSetting(settingsStore: settingsStore),
         ],
       ),
     );
diff --git a/lib/screens/settings/other_settings.dart b/lib/screens/settings/other_settings.dart
index 43f027a9..0edda66f 100644
--- a/lib/screens/settings/other_settings.dart
+++ b/lib/screens/settings/other_settings.dart
@@ -3,25 +3,18 @@ import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 import 'package:firebase_performance/firebase_performance.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:flutter_svg/flutter_svg.dart';
+import 'package:frosty/cache_manager.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/screens/settings/widgets/release_notes.dart';
 import 'package:frosty/screens/settings/widgets/settings_list_switch.dart';
 import 'package:frosty/widgets/alert_message.dart';
-import 'package:frosty/widgets/button.dart';
-import 'package:frosty/widgets/dialog.dart';
-import 'package:frosty/widgets/list_tile.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:frosty/widgets/frosty_dialog.dart';
 
 class OtherSettings extends StatefulWidget {
   final SettingsStore settingsStore;
 
-  const OtherSettings({
-    Key? key,
-    required this.settingsStore,
-  }) : super(key: key);
+  const OtherSettings({super.key, required this.settingsStore});
 
   @override
   State<OtherSettings> createState() => _OtherSettingsState();
@@ -32,10 +25,14 @@ class _OtherSettingsState extends State<OtherSettings> {
     return showDialog(
       context: context,
       builder: (context) => FrostyDialog(
-        title: 'Reset All Settings',
+        title: 'Reset all settings',
         message: 'Are you sure you want to reset all settings?',
         actions: [
-          Button(
+          TextButton(
+            onPressed: Navigator.of(context).pop,
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
             onPressed: () {
               HapticFeedback.heavyImpact();
 
@@ -45,17 +42,14 @@ class _OtherSettingsState extends State<OtherSettings> {
 
               ScaffoldMessenger.of(context).showSnackBar(
                 const SnackBar(
-                  content: AlertMessage(message: 'All settings reset'),
-                  behavior: SnackBarBehavior.floating,
+                  content: AlertMessage(
+                    message: 'All settings reset',
+                    centered: false,
+                  ),
                 ),
               );
             },
-            child: const Text('Yes'),
-          ),
-          Button(
-            onPressed: Navigator.of(context).pop,
-            color: Colors.grey,
-            child: const Text('Cancel'),
+            child: const Text('Reset'),
           ),
         ],
       ),
@@ -66,81 +60,61 @@ class _OtherSettingsState extends State<OtherSettings> {
   Widget build(BuildContext context) {
     return Column(
       children: [
-        FrostyListTile(
-          leading: const Icon(Icons.info_outline_rounded),
-          title: 'About Frosty',
-          onTap: () async {
-            final packageInfo = await PackageInfo.fromPlatform();
-
-            if (!mounted) return;
-
-            showAboutDialog(
-              context: context,
-              applicationIcon: SvgPicture.asset(
-                'assets/icons/logo.svg',
-                height: 80,
-              ),
-              applicationName: packageInfo.appName,
-              applicationVersion:
-                  'Version ${packageInfo.version} (${packageInfo.buildNumber})',
-              applicationLegalese: '\u{a9} 2023 Tommy Chow',
-            );
-          },
+        ListTile(
+          leading: const Icon(Icons.notes_rounded),
+          title: const Text('Release notes'),
+          onTap: () => Navigator.of(
+            context,
+          ).push(MaterialPageRoute(
+            settings: const RouteSettings(name: ReleaseNotes.routeName),
+            builder: (context) => const ReleaseNotes(),
+          )),
         ),
-        FrostyListTile(
-          leading: const Icon(Icons.launch_rounded),
-          title: 'Changelog',
-          onTap: () => launchUrl(
-              Uri.parse('https://github.com/tommyxchow/frosty/releases'),
-              mode: widget.settingsStore.launchUrlExternal
-                  ? LaunchMode.externalApplication
-                  : LaunchMode.inAppWebView),
-        ),
-        FrostyListTile(
-          leading: const Icon(Icons.launch_rounded),
-          title: 'FAQ',
-          onTap: () => launchUrl(Uri.parse('https://www.frostyapp.io/#faq'),
-              mode: widget.settingsStore.launchUrlExternal
-                  ? LaunchMode.externalApplication
-                  : LaunchMode.inAppWebView),
-        ),
-        FrostyListTile(
+        ListTile(
           leading: const Icon(Icons.delete_outline_rounded),
-          title: 'Clear image cache',
+          title: const Text('Clear image cache'),
           onTap: () async {
-            HapticFeedback.mediumImpact();
+            HapticFeedback.lightImpact();
 
-            await DefaultCacheManager().emptyCache();
+            await CustomCacheManager.instance.emptyCache();
+            await CustomCacheManager.removeOrphanedCacheFiles();
+
+            if (!context.mounted) return;
 
-            if (!mounted) return;
             ScaffoldMessenger.of(context).showSnackBar(
               const SnackBar(
-                content: AlertMessage(message: 'Image cache cleared'),
-                behavior: SnackBarBehavior.floating,
+                content: AlertMessage(
+                  message: 'Image cache cleared',
+                  centered: false,
+                ),
               ),
             );
           },
         ),
-        FrostyListTile(
+        ListTile(
           leading: const Icon(Icons.restore_rounded),
-          title: 'Reset settings',
+          title: const Text('Reset settings'),
           onTap: () => _showConfirmDialog(context),
         ),
         Observer(
           builder: (_) => SettingsListSwitch(
             title: 'Share crash logs and analytics',
             subtitle: const Text(
-                'Help improve Frosty by sending anonymous crash logs and analytics through Firebase.'),
+              'Help improve Frosty by sending anonymous crash logs and analytics through Firebase.',
+            ),
             value: widget.settingsStore.shareCrashLogsAndAnalytics,
             onChanged: (newValue) {
               widget.settingsStore.shareCrashLogsAndAnalytics = newValue;
 
-              FirebaseCrashlytics.instance
-                  .setCrashlyticsCollectionEnabled(newValue);
-              FirebaseAnalytics.instance
-                  .setAnalyticsCollectionEnabled(newValue);
-              FirebasePerformance.instance
-                  .setPerformanceCollectionEnabled(newValue);
+              FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(
+                newValue,
+              );
+              FirebaseAnalytics.instance.setAnalyticsCollectionEnabled(
+                newValue,
+              );
+              FirebasePerformance.instance.setPerformanceCollectionEnabled(
+                newValue,
+              );
             },
           ),
         ),
diff --git a/lib/screens/settings/settings.dart b/lib/screens/settings/settings.dart
index 34a24521..a0360635 100644
--- a/lib/screens/settings/settings.dart
+++ b/lib/screens/settings/settings.dart
@@ -1,6 +1,5 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:frosty/screens/settings/account/widgets/profile_card.dart';
 import 'package:frosty/screens/settings/chat_settings.dart';
 import 'package:frosty/screens/settings/general_settings.dart';
@@ -9,70 +8,219 @@ import 'package:frosty/screens/settings/stores/auth_store.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
 import 'package:frosty/screens/settings/video_settings.dart';
 import 'package:frosty/screens/settings/widgets/settings_tile_route.dart';
-import 'package:frosty/widgets/app_bar.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
 import 'package:frosty/widgets/section_header.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
 import 'package:simple_icons/simple_icons.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class Settings extends StatelessWidget {
+  static const routeName = 'Settings';
+
   final SettingsStore settingsStore;
 
-  const Settings({Key? key, required this.settingsStore}) : super(key: key);
+  const Settings({super.key, required this.settingsStore});
 
   @override
   Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
     return Scaffold(
-      appBar: FrostyAppBar(
+      backgroundColor: theme.scaffoldBackgroundColor,
+      extendBody: true,
+      extendBodyBehindAppBar: true,
+      appBar: AppBar(
+        centerTitle: false,
+        elevation: 0,
+        backgroundColor: Colors.transparent,
+        surfaceTintColor: Colors.transparent,
+        systemOverlayStyle: SystemUiOverlayStyle(
+          statusBarColor: Colors.transparent,
+          statusBarIconBrightness: theme.brightness == Brightness.dark
+              ? Brightness.light
+              : Brightness.dark,
+        ),
+        leading: IconButton(
+          tooltip: 'Back',
+          icon: Icon(Icons.adaptive.arrow_back_rounded),
+          onPressed: Navigator.of(context).pop,
+        ),
         title: const Text('Settings'),
         actions: [
-          if (Platform.isAndroid)
-            IconButton(
+          IconButton(
               tooltip: 'Support Frosty',
               onPressed: () => launchUrl(
-                  Uri.parse('https://www.buymeacoffee.com/tommychow'),
-                  mode: settingsStore.launchUrlExternal
-                      ? LaunchMode.externalApplication
-                      : LaunchMode.inAppWebView),
+                Uri.parse('https://www.buymeacoffee.com/tommychow'),
+                mode: settingsStore.launchUrlExternal
+                    ? LaunchMode.externalApplication
+                    : LaunchMode.inAppBrowserView,
+              ),
               icon: const Icon(SimpleIcons.buymeacoffee),
             ),
-          IconButton(
-            tooltip: 'View source on GitHub',
-            onPressed: () => launchUrl(
+          Padding(
+            padding: const EdgeInsets.only(right: 8),
+            child: IconButton(
+              tooltip: 'View source on GitHub',
+              onPressed: () => launchUrl(
                 Uri.parse('https://github.com/tommyxchow/frosty'),
                 mode: settingsStore.launchUrlExternal
                     ? LaunchMode.externalApplication
-                    : LaunchMode.inAppWebView),
-            icon: const Icon(SimpleIcons.github),
+                    : LaunchMode.inAppBrowserView,
+              ),
+              icon: const Icon(SimpleIcons.github),
+            ),
           ),
         ],
       ),
-      body: SafeArea(
-        bottom: false,
-        child: ListView(
-          children: [
-            const SectionHeader('Account'),
-            ProfileCard(authStore: context.read<AuthStore>()),
-            const SectionHeader('Customize'),
-            SettingsTileRoute(
-              leading: const Icon(Icons.settings_outlined),
-              title: 'General',
-              child: GeneralSettings(settingsStore: settingsStore),
+      body: Stack(
+        children: [
+          // Main scrollable content
+          SafeArea(
+            top: false,
+            bottom: false,
+            child: FrostyScrollbar(
+              padding: EdgeInsets.only(
+                top: MediaQuery.of(context).padding.top + kToolbarHeight,
+              ),
+              child: CustomScrollView(
+              slivers: [
+                SliverPadding(
+                  padding: EdgeInsets.only(
+                    top: MediaQuery.of(context).padding.top +
+                        kToolbarHeight +
+                        8,
+                  ),
+                  sliver: SliverList.list(
+                    children: [
+                      const SectionHeader('Account', isFirst: true),
+                      ProfileCard(authStore: context.read<AuthStore>()),
+                      const SectionHeader('Customize'),
+                      SettingsTileRoute(
+                        leading: const Icon(Icons.settings_outlined),
+                        title: 'General',
+                        child: GeneralSettings(settingsStore: settingsStore),
+                      ),
+                      SettingsTileRoute(
+                        leading: const Icon(Icons.tv_rounded),
+                        title: 'Video',
+                        child: VideoSettings(settingsStore: settingsStore),
+                      ),
+                      SettingsTileRoute(
+                        leading: const Icon(Icons.chat_outlined),
+                        title: 'Chat',
+                        child: ChatSettings(settingsStore: settingsStore),
+                      ),
+                      const SectionHeader('Other'),
+                      OtherSettings(settingsStore: settingsStore),
+                    ],
+                  ),
+                ),
+                SliverFillRemaining(
+                  hasScrollBody: false,
+                  child: Align(
+                    alignment: Alignment.bottomCenter,
+                    child: FutureBuilder<PackageInfo>(
+                      future: PackageInfo.fromPlatform(),
+                      builder: (context, snapshot) {
+                        final version = snapshot.data?.version ?? '';
+                        final buildNumber = snapshot.data?.buildNumber ?? '';
+                        final mutedColor = theme.colorScheme.onSurfaceVariant
+                            .withValues(alpha: 0.5);
+                        return Padding(
+                          padding: EdgeInsets.only(
+                            top: 16,
+                            bottom: MediaQuery.of(context).padding.bottom,
+                          ),
+                          child: Column(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Text.rich(
+                                TextSpan(
+                                  style:
+                                      theme.textTheme.bodySmall?.copyWith(
+                                    color: mutedColor,
+                                  ),
+                                  children: [
+                                    const TextSpan(text: 'Made by '),
+                                    WidgetSpan(
+                                      alignment:
+                                          PlaceholderAlignment.baseline,
+                                      baseline: TextBaseline.alphabetic,
+                                      child: GestureDetector(
+                                        onTap: () => launchUrl(
+                                          Uri.parse(
+                                            'https://tommychow.com',
+                                          ),
+                                          mode: settingsStore
+                                                  .launchUrlExternal
+                                              ? LaunchMode
+                                                  .externalApplication
+                                              : LaunchMode
+                                                  .inAppBrowserView,
+                                        ),
+                                        child: Text(
+                                          'Tommy Chow',
+                                          style: theme.textTheme.bodySmall
+                                              ?.copyWith(
+                                            color: mutedColor,
+                                            decoration:
+                                                TextDecoration.underline,
+                                            decorationColor: mutedColor,
+                                          ),
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                              const SizedBox(height: 4),
+                              if (snapshot.hasData)
+                                GestureDetector(
+                                  onTap: () => launchUrl(
+                                    Uri.parse(
+                                      'https://github.com/tommyxchow/frosty/releases/tag/v$version',
+                                    ),
+                                    mode: settingsStore.launchUrlExternal
+                                        ? LaunchMode.externalApplication
+                                        : LaunchMode.inAppBrowserView,
+                                  ),
+                                  child: Text(
+                                    'v$version ($buildNumber)',
+                                    style:
+                                        theme.textTheme.bodySmall?.copyWith(
+                                      color: mutedColor,
+                                    ),
+                                  ),
+                                ),
+                            ],
+                          ),
+                        );
+                      },
+                    ),
+                  ),
+                ),
+              ],
             ),
-            SettingsTileRoute(
-              leading: const Icon(Icons.tv_rounded),
-              title: 'Video',
-              child: VideoSettings(settingsStore: settingsStore),
+          ),
+          ),
+          // Blurred app bar overlay
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: BlurredContainer(
+              gradientDirection: GradientDirection.up,
+              padding: EdgeInsets.only(
+                top: MediaQuery.of(context).padding.top,
+                left: MediaQuery.of(context).padding.left,
+                right: MediaQuery.of(context).padding.right,
+              ),
+              child: const SizedBox(height: kToolbarHeight),
             ),
-            SettingsTileRoute(
-              leading: const Icon(Icons.chat_outlined),
-              title: 'Chat',
-              child: ChatSettings(settingsStore: settingsStore),
-            ),
-            const SectionHeader('Other'),
-            OtherSettings(settingsStore: settingsStore)
-          ],
-        ),
+          ),
+        ],
       ),
     );
   }
diff --git a/lib/screens/settings/stores/auth_store.dart b/lib/screens/settings/stores/auth_store.dart
index 6358bd91..d4581732 100644
--- a/lib/screens/settings/stores/auth_store.dart
+++ b/lib/screens/settings/stores/auth_store.dart
@@ -1,240 +1,600 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:frosty/apis/twitch_api.dart';
-import 'package:frosty/constants.dart';
-import 'package:frosty/main.dart';
-import 'package:frosty/screens/settings/stores/user_store.dart';
-import 'package:frosty/widgets/button.dart';
-import 'package:frosty/widgets/dialog.dart';
-import 'package:mobx/mobx.dart';
-import 'package:webview_flutter/webview_flutter.dart';
-
-part 'auth_store.g.dart';
-
-class AuthStore = AuthBase with _$AuthStore;
-
-abstract class AuthBase with Store {
-  /// Secure storage to store tokens.
-  static const _storage = FlutterSecureStorage();
-
-  /// The shared_preferences key for the default token.
-  static const _defaultTokenKey = 'default_token';
-
-  /// The shared_preferences key for the user token.
-  static const _userTokenKey = 'user_token';
-
-  /// The Twitch API service for making requests.
-  final TwitchApi twitchApi;
-
-  /// Whether the token is valid or not.
-  var _tokenIsValid = false;
-
-  /// The MobX store containing information relevant to the current user.
-  final UserStore user;
-
-  /// The user token used to authenticate with the Twitch API.
-  @readonly
-  String? _token;
-
-  /// Whether the user is logged in or not.
-  @readonly
-  var _isLoggedIn = false;
-
-  /// Authentication headers for Twitch API requests.
-  @computed
-  Map<String, String> get headersTwitch =>
-      {'Authorization': 'Bearer $_token', 'Client-Id': clientId};
-
-  /// Error flag that will be non-null and contain an error message if login failed.
-  @readonly
-  String? _error;
-
-  /// OAuth URI for the user to login.
-  final loginUri = Uri(
-    scheme: 'https',
-    host: 'id.twitch.tv',
-    path: '/oauth2/authorize',
-    queryParameters: {
-      'client_id': clientId,
-      'redirect_uri': 'https://twitch.tv/login',
-      'response_type': 'token',
-      'scope':
-          'chat:read chat:edit user:read:follows user:read:blocked_users user:manage:blocked_users',
-      'force_verify': 'true',
-    },
-  );
-
-  /// Navigation handler for the login webview. Fires on every navigation request (whenever the URL changes).
-  FutureOr<NavigationDecision> handleNavigation(
-      {required NavigationRequest navigation, Widget? routeAfter}) {
-    // Check if the URL is the redirect URI.
-    if (navigation.url.startsWith('https://twitch.tv/login')) {
-      // Extract the token from the query parameters.
-      final uri = Uri.parse(navigation.url.replaceFirst('#', '?'));
-      final token = uri.queryParameters['access_token'];
-
-      // Login with the provided token.
-      if (token != null) login(token: token);
-    }
-
-    // Check if the the URL has been redirected to "https://www.twitch.tv/?no-reload=true".
-    // When redirected to the redirect_uri, there will be another redirect to "https://www.twitch.tv/?no-reload=true".
-    // Checking for this will ensure that the user has automatically logged in to Twitch on the WebView itself.
-    if (navigation.url == 'https://www.twitch.tv/?no-reload=true') {
-      if (routeAfter != null) {
-        navigatorKey.currentState?.pop();
-        navigatorKey.currentState
-            ?.push(MaterialPageRoute(builder: (context) => routeAfter));
-      } else {
-        // Pop twice, once to dismiss the WebView and again to dismiss the Login dialog.
-        navigatorKey.currentState?.pop();
-        navigatorKey.currentState?.pop();
-      }
-    }
-
-    // Always allow navigation to the next URL.
-    return NavigationDecision.navigate;
-  }
-
-  /// Shows a dialog verifying that the user is sure they want to block/unblock the target user.
-  Future<void> showBlockDialog(
-    BuildContext context, {
-    required String targetUser,
-    required String targetUserId,
-  }) {
-    final isBlocked = user.blockedUsers
-        .where((blockedUser) => blockedUser.userId == targetUserId)
-        .isNotEmpty;
-
-    final title = isBlocked ? 'Unblock $targetUser' : 'Block $targetUser';
-
-    final message =
-        'Are you sure you want to ${isBlocked ? 'unblock $targetUser?' : 'block $targetUser? This will remove them from channel lists, search results, and chat messages.'}';
-
-    void onPressed() {
-      if (isBlocked) {
-        user.unblock(targetId: targetUserId, headers: headersTwitch);
-      } else {
-        user.block(
-          targetId: targetUserId,
-          displayName: targetUser,
-          headers: headersTwitch,
-        );
-      }
-      Navigator.pop(context);
-    }
-
-    return showDialog(
-      context: context,
-      builder: (context) => FrostyDialog(
-        title: title,
-        message: message,
-        actions: [
-          Button(
-            onPressed: onPressed,
-            child: const Text('Yes'),
-          ),
-          Button(
-            onPressed: Navigator.of(context).pop,
-            color: Colors.grey,
-            child: const Text('Cancel'),
-          ),
-        ],
-      ),
-    );
-  }
-
-  AuthBase({required this.twitchApi}) : user = UserStore(twitchApi: twitchApi);
-
-  /// Initialize by retrieving a token if it does not already exist.
-  @action
-  Future<void> init() async {
-    try {
-      // Read and set the currently stored user token, if any.
-      _token = await _storage.read(key: _userTokenKey);
-
-      // If the token does not exist, get the default token.
-      // Otherwise, log in.
-      if (_token == null) {
-        // Retrieve the currently stored default token if it exists.
-        _token = await _storage.read(key: _defaultTokenKey);
-        // If the token does not exist or is invalid, get a new token and store it.
-        if (_token == null || !await twitchApi.validateToken(token: _token!)) {
-          _token = await twitchApi.getDefaultToken();
-          await _storage.write(key: _defaultTokenKey, value: _token);
-        }
-      } else {
-        // Validate the existing token.
-        _tokenIsValid = await twitchApi.validateToken(token: _token!);
-
-        // If the token is invalid, logout.
-        if (!_tokenIsValid) return await logout();
-
-        // Initialize the user store.
-        await user.init(headers: headersTwitch);
-
-        if (user.details != null) _isLoggedIn = true;
-      }
-
-      _error = null;
-    } catch (e) {
-      debugPrint(e.toString());
-      _error = e.toString();
-    }
-  }
-
-  /// Logs in the user with the provided [token] and updates fields accordingly upon successful login.
-  @action
-  Future<void> login({required String token}) async {
-    try {
-      // Validate the custom token.
-      _tokenIsValid = await twitchApi.validateToken(token: token);
-      if (!_tokenIsValid) return;
-
-      // Replace the current default token with the new custom token.
-      _token = token;
-
-      // Store the user token.
-      await _storage.write(key: _userTokenKey, value: token);
-
-      // Initialize the user with the new token.
-      await user.init(headers: headersTwitch);
-
-      // Set the login status to logged in.
-      if (user.details != null) _isLoggedIn = true;
-    } catch (e) {
-      debugPrint('Login failed due to $e');
-    }
-  }
-
-  /// Logs out the current user and updates fields accordingly.
-  @action
-  Future<void> logout() async {
-    try {
-      // Delete the existing user token.
-      await _storage.delete(key: _userTokenKey);
-      _token = null;
-
-      // Clear the user info.
-      user.dispose();
-
-      // If the default token already exists, set it.
-      _token = await _storage.read(key: _defaultTokenKey);
-
-      // If the default token does not already exist or it's invalid, get the new default token and store it.
-      if (_token == null || !await twitchApi.validateToken(token: _token!)) {
-        _token = await twitchApi.getDefaultToken();
-        await _storage.write(key: _defaultTokenKey, value: _token);
-      }
-
-      // Set the login status to logged out.
-      _isLoggedIn = false;
-
-      debugPrint('Successfully logged out');
-    } catch (e) {
-      debugPrint(e.toString());
-    }
-  }
-}
+import 'dart:async';
+import 'dart:io';
+
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/constants.dart';
+import 'package:frosty/main.dart';
+import 'package:frosty/screens/settings/stores/user_store.dart';
+import 'package:frosty/services/cookie_extractor.dart';
+import 'package:frosty/utils/twitch_oauth_scopes.dart' as twitch_scopes;
+import 'package:frosty/widgets/frosty_dialog.dart';
+import 'package:mobx/mobx.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+part 'auth_store.g.dart';
+
+class AuthStore = AuthBase with _$AuthStore;
+
+abstract class AuthBase with Store {
+  /// Secure storage to store tokens.
+  static const _storage = FlutterSecureStorage();
+
+  /// The shared_preferences key for the default token.
+  static const _defaultTokenKey = 'default_token';
+
+  /// The shared_preferences key for the user token.
+  static const _userTokenKey = 'user_token';
+
+  /// The secure storage key for the GQL web cookie token.
+  static const _gqlTokenKey = 'gql_token';
+
+  /// Twitch user id that opted into moderator scopes on this device.
+  static const _moderatorOptInUserIdKey = 'moderator_scopes_opt_in_user_id';
+
+  /// Last logged-in Twitch user id (kept across logout for re-login scope choice).
+  static const _lastUserIdKey = 'last_user_id';
+
+  /// The Twitch API service for making requests.
+  final TwitchApi twitchApi;
+
+  /// Web GQL client (follow/unfollow + playback tokens).
+  final TwitchGqlApi twitchGqlApi;
+
+  /// Timer used to retry authentication when offline or on transient failures.
+  Timer? _reconnectTimer;
+
+  /// Retry count for reconnection attempts.
+  var _reconnectAttempts = 0;
+
+  /// Maximum number of reconnection attempts before giving up.
+  static const _maxReconnectAttempts = 5;
+
+  /// The MobX store containing information relevant to the current user.
+  late final UserStore user;
+
+  /// The user token used to authenticate with the Twitch API.
+  @readonly
+  String? _token;
+
+  /// Web cookie token extracted from the login WebView for GQL ad-free playback.
+  @readonly
+  String? _gqlToken;
+
+  /// Whether the user is logged in or not.
+  @readonly
+  var _isLoggedIn = false;
+
+  /// OAuth scopes granted to the current user token.
+  @readonly
+  var _grantedScopes = ObservableList<String>();
+
+  /// Twitch user id that previously enabled moderator tools on this device.
+  String? _moderatorOptInUserId;
+
+  /// Last known Twitch user id, retained after logout for scope selection.
+  String? _lastUserId;
+
+  /// Whether the current token includes every moderator scope Frosty needs.
+  @computed
+  bool get hasModeratorScopes =>
+      twitch_scopes.hasModeratorScopes(_grantedScopes);
+
+  /// Authentication headers for Twitch API requests.
+  @computed
+  Map<String, String> get headersTwitch => {
+    'Authorization': 'Bearer $_token',
+    'Client-Id': clientId,
+  };
+
+  /// Error flag that will be non-null and contain an error message if login failed.
+  @readonly
+  String? _error;
+
+  /// Navigation handler for the login webview. Fires on every navigation request (whenever the URL changes).
+  FutureOr<NavigationDecision> handleNavigation({
+    required NavigationRequest request,
+    Widget? routeAfter,
+    bool upgradeModeratorScopes = false,
+  }) {
+    // Check if the URL is the redirect URI.
+    if (request.url.startsWith('https://twitch.tv/login')) {
+      // Extract the token from the query parameters.
+      final uri = Uri.parse(request.url.replaceFirst('#', '?'));
+      final token = uri.queryParameters['access_token'];
+
+      if (token != null) {
+        if (upgradeModeratorScopes) {
+          unawaited(completeModeratorUpgrade(token: token));
+        } else {
+          unawaited(login(token: token));
+        }
+      }
+    }
+
+    // Check if the URL has been redirected to "https://www.twitch.tv/?no-reload=true".
+    // When redirected to the redirect_uri, there will be another redirect to "https://www.twitch.tv/?no-reload=true".
+    // Checking for this will ensure that the user has automatically logged in to Twitch on the WebView itself.
+    if (request.url == 'https://www.twitch.tv/?no-reload=true') {
+      _extractGqlToken();
+
+      // Upgrade WebViews pop themselves after an atomic commit so we never
+      // dismiss into a half-applied session.
+      if (upgradeModeratorScopes) {
+        return NavigationDecision.navigate;
+      }
+
+      if (routeAfter != null) {
+        navigatorKey.currentState?.pop();
+        navigatorKey.currentState?.push(
+          MaterialPageRoute(builder: (context) => routeAfter),
+        );
+      } else {
+        // Pop the WebView to return to the previous screen
+        navigatorKey.currentState?.pop();
+      }
+    }
+
+    // Always allow navigation to the next URL.
+    return NavigationDecision.navigate;
+  }
+
+  WebViewController createAuthWebViewController({
+    Widget? routeAfter,
+    bool upgradeModeratorScopes = false,
+  }) {
+    final webViewController = WebViewController()
+      ..setJavaScriptMode(JavaScriptMode.unrestricted)
+      // Use platform-specific user agents to allow Google OAuth sign-in.
+      // Google blocks OAuth in embedded WebViews (error 403: disallowed_useragent)
+      // by detecting WebView markers. These standard browser UAs work around that.
+      ..setUserAgent(
+        Platform.isIOS
+            ? 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 Mobile/15E148 Safari/604.1'
+            : 'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Mobile Safari/537.36',
+      );
+
+    final scopeQuery = upgradeModeratorScopes || _shouldIncludeModeratorScopes
+        ? twitch_scopes.twitchAllUserScopeQuery
+        : twitch_scopes.twitchUserScopeQuery;
+
+    return webViewController
+      ..setNavigationDelegate(
+        NavigationDelegate(
+          onNavigationRequest: (request) => handleNavigation(
+            request: request,
+            routeAfter: routeAfter,
+            upgradeModeratorScopes: upgradeModeratorScopes,
+          ),
+          onWebResourceError: (error) {
+            debugPrint('Auth WebView error: ${error.description}');
+          },
+          onPageFinished: (_) async {
+            try {
+              await webViewController.runJavaScript('''
+                {
+                  function modifyElement(element) {
+                    element.style.maxHeight = '20vh';
+                    element.style.overflow = 'auto';
+                  }
+
+                  const observer = new MutationObserver((mutations) => {
+                    for (let mutation of mutations) {
+                      if (mutation.type === 'childList') {
+                        const element = document.querySelector('.fAVISI');
+                        if (element) {
+                          modifyElement(element);
+                          observer.disconnect();
+                          break;
+                        }
+                      }
+                    }
+                  });
+
+                  observer.observe(document.body, {
+                    childList: true,
+                    subtree: true
+                  });
+                }
+                ''');
+            } catch (e) {
+              debugPrint('Auth WebView JavaScript error: $e');
+            }
+          },
+        ),
+      )
+      ..loadRequest(
+        Uri(
+          scheme: 'https',
+          host: 'id.twitch.tv',
+          path: '/oauth2/authorize',
+          queryParameters: {
+            'client_id': clientId,
+            'redirect_uri': 'https://twitch.tv/login',
+            'response_type': 'token',
+            'scope': scopeQuery,
+            'force_verify': 'true',
+          },
+        ),
+      );
+  }
+
+  /// Shows a dialog verifying that the user is sure they want to block/unblock the target user.
+  Future<void> showBlockDialog(
+    BuildContext context, {
+    required String targetUser,
+    required String targetUserId,
+  }) {
+    final isBlocked = user.blockedUsers
+        .where((blockedUser) => blockedUser.userId == targetUserId)
+        .isNotEmpty;
+
+    final title = isBlocked ? 'Unblock' : 'Block';
+
+    final message =
+        'Are you sure you want to ${isBlocked ? 'unblock "$targetUser"?' : 'block "$targetUser"? This will remove them from channel lists, search results, and chat messages.'}';
+
+    void onPressed() {
+      if (isBlocked) {
+        user.unblock(targetId: targetUserId);
+      } else {
+        user.block(targetId: targetUserId, displayName: targetUser);
+      }
+      Navigator.pop(context);
+    }
+
+    return showDialog(
+      context: context,
+      builder: (context) => FrostyDialog(
+        title: title,
+        message: message,
+        actions: [
+          TextButton(
+            onPressed: Navigator.of(context).pop,
+            child: const Text('Cancel'),
+          ),
+          FilledButton(onPressed: onPressed, child: const Text('Yes')),
+        ],
+      ),
+    );
+  }
+
+  AuthBase({
+    required this.twitchApi,
+    required this.twitchGqlApi,
+  }) {
+    user = UserStore(
+      twitchApi: twitchApi,
+      twitchGqlApi: twitchGqlApi,
+      hasModeratorScopes: () => hasModeratorScopes,
+    );
+  }
+
+  bool get _shouldIncludeModeratorScopes {
+    final currentId = user.details?.id;
+    if (currentId != null && currentId == _moderatorOptInUserId) {
+      return true;
+    }
+    // After logout, still request mod scopes for the same opted-in account.
+    if (currentId == null &&
+        _lastUserId != null &&
+        _lastUserId == _moderatorOptInUserId) {
+      return true;
+    }
+    return false;
+  }
+
+  Future<void> _extractGqlToken() async {
+    try {
+      final token = await CookieExtractor.extractTwitchAuthToken();
+      if (token != null) {
+        runInAction(() {
+          _gqlToken = token;
+        });
+        await _storage.write(key: _gqlTokenKey, value: token);
+      }
+    } catch (e) {
+      debugPrint('GQL token extraction failed: $e');
+    }
+  }
+
+  /// Clears the stored web session token after Twitch rejects it, so the
+  /// profile card reflects the unlinked state and future stream loads skip
+  /// the doomed authenticated request.
+  @action
+  Future<void> invalidateGqlToken() async {
+    _gqlToken = null;
+    await _storage.delete(key: _gqlTokenKey);
+  }
+
+  void _setGrantedScopes(List<String> scopes) {
+    _grantedScopes = ObservableList.of(scopes);
+  }
+
+  Future<void> _persistModeratorOptIn(String userId) async {
+    if (_moderatorOptInUserId == userId) return;
+    _moderatorOptInUserId = userId;
+    await _storage.write(key: _moderatorOptInUserIdKey, value: userId);
+  }
+
+  Future<void> _persistLastUserId(String? userId) async {
+    if (_lastUserId == userId) return;
+    _lastUserId = userId;
+    if (userId == null) {
+      await _storage.delete(key: _lastUserIdKey);
+    } else {
+      await _storage.write(key: _lastUserIdKey, value: userId);
+    }
+  }
+
+  /// Initialize by retrieving a token if it does not already exist.
+  @action
+  Future<void> init() async {
+    try {
+      final stored = await Future.wait([
+        _storage.read(key: _moderatorOptInUserIdKey),
+        _storage.read(key: _lastUserIdKey),
+        _storage.read(key: _userTokenKey),
+        _storage.read(key: _gqlTokenKey),
+      ]);
+      _moderatorOptInUserId = stored[0];
+      _lastUserId = stored[1];
+      _token = stored[2];
+      _gqlToken = stored[3];
+
+      // If the token does not exist, get the default token.
+      // Otherwise, log in.
+      if (_token == null) {
+        // Retrieve the currently stored default token if it exists.
+        _token = await _storage.read(key: _defaultTokenKey);
+        // If the token does not exist or is invalid, get a new token and store it.
+        if (_token == null ||
+            await twitchApi.validateToken(token: _token!) == null) {
+          _token = await twitchApi.getDefaultToken();
+          await _storage.write(key: _defaultTokenKey, value: _token);
+        }
+        _setGrantedScopes(const []);
+      } else {
+        // Validate the existing token. If it fails, start reconnect loop.
+        final TwitchTokenInfo info;
+        try {
+          final validated = await twitchApi.validateToken(token: _token!);
+          if (validated == null) return await logout();
+          info = validated;
+        } on ApiException catch (e) {
+          debugPrint('Token validation failed: $e');
+          _isLoggedIn = false;
+          _setGrantedScopes(const []);
+          _startReconnectLoop();
+          return;
+        }
+
+        _setGrantedScopes(info.scopes);
+
+        // Initialize the user store.
+        await user.init();
+
+        if (user.details != null) {
+          _isLoggedIn = true;
+          await _persistLastUserId(user.details!.id);
+          _stopReconnectLoop();
+
+          // Recover a missed web session link — the WebView cookie store may
+          // still hold a valid auth-token from a previous login.
+          if (_gqlToken == null) _extractGqlToken();
+        }
+      }
+
+      FirebaseCrashlytics.instance.setCustomKey('is_logged_in', _isLoggedIn);
+      _error = null;
+    } catch (e) {
+      debugPrint(e.toString());
+      _error = e.toString();
+    }
+  }
+
+  /// Logs in the user with the provided [token] and updates fields accordingly upon successful login.
+  @action
+  Future<void> login({required String token}) async {
+    try {
+      // Validate the custom token.
+      final info = await twitchApi.validateToken(token: token);
+      if (info == null) return;
+      _setGrantedScopes(info.scopes);
+
+      // Replace the current default token with the new custom token.
+      _token = token;
+
+      // Store the user token.
+      await _storage.write(key: _userTokenKey, value: token);
+
+      // Initialize the user with the new token.
+      await user.init();
+
+      // Set the login status to logged in.
+      if (user.details != null) {
+        _isLoggedIn = true;
+        await _persistLastUserId(user.details!.id);
+        // A fresh login that already includes mod scopes (re-auth after opt-in)
+        // should keep the opt-in flag for this account.
+        if (hasModeratorScopes) {
+          await _persistModeratorOptIn(user.details!.id);
+        }
+        FirebaseCrashlytics.instance.setCustomKey('is_logged_in', true);
+        FirebaseCrashlytics.instance.setUserIdentifier(user.details!.id);
+        _stopReconnectLoop();
+      }
+    } catch (e) {
+      debugPrint('Login failed due to $e');
+    }
+  }
+
+  /// Atomically upgrades the current session with moderator OAuth scopes.
+  ///
+  /// Keeps the existing token until validation proves the new token is for the
+  /// same user and includes every moderator scope. On any failure, the old
+  /// session is left untouched.
+  @action
+  Future<bool> completeModeratorUpgrade({required String token}) async {
+    final currentUserId = user.details?.id;
+    if (currentUserId == null || !_isLoggedIn) {
+      _showModeratorUpgradeFailed(
+        'Log in first, then enable moderator tools from a channel you moderate.',
+      );
+      return false;
+    }
+
+    try {
+      final info = await twitchApi.validateToken(token: token);
+      if (info == null) {
+        _showModeratorUpgradeFailed(
+          'Could not validate the new Twitch permissions. Your current session was kept.',
+        );
+        return false;
+      }
+
+      if (info.userId != currentUserId) {
+        _showModeratorUpgradeFailed(
+          'Log in with the same Twitch account to enable moderator tools. Your current session was kept.',
+        );
+        return false;
+      }
+
+      if (!twitch_scopes.hasModeratorScopes(info.scopes)) {
+        _showModeratorUpgradeFailed(
+          'Moderator permissions were not granted. Your current session was kept.',
+        );
+        return false;
+      }
+
+      // Commit only after all gates pass.
+      _token = token;
+      _setGrantedScopes(info.scopes);
+      await Future.wait([
+        _storage.write(key: _userTokenKey, value: token),
+        _persistModeratorOptIn(currentUserId),
+      ]);
+      await user.refreshModeratedChannels();
+
+      navigatorKey.currentState?.pop();
+      return true;
+    } catch (e) {
+      debugPrint('Moderator upgrade failed due to $e');
+      _showModeratorUpgradeFailed(
+        'Could not enable moderator tools. Your current session was kept.',
+      );
+      return false;
+    }
+  }
+
+  void _showModeratorUpgradeFailed(String message) {
+    final context = navigatorKey.currentContext;
+    if (context == null) return;
+    showDialog(
+      context: context,
+      builder: (dialogContext) => FrostyDialog(
+        title: 'Moderator tools not enabled',
+        message: message,
+        actions: [
+          TextButton(
+            onPressed: Navigator.of(dialogContext).pop,
+            child: const Text('OK'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  /// Logs out the current user and updates fields accordingly.
+  @action
+  Future<void> logout() async {
+    try {
+      _stopReconnectLoop();
+      final previousUserId = user.details?.id ?? _lastUserId;
+      await _persistLastUserId(previousUserId);
+
+      // Delete the existing user token and GQL token.
+      await _storage.delete(key: _userTokenKey);
+      await _storage.delete(key: _gqlTokenKey);
+      _token = null;
+      _gqlToken = null;
+      _setGrantedScopes(const []);
+
+      // Clear the user info.
+      user.dispose();
+
+      // If the default token already exists, set it.
+      _token = await _storage.read(key: _defaultTokenKey);
+
+      // If the default token does not already exist or it's invalid, get the new default token and store it.
+      if (_token == null ||
+          await twitchApi.validateToken(token: _token!) == null) {
+        _token = await twitchApi.getDefaultToken();
+        await _storage.write(key: _defaultTokenKey, value: _token);
+      }
+
+      // Set the login status to logged out.
+      _isLoggedIn = false;
+      FirebaseCrashlytics.instance.setCustomKey('is_logged_in', false);
+      FirebaseCrashlytics.instance.setUserIdentifier('');
+
+      debugPrint('Successfully logged out');
+    } catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  void _startReconnectLoop() {
+    if (_reconnectTimer != null) return;
+    _reconnectAttempts = 0;
+    _reconnectTimer = Timer.periodic(const Duration(seconds: 10), (_) async {
+      try {
+        _reconnectAttempts++;
+        if (_reconnectAttempts > _maxReconnectAttempts) {
+          FirebaseCrashlytics.instance.log(
+            'Auth reconnection exhausted after $_maxReconnectAttempts attempts',
+          );
+          await logout();
+          return;
+        }
+
+        final stored = await _storage.read(key: _userTokenKey);
+        if (stored == null) {
+          _stopReconnectLoop();
+          return;
+        }
+
+        final info = await twitchApi.validateToken(token: stored);
+        if (info == null) {
+          await logout();
+          return;
+        }
+
+        // Token valid again — restore session.
+        _token = stored;
+        _setGrantedScopes(info.scopes);
+        await user.init();
+        if (user.details != null) {
+          _isLoggedIn = true;
+          await _persistLastUserId(user.details!.id);
+          _error = null;
+          _stopReconnectLoop();
+        }
+      } on ApiException catch (_) {
+        // Continue trying
+      } catch (e) {
+        debugPrint('Reconnect loop error: $e');
+      }
+    });
+  }
+
+  void _stopReconnectLoop() {
+    _reconnectTimer?.cancel();
+    _reconnectTimer = null;
+    _reconnectAttempts = 0;
+  }
+}
diff --git a/lib/screens/settings/stores/auth_store.g.dart b/lib/screens/settings/stores/auth_store.g.dart
index 02720f22..d50e1ed4 100644
--- a/lib/screens/settings/stores/auth_store.g.dart
+++ b/lib/screens/settings/stores/auth_store.g.dart
@@ -9,13 +9,22 @@ part of 'auth_store.dart';
 // ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
 
 mixin _$AuthStore on AuthBase, Store {
+  Computed<bool>? _$hasModeratorScopesComputed;
+
+  @override
+  bool get hasModeratorScopes =>
+      (_$hasModeratorScopesComputed ??= Computed<bool>(
+        () => super.hasModeratorScopes,
+        name: 'AuthBase.hasModeratorScopes',
+      )).value;
   Computed<Map<String, String>>? _$headersTwitchComputed;
 
   @override
-  Map<String, String> get headersTwitch => (_$headersTwitchComputed ??=
-          Computed<Map<String, String>>(() => super.headersTwitch,
-              name: 'AuthBase.headersTwitch'))
-      .value;
+  Map<String, String> get headersTwitch =>
+      (_$headersTwitchComputed ??= Computed<Map<String, String>>(
+        () => super.headersTwitch,
+        name: 'AuthBase.headersTwitch',
+      )).value;
 
   late final _$_tokenAtom = Atom(name: 'AuthBase._token', context: context);
 
@@ -34,8 +43,30 @@ mixin _$AuthStore on AuthBase, Store {
     });
   }
 
-  late final _$_isLoggedInAtom =
-      Atom(name: 'AuthBase._isLoggedIn', context: context);
+  late final _$_gqlTokenAtom = Atom(
+    name: 'AuthBase._gqlToken',
+    context: context,
+  );
+
+  String? get gqlToken {
+    _$_gqlTokenAtom.reportRead();
+    return super._gqlToken;
+  }
+
+  @override
+  String? get _gqlToken => gqlToken;
+
+  @override
+  set _gqlToken(String? value) {
+    _$_gqlTokenAtom.reportWrite(value, super._gqlToken, () {
+      super._gqlToken = value;
+    });
+  }
+
+  late final _$_isLoggedInAtom = Atom(
+    name: 'AuthBase._isLoggedIn',
+    context: context,
+  );
 
   bool get isLoggedIn {
     _$_isLoggedInAtom.reportRead();
@@ -52,6 +83,26 @@ mixin _$AuthStore on AuthBase, Store {
     });
   }
 
+  late final _$_grantedScopesAtom = Atom(
+    name: 'AuthBase._grantedScopes',
+    context: context,
+  );
+
+  ObservableList<String> get grantedScopes {
+    _$_grantedScopesAtom.reportRead();
+    return super._grantedScopes;
+  }
+
+  @override
+  ObservableList<String> get _grantedScopes => grantedScopes;
+
+  @override
+  set _grantedScopes(ObservableList<String> value) {
+    _$_grantedScopesAtom.reportWrite(value, super._grantedScopes, () {
+      super._grantedScopes = value;
+    });
+  }
+
   late final _$_errorAtom = Atom(name: 'AuthBase._error', context: context);
 
   String? get error {
@@ -69,6 +120,18 @@ mixin _$AuthStore on AuthBase, Store {
     });
   }
 
+  late final _$invalidateGqlTokenAsyncAction = AsyncAction(
+    'AuthBase.invalidateGqlToken',
+    context: context,
+  );
+
+  @override
+  Future<void> invalidateGqlToken() {
+    return _$invalidateGqlTokenAsyncAction.run(
+      () => super.invalidateGqlToken(),
+    );
+  }
+
   late final _$initAsyncAction = AsyncAction('AuthBase.init', context: context);
 
   @override
@@ -76,16 +139,32 @@ mixin _$AuthStore on AuthBase, Store {
     return _$initAsyncAction.run(() => super.init());
   }
 
-  late final _$loginAsyncAction =
-      AsyncAction('AuthBase.login', context: context);
+  late final _$loginAsyncAction = AsyncAction(
+    'AuthBase.login',
+    context: context,
+  );
 
   @override
   Future<void> login({required String token}) {
     return _$loginAsyncAction.run(() => super.login(token: token));
   }
 
-  late final _$logoutAsyncAction =
-      AsyncAction('AuthBase.logout', context: context);
+  late final _$completeModeratorUpgradeAsyncAction = AsyncAction(
+    'AuthBase.completeModeratorUpgrade',
+    context: context,
+  );
+
+  @override
+  Future<bool> completeModeratorUpgrade({required String token}) {
+    return _$completeModeratorUpgradeAsyncAction.run(
+      () => super.completeModeratorUpgrade(token: token),
+    );
+  }
+
+  late final _$logoutAsyncAction = AsyncAction(
+    'AuthBase.logout',
+    context: context,
+  );
 
   @override
   Future<void> logout() {
@@ -95,6 +174,7 @@ mixin _$AuthStore on AuthBase, Store {
   @override
   String toString() {
     return '''
+hasModeratorScopes: ${hasModeratorScopes},
 headersTwitch: ${headersTwitch}
     ''';
   }
diff --git a/lib/screens/settings/stores/settings_store.dart b/lib/screens/settings/stores/settings_store.dart
index 2751a3f1..031b2c53 100644
--- a/lib/screens/settings/stores/settings_store.dart
+++ b/lib/screens/settings/stores/settings_store.dart
@@ -1,3 +1,5 @@
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_tabs_store.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:mobx/mobx.dart';
 
@@ -7,8 +9,11 @@ part 'settings_store.g.dart';
 class SettingsStore extends _SettingsStoreBase with _$SettingsStore {
   SettingsStore();
 
-  factory SettingsStore.fromJson(Map<String, dynamic> json) =>
-      _$SettingsStoreFromJson(json);
+  factory SettingsStore.fromJson(Map<String, dynamic> json) {
+    final store = _$SettingsStoreFromJson(json);
+    store._migrateNativePlayerDefault();
+    return store;
+  }
   Map<String, dynamic> toJson() => _$SettingsStoreToJson(this);
 }
 
@@ -16,6 +21,7 @@ abstract class _SettingsStoreBase with Store {
   // * General Settings
   // Theme defaults
   static const defaultThemeType = ThemeType.system;
+  static const defaultAccentColor = 0xff9146ff;
 
   // Stream card defaults
   static const defaultShowThumbnails = true;
@@ -29,6 +35,10 @@ abstract class _SettingsStoreBase with Store {
   @observable
   var themeType = defaultThemeType;
 
+  @JsonKey(defaultValue: defaultAccentColor)
+  @observable
+  var accentColor = defaultAccentColor;
+
   // Stream card options
   @JsonKey(defaultValue: defaultShowThumbnails)
   @observable
@@ -43,30 +53,85 @@ abstract class _SettingsStoreBase with Store {
   @observable
   var launchUrlExternal = defaultLaunchUrlExternal;
 
+  /// ISO 639-1 language codes for Top / category / tag stream lists.
+  /// Empty = show all languages (no filter). Default Deutsch like a DE Twitch account.
+  static const defaultStreamLanguages = <String>['de'];
+
+  @JsonKey(defaultValue: defaultStreamLanguages)
+  @observable
+  var streamLanguages = defaultStreamLanguages;
+
+  /// Persistent viewer sort for Top / category / tag directories.
+  static const defaultStreamViewerSort = StreamViewerSort.viewersDesc;
+
+  @JsonKey(
+    defaultValue: defaultStreamViewerSort,
+    unknownEnumValue: StreamViewerSort.viewersDesc,
+  )
+  @observable
+  var streamViewerSort = defaultStreamViewerSort;
+
   @action
   void resetGeneralSettings() {
     themeType = defaultThemeType;
+    accentColor = defaultAccentColor;
 
     largeStreamCard = defaultLargeStreamCard;
     showThumbnails = defaultShowThumbnails;
 
     launchUrlExternal = defaultLaunchUrlExternal;
+    streamLanguages = defaultStreamLanguages;
+    streamViewerSort = defaultStreamViewerSort;
   }
 
   // * Video Settings
   // Player defaults
   static const defaultShowVideo = true;
+  static const defaultDefaultToHighestQuality = false;
+  static const defaultUseTextureRendering = true;
+  static const defaultUseNativePlayer = true;
+  static const defaultBlockTwitchAds = true;
 
-  // Overlay defaults
   static const defaultShowOverlay = true;
   static const defaultToggleableOverlay = false;
-  static const defaultOverlayOpacity = 0.5;
+  static const defaultShowLatency = false;
 
   // Player options
   @JsonKey(defaultValue: defaultShowVideo)
   @observable
   var showVideo = defaultShowVideo;
 
+  @JsonKey(defaultValue: defaultDefaultToHighestQuality)
+  @observable
+  var defaultToHighestQuality = defaultDefaultToHighestQuality;
+
+  @JsonKey(defaultValue: defaultUseTextureRendering)
+  @observable
+  var useTextureRendering = defaultUseTextureRendering;
+
+  @JsonKey(defaultValue: defaultUseNativePlayer)
+  @observable
+  var useNativePlayer = defaultUseNativePlayer;
+
+  /// TwitchAdSolutions (vaft)-style ad blocking for the native player, and
+  /// userscript injection for the legacy WebView player.
+  @JsonKey(defaultValue: defaultBlockTwitchAds)
+  @observable
+  var blockTwitchAds = defaultBlockTwitchAds;
+
+  /// 5.2.0 made native the default. 5.1.0 already wrote
+  /// `useNativePlayer: false` into saved settings, so a Dart default
+  /// change alone would leave existing installs on WebView.
+  @JsonKey(defaultValue: false)
+  var nativePlayerV52Migrated = false;
+
+  @action
+  void _migrateNativePlayerDefault() {
+    if (nativePlayerV52Migrated) return;
+    useNativePlayer = true;
+    nativePlayerV52Migrated = true;
+  }
+
   // Overlay options
   @JsonKey(defaultValue: defaultShowOverlay)
   @observable
@@ -76,59 +141,73 @@ abstract class _SettingsStoreBase with Store {
   @observable
   var toggleableOverlay = defaultToggleableOverlay;
 
-  @JsonKey(defaultValue: defaultOverlayOpacity)
+  @JsonKey(defaultValue: defaultShowLatency)
   @observable
-  var overlayOpacity = defaultOverlayOpacity;
+  var showLatency = defaultShowLatency;
 
   @action
   void resetVideoSettings() {
     showVideo = defaultShowVideo;
+    defaultToHighestQuality = defaultDefaultToHighestQuality;
+    useTextureRendering = defaultUseTextureRendering;
+    useNativePlayer = defaultUseNativePlayer;
+    blockTwitchAds = defaultBlockTwitchAds;
 
     showOverlay = defaultShowOverlay;
     toggleableOverlay = defaultToggleableOverlay;
-    overlayOpacity = defaultOverlayOpacity;
+    showLatency = defaultShowLatency;
   }
 
   // * Chat Settings
-  // Message sizing defaults
+
+  // -- Messages --
+  // Sizing defaults
   static const defaultBadgeScale = 1.0;
   static const defaultEmoteScale = 1.0;
   static const defaultMessageScale = 1.0;
-  static const defaultMessageSpacing = 10.0;
+  static const defaultMessageSpacing = 8.0;
   static const defaultFontSize = 12.0;
 
-  // Message appearance defaults
-  static const defaultUseReadableColors = true;
+  // Appearance defaults
   static const defaultShowDeletedMessages = false;
   static const defaultShowChatMessageDividers = false;
   static const defaultTimestampType = TimestampType.disabled;
-
-  // Delay defaults
-  static const defaultChatDelay = 0.0;
+  static const defaultShowHistoricalTimestamps = false;
+  static const defaultFocusCurrentChannel = false;
 
   // Alert defaults
   static const defaultHighlightFirstTimeChatter = true;
   static const defaultShowUserNotices = true;
 
-  // Layout defaults
-  static const defaultShowBottomBar = true;
-  static const defaultEmoteMenuButtonOnLeft = false;
-  static const defaultChatNotificationsOnBottom = false;
+  // -- Emotes & Badges --
+  static const defaultShowTwitchEmotes = true;
+  static const defaultShowTwitchBadges = true;
+  static const defaultShow7TVEmotes = true;
+  static const defaultShowBTTVEmotes = true;
+  static const defaultShowBTTVBadges = true;
+  static const defaultShowFFZEmotes = true;
+  static const defaultShowFFZBadges = true;
 
-  // Landscape mode defaults
+  // -- Layout --
+  static const defaultEmoteMenuButtonOnLeft = false;
+  static const defaultPersistChatTabs = true;
+  static const defaultSecondaryTabs = <PersistedChatTab>[];
   static const defaultLandscapeChatLeftSide = false;
   static const defaultLandscapeForceVerticalChat = false;
   static const defaultLandscapeCutout = LandscapeCutoutType.none;
-  static const defaultChatWidth = 0.3;
+  static const defaultChatWidth = 0.2;
   static const defaultFullScreenChatOverlayOpacity = 0.5;
 
-  // Sleep defaults
-  static const defaultChatOnlyPreventSleep = false;
-
-  // Autocomplete defaults
+  // -- Behavior --
+  static const defaultKeepScreenAwake = true;
   static const defaultAutocomplete = true;
+  static const defaultShowRecentMessages = false;
+  static const defaultAutoSyncChatDelay = false;
+  static const defaultChatDelay = 0.0;
+  static const defaultMutedWords = <String>[];
+  static const defaultMatchWholeWord = true;
 
-  // Message sizing options
+  // Messages options
   @JsonKey(defaultValue: defaultBadgeScale)
   @observable
   var badgeScale = defaultBadgeScale;
@@ -149,11 +228,6 @@ abstract class _SettingsStoreBase with Store {
   @observable
   var fontSize = defaultFontSize;
 
-  // Message appearance options
-  @JsonKey(defaultValue: defaultUseReadableColors)
-  @observable
-  var useReadableColors = defaultUseReadableColors;
-
   @JsonKey(defaultValue: defaultShowDeletedMessages)
   @observable
   var showDeletedMessages = defaultShowDeletedMessages;
@@ -163,39 +237,70 @@ abstract class _SettingsStoreBase with Store {
   var showChatMessageDividers = defaultShowChatMessageDividers;
 
   @JsonKey(
-      defaultValue: defaultTimestampType,
-      unknownEnumValue: TimestampType.disabled)
+    defaultValue: defaultTimestampType,
+    unknownEnumValue: TimestampType.disabled,
+  )
   @observable
   var timestampType = defaultTimestampType;
 
-  // Delay options
-  @JsonKey(defaultValue: defaultChatDelay)
+  @JsonKey(defaultValue: defaultShowHistoricalTimestamps)
   @observable
-  var chatDelay = defaultChatDelay;
+  var showHistoricalTimestamps = defaultShowHistoricalTimestamps;
+
+  @JsonKey(defaultValue: defaultFocusCurrentChannel)
+  @observable
+  var focusCurrentChannel = defaultFocusCurrentChannel;
 
-  // Alert options
   @JsonKey(defaultValue: defaultHighlightFirstTimeChatter)
   @observable
   var highlightFirstTimeChatter = defaultHighlightFirstTimeChatter;
 
   @JsonKey(defaultValue: defaultShowUserNotices)
   @observable
-  var showUserNotices = defaultHighlightFirstTimeChatter;
+  var showUserNotices = defaultShowUserNotices;
+
+  // Emotes & Badges options
+  @JsonKey(defaultValue: defaultShowTwitchEmotes)
+  @observable
+  var showTwitchEmotes = defaultShowTwitchEmotes;
+
+  @JsonKey(defaultValue: defaultShowTwitchBadges)
+  @observable
+  var showTwitchBadges = defaultShowTwitchBadges;
+
+  @JsonKey(defaultValue: defaultShow7TVEmotes)
+  @observable
+  var show7TVEmotes = defaultShow7TVEmotes;
+
+  @JsonKey(defaultValue: defaultShowBTTVEmotes)
+  @observable
+  var showBTTVEmotes = defaultShowBTTVEmotes;
+
+  @JsonKey(defaultValue: defaultShowBTTVBadges)
+  @observable
+  var showBTTVBadges = defaultShowBTTVBadges;
+
+  @JsonKey(defaultValue: defaultShowFFZEmotes)
+  @observable
+  var showFFZEmotes = defaultShowFFZEmotes;
+
+  @JsonKey(defaultValue: defaultShowFFZBadges)
+  @observable
+  var showFFZBadges = defaultShowFFZBadges;
 
   // Layout options
-  @JsonKey(defaultValue: defaultShowBottomBar)
-  @observable
-  var showBottomBar = defaultShowBottomBar;
-
   @JsonKey(defaultValue: defaultEmoteMenuButtonOnLeft)
   @observable
   var emoteMenuButtonOnLeft = defaultEmoteMenuButtonOnLeft;
 
-  @JsonKey(defaultValue: defaultChatNotificationsOnBottom)
+  @JsonKey(defaultValue: defaultPersistChatTabs)
   @observable
-  var chatNotificationsOnBottom = defaultChatNotificationsOnBottom;
+  var persistChatTabs = defaultPersistChatTabs;
+
+  @JsonKey(defaultValue: defaultSecondaryTabs)
+  @observable
+  var secondaryTabs = defaultSecondaryTabs;
 
-  // Landscape mode options
   @JsonKey(defaultValue: defaultLandscapeChatLeftSide)
   @observable
   var landscapeChatLeftSide = defaultLandscapeChatLeftSide;
@@ -216,46 +321,87 @@ abstract class _SettingsStoreBase with Store {
   @observable
   var fullScreenChatOverlayOpacity = defaultFullScreenChatOverlayOpacity;
 
-  // Sleep options
-  @JsonKey(defaultValue: defaultChatOnlyPreventSleep)
+  // Behavior options
+  @JsonKey(defaultValue: defaultKeepScreenAwake)
   @observable
-  var chatOnlyPreventSleep = defaultChatOnlyPreventSleep;
+  var keepScreenAwake = defaultKeepScreenAwake;
 
-  // Autocomplete options
   @JsonKey(defaultValue: defaultAutocomplete)
   @observable
   var autocomplete = defaultAutocomplete;
 
+  @JsonKey(defaultValue: defaultShowRecentMessages)
+  @observable
+  var showRecentMessages = defaultShowRecentMessages;
+
+  @JsonKey(defaultValue: defaultAutoSyncChatDelay)
+  @observable
+  var autoSyncChatDelay = defaultAutoSyncChatDelay;
+
+  @JsonKey(defaultValue: defaultChatDelay)
+  @observable
+  var chatDelay = defaultChatDelay;
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @observable
+  var syncedChatDelay = defaultChatDelay;
+
+  @computed
+  double get effectiveChatDelay =>
+      autoSyncChatDelay ? syncedChatDelay : chatDelay;
+
+  @JsonKey(defaultValue: defaultMutedWords)
+  @observable
+  List<String> mutedWords = defaultMutedWords;
+
+  @JsonKey(defaultValue: defaultMatchWholeWord)
+  @observable
+  bool matchWholeWord = defaultMatchWholeWord;
+
   @action
   void resetChatSettings() {
+    // Messages
     badgeScale = defaultBadgeScale;
     emoteScale = defaultEmoteScale;
     messageScale = defaultMessageScale;
     messageSpacing = defaultMessageSpacing;
     fontSize = defaultFontSize;
-
-    useReadableColors = defaultUseReadableColors;
     showDeletedMessages = defaultShowDeletedMessages;
     showChatMessageDividers = defaultShowChatMessageDividers;
     timestampType = defaultTimestampType;
-
-    chatDelay = defaultChatDelay;
-
+    showHistoricalTimestamps = defaultShowHistoricalTimestamps;
+    focusCurrentChannel = defaultFocusCurrentChannel;
     highlightFirstTimeChatter = defaultHighlightFirstTimeChatter;
     showUserNotices = defaultShowUserNotices;
 
-    showBottomBar = defaultShowBottomBar;
-    emoteMenuButtonOnLeft = defaultEmoteMenuButtonOnLeft;
-    chatNotificationsOnBottom = defaultChatNotificationsOnBottom;
+    // Emotes & Badges
+    showTwitchEmotes = defaultShowTwitchEmotes;
+    showTwitchBadges = defaultShowTwitchBadges;
+    show7TVEmotes = defaultShow7TVEmotes;
+    showBTTVEmotes = defaultShowBTTVEmotes;
+    showBTTVBadges = defaultShowBTTVBadges;
+    showFFZEmotes = defaultShowFFZEmotes;
+    showFFZBadges = defaultShowFFZBadges;
 
+    // Layout
+    emoteMenuButtonOnLeft = defaultEmoteMenuButtonOnLeft;
+    persistChatTabs = defaultPersistChatTabs;
+    secondaryTabs = defaultSecondaryTabs;
     landscapeChatLeftSide = defaultLandscapeChatLeftSide;
     landscapeForceVerticalChat = defaultLandscapeForceVerticalChat;
     landscapeCutout = defaultLandscapeCutout;
     chatWidth = defaultChatWidth;
     fullScreenChatOverlayOpacity = defaultFullScreenChatOverlayOpacity;
 
-    chatOnlyPreventSleep = defaultChatOnlyPreventSleep;
+    // Behavior
+    keepScreenAwake = defaultKeepScreenAwake;
     autocomplete = defaultAutocomplete;
+    showRecentMessages = defaultShowRecentMessages;
+    autoSyncChatDelay = defaultAutoSyncChatDelay;
+    chatDelay = defaultChatDelay;
+    syncedChatDelay = defaultChatDelay;
+    mutedWords = defaultMutedWords;
+    matchWholeWord = defaultMatchWholeWord;
   }
 
   // * Other settings
@@ -273,6 +419,7 @@ abstract class _SettingsStoreBase with Store {
   // * Global configs
   static const defaultFullScreen = false;
   static const defaultFullScreenChatOverlay = false;
+  static const defaultPinnedChannelIds = <String>[];
 
   @JsonKey(defaultValue: defaultFullScreen)
   @observable
@@ -282,10 +429,15 @@ abstract class _SettingsStoreBase with Store {
   @observable
   var fullScreenChatOverlay = defaultFullScreenChatOverlay;
 
+  @JsonKey(defaultValue: defaultPinnedChannelIds)
+  @observable
+  var pinnedChannelIds = defaultPinnedChannelIds;
+
   @action
   void resetGlobalConfigs() {
     fullScreen = defaultFullScreen;
     fullScreenChatOverlay = defaultFullScreenChatOverlay;
+    pinnedChannelIds = defaultPinnedChannelIds;
   }
 
   @action
@@ -298,28 +450,14 @@ abstract class _SettingsStoreBase with Store {
   }
 }
 
-const themeNames = ['System', 'Light', 'Dark', 'Black'];
+const themeNames = ['System', 'Light', 'Dark'];
 
-enum ThemeType {
-  system,
-  light,
-  dark,
-  black,
-}
+enum ThemeType { system, light, dark }
 
 const timestampNames = ['Disabled', '12-hour', '24-hour'];
 
-enum TimestampType {
-  disabled,
-  twelve,
-  twentyFour,
-}
+enum TimestampType { disabled, twelve, twentyFour }
 
 const landscapeCutoutNames = ['None', 'Left', 'Right', 'Both'];
 
-enum LandscapeCutoutType {
-  none,
-  left,
-  right,
-  both,
-}
+enum LandscapeCutoutType { none, left, right, both }
diff --git a/lib/screens/settings/stores/settings_store.g.dart b/lib/screens/settings/stores/settings_store.g.dart
index ffc5b425..797941cf 100644
--- a/lib/screens/settings/stores/settings_store.g.dart
+++ b/lib/screens/settings/stores/settings_store.g.dart
@@ -6,98 +6,176 @@ part of 'settings_store.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-SettingsStore _$SettingsStoreFromJson(Map<String, dynamic> json) =>
-    SettingsStore()
-      ..themeType = $enumDecodeNullable(_$ThemeTypeEnumMap, json['themeType'],
-              unknownValue: ThemeType.system) ??
-          ThemeType.system
-      ..showThumbnails = json['showThumbnails'] as bool? ?? true
-      ..largeStreamCard = json['largeStreamCard'] as bool? ?? false
-      ..launchUrlExternal = json['launchUrlExternal'] as bool? ?? false
-      ..showVideo = json['showVideo'] as bool? ?? true
-      ..showOverlay = json['showOverlay'] as bool? ?? true
-      ..toggleableOverlay = json['toggleableOverlay'] as bool? ?? false
-      ..overlayOpacity = (json['overlayOpacity'] as num?)?.toDouble() ?? 0.5
-      ..badgeScale = (json['badgeScale'] as num?)?.toDouble() ?? 1.0
-      ..emoteScale = (json['emoteScale'] as num?)?.toDouble() ?? 1.0
-      ..messageScale = (json['messageScale'] as num?)?.toDouble() ?? 1.0
-      ..messageSpacing = (json['messageSpacing'] as num?)?.toDouble() ?? 10.0
-      ..fontSize = (json['fontSize'] as num?)?.toDouble() ?? 12.0
-      ..useReadableColors = json['useReadableColors'] as bool? ?? true
-      ..showDeletedMessages = json['showDeletedMessages'] as bool? ?? false
-      ..showChatMessageDividers =
-          json['showChatMessageDividers'] as bool? ?? false
-      ..timestampType = $enumDecodeNullable(
-              _$TimestampTypeEnumMap, json['timestampType'],
-              unknownValue: TimestampType.disabled) ??
-          TimestampType.disabled
-      ..chatDelay = (json['chatDelay'] as num?)?.toDouble() ?? 0.0
-      ..highlightFirstTimeChatter =
-          json['highlightFirstTimeChatter'] as bool? ?? true
-      ..showUserNotices = json['showUserNotices'] as bool? ?? true
-      ..showBottomBar = json['showBottomBar'] as bool? ?? true
-      ..emoteMenuButtonOnLeft = json['emoteMenuButtonOnLeft'] as bool? ?? false
-      ..chatNotificationsOnBottom =
-          json['chatNotificationsOnBottom'] as bool? ?? false
-      ..landscapeChatLeftSide = json['landscapeChatLeftSide'] as bool? ?? false
-      ..landscapeForceVerticalChat =
-          json['landscapeForceVerticalChat'] as bool? ?? false
-      ..landscapeCutout = $enumDecodeNullable(
-              _$LandscapeCutoutTypeEnumMap, json['landscapeCutout']) ??
-          LandscapeCutoutType.none
-      ..chatWidth = (json['chatWidth'] as num?)?.toDouble() ?? 0.3
-      ..fullScreenChatOverlayOpacity =
-          (json['fullScreenChatOverlayOpacity'] as num?)?.toDouble() ?? 0.5
-      ..chatOnlyPreventSleep = json['chatOnlyPreventSleep'] as bool? ?? false
-      ..autocomplete = json['autocomplete'] as bool? ?? true
-      ..shareCrashLogsAndAnalytics =
-          json['shareCrashLogsAndAnalytics'] as bool? ?? true
-      ..fullScreen = json['fullScreen'] as bool? ?? false
-      ..fullScreenChatOverlay = json['fullScreenChatOverlay'] as bool? ?? false;
+SettingsStore _$SettingsStoreFromJson(
+  Map<String, dynamic> json,
+) => SettingsStore()
+  ..themeType =
+      $enumDecodeNullable(
+        _$ThemeTypeEnumMap,
+        json['themeType'],
+        unknownValue: ThemeType.system,
+      ) ??
+      ThemeType.system
+  ..accentColor = (json['accentColor'] as num?)?.toInt() ?? 4287710975
+  ..showThumbnails = json['showThumbnails'] as bool? ?? true
+  ..largeStreamCard = json['largeStreamCard'] as bool? ?? false
+  ..launchUrlExternal = json['launchUrlExternal'] as bool? ?? false
+  ..streamLanguages =
+      (json['streamLanguages'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toList() ??
+      ['de']
+  ..streamViewerSort =
+      $enumDecodeNullable(
+        _$StreamViewerSortEnumMap,
+        json['streamViewerSort'],
+        unknownValue: StreamViewerSort.viewersDesc,
+      ) ??
+      StreamViewerSort.viewersDesc
+  ..showVideo = json['showVideo'] as bool? ?? true
+  ..defaultToHighestQuality = json['defaultToHighestQuality'] as bool? ?? false
+  ..useTextureRendering = json['useTextureRendering'] as bool? ?? true
+  ..useNativePlayer = json['useNativePlayer'] as bool? ?? true
+  ..blockTwitchAds = json['blockTwitchAds'] as bool? ?? true
+  ..nativePlayerV52Migrated = json['nativePlayerV52Migrated'] as bool? ?? false
+  ..showOverlay = json['showOverlay'] as bool? ?? true
+  ..toggleableOverlay = json['toggleableOverlay'] as bool? ?? false
+  ..showLatency = json['showLatency'] as bool? ?? false
+  ..badgeScale = (json['badgeScale'] as num?)?.toDouble() ?? 1.0
+  ..emoteScale = (json['emoteScale'] as num?)?.toDouble() ?? 1.0
+  ..messageScale = (json['messageScale'] as num?)?.toDouble() ?? 1.0
+  ..messageSpacing = (json['messageSpacing'] as num?)?.toDouble() ?? 8.0
+  ..fontSize = (json['fontSize'] as num?)?.toDouble() ?? 12.0
+  ..showDeletedMessages = json['showDeletedMessages'] as bool? ?? false
+  ..showChatMessageDividers = json['showChatMessageDividers'] as bool? ?? false
+  ..timestampType =
+      $enumDecodeNullable(
+        _$TimestampTypeEnumMap,
+        json['timestampType'],
+        unknownValue: TimestampType.disabled,
+      ) ??
+      TimestampType.disabled
+  ..showHistoricalTimestamps =
+      json['showHistoricalTimestamps'] as bool? ?? false
+  ..focusCurrentChannel = json['focusCurrentChannel'] as bool? ?? false
+  ..highlightFirstTimeChatter =
+      json['highlightFirstTimeChatter'] as bool? ?? true
+  ..showUserNotices = json['showUserNotices'] as bool? ?? true
+  ..showTwitchEmotes = json['showTwitchEmotes'] as bool? ?? true
+  ..showTwitchBadges = json['showTwitchBadges'] as bool? ?? true
+  ..show7TVEmotes = json['show7TVEmotes'] as bool? ?? true
+  ..showBTTVEmotes = json['showBTTVEmotes'] as bool? ?? true
+  ..showBTTVBadges = json['showBTTVBadges'] as bool? ?? true
+  ..showFFZEmotes = json['showFFZEmotes'] as bool? ?? true
+  ..showFFZBadges = json['showFFZBadges'] as bool? ?? true
+  ..emoteMenuButtonOnLeft = json['emoteMenuButtonOnLeft'] as bool? ?? false
+  ..persistChatTabs = json['persistChatTabs'] as bool? ?? true
+  ..secondaryTabs =
+      (json['secondaryTabs'] as List<dynamic>?)
+          ?.map((e) => PersistedChatTab.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      []
+  ..landscapeChatLeftSide = json['landscapeChatLeftSide'] as bool? ?? false
+  ..landscapeForceVerticalChat =
+      json['landscapeForceVerticalChat'] as bool? ?? false
+  ..landscapeCutout =
+      $enumDecodeNullable(
+        _$LandscapeCutoutTypeEnumMap,
+        json['landscapeCutout'],
+      ) ??
+      LandscapeCutoutType.none
+  ..chatWidth = (json['chatWidth'] as num?)?.toDouble() ?? 0.2
+  ..fullScreenChatOverlayOpacity =
+      (json['fullScreenChatOverlayOpacity'] as num?)?.toDouble() ?? 0.5
+  ..keepScreenAwake = json['keepScreenAwake'] as bool? ?? true
+  ..autocomplete = json['autocomplete'] as bool? ?? true
+  ..showRecentMessages = json['showRecentMessages'] as bool? ?? false
+  ..autoSyncChatDelay = json['autoSyncChatDelay'] as bool? ?? false
+  ..chatDelay = (json['chatDelay'] as num?)?.toDouble() ?? 0.0
+  ..mutedWords =
+      (json['mutedWords'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toList() ??
+      []
+  ..matchWholeWord = json['matchWholeWord'] as bool? ?? true
+  ..shareCrashLogsAndAnalytics =
+      json['shareCrashLogsAndAnalytics'] as bool? ?? true
+  ..fullScreen = json['fullScreen'] as bool? ?? false
+  ..fullScreenChatOverlay = json['fullScreenChatOverlay'] as bool? ?? false
+  ..pinnedChannelIds =
+      (json['pinnedChannelIds'] as List<dynamic>?)
+          ?.map((e) => e as String)
+          .toList() ??
+      [];
 
-Map<String, dynamic> _$SettingsStoreToJson(SettingsStore instance) =>
-    <String, dynamic>{
-      'themeType': _$ThemeTypeEnumMap[instance.themeType]!,
-      'showThumbnails': instance.showThumbnails,
-      'largeStreamCard': instance.largeStreamCard,
-      'launchUrlExternal': instance.launchUrlExternal,
-      'showVideo': instance.showVideo,
-      'showOverlay': instance.showOverlay,
-      'toggleableOverlay': instance.toggleableOverlay,
-      'overlayOpacity': instance.overlayOpacity,
-      'badgeScale': instance.badgeScale,
-      'emoteScale': instance.emoteScale,
-      'messageScale': instance.messageScale,
-      'messageSpacing': instance.messageSpacing,
-      'fontSize': instance.fontSize,
-      'useReadableColors': instance.useReadableColors,
-      'showDeletedMessages': instance.showDeletedMessages,
-      'showChatMessageDividers': instance.showChatMessageDividers,
-      'timestampType': _$TimestampTypeEnumMap[instance.timestampType]!,
-      'chatDelay': instance.chatDelay,
-      'highlightFirstTimeChatter': instance.highlightFirstTimeChatter,
-      'showUserNotices': instance.showUserNotices,
-      'showBottomBar': instance.showBottomBar,
-      'emoteMenuButtonOnLeft': instance.emoteMenuButtonOnLeft,
-      'chatNotificationsOnBottom': instance.chatNotificationsOnBottom,
-      'landscapeChatLeftSide': instance.landscapeChatLeftSide,
-      'landscapeForceVerticalChat': instance.landscapeForceVerticalChat,
-      'landscapeCutout':
-          _$LandscapeCutoutTypeEnumMap[instance.landscapeCutout]!,
-      'chatWidth': instance.chatWidth,
-      'fullScreenChatOverlayOpacity': instance.fullScreenChatOverlayOpacity,
-      'chatOnlyPreventSleep': instance.chatOnlyPreventSleep,
-      'autocomplete': instance.autocomplete,
-      'shareCrashLogsAndAnalytics': instance.shareCrashLogsAndAnalytics,
-      'fullScreen': instance.fullScreen,
-      'fullScreenChatOverlay': instance.fullScreenChatOverlay,
-    };
+Map<String, dynamic> _$SettingsStoreToJson(
+  SettingsStore instance,
+) => <String, dynamic>{
+  'themeType': _$ThemeTypeEnumMap[instance.themeType]!,
+  'accentColor': instance.accentColor,
+  'showThumbnails': instance.showThumbnails,
+  'largeStreamCard': instance.largeStreamCard,
+  'launchUrlExternal': instance.launchUrlExternal,
+  'streamLanguages': instance.streamLanguages,
+  'streamViewerSort': _$StreamViewerSortEnumMap[instance.streamViewerSort]!,
+  'showVideo': instance.showVideo,
+  'defaultToHighestQuality': instance.defaultToHighestQuality,
+  'useTextureRendering': instance.useTextureRendering,
+  'useNativePlayer': instance.useNativePlayer,
+  'blockTwitchAds': instance.blockTwitchAds,
+  'nativePlayerV52Migrated': instance.nativePlayerV52Migrated,
+  'showOverlay': instance.showOverlay,
+  'toggleableOverlay': instance.toggleableOverlay,
+  'showLatency': instance.showLatency,
+  'badgeScale': instance.badgeScale,
+  'emoteScale': instance.emoteScale,
+  'messageScale': instance.messageScale,
+  'messageSpacing': instance.messageSpacing,
+  'fontSize': instance.fontSize,
+  'showDeletedMessages': instance.showDeletedMessages,
+  'showChatMessageDividers': instance.showChatMessageDividers,
+  'timestampType': _$TimestampTypeEnumMap[instance.timestampType]!,
+  'showHistoricalTimestamps': instance.showHistoricalTimestamps,
+  'focusCurrentChannel': instance.focusCurrentChannel,
+  'highlightFirstTimeChatter': instance.highlightFirstTimeChatter,
+  'showUserNotices': instance.showUserNotices,
+  'showTwitchEmotes': instance.showTwitchEmotes,
+  'showTwitchBadges': instance.showTwitchBadges,
+  'show7TVEmotes': instance.show7TVEmotes,
+  'showBTTVEmotes': instance.showBTTVEmotes,
+  'showBTTVBadges': instance.showBTTVBadges,
+  'showFFZEmotes': instance.showFFZEmotes,
+  'showFFZBadges': instance.showFFZBadges,
+  'emoteMenuButtonOnLeft': instance.emoteMenuButtonOnLeft,
+  'persistChatTabs': instance.persistChatTabs,
+  'secondaryTabs': instance.secondaryTabs,
+  'landscapeChatLeftSide': instance.landscapeChatLeftSide,
+  'landscapeForceVerticalChat': instance.landscapeForceVerticalChat,
+  'landscapeCutout': _$LandscapeCutoutTypeEnumMap[instance.landscapeCutout]!,
+  'chatWidth': instance.chatWidth,
+  'fullScreenChatOverlayOpacity': instance.fullScreenChatOverlayOpacity,
+  'keepScreenAwake': instance.keepScreenAwake,
+  'autocomplete': instance.autocomplete,
+  'showRecentMessages': instance.showRecentMessages,
+  'autoSyncChatDelay': instance.autoSyncChatDelay,
+  'chatDelay': instance.chatDelay,
+  'mutedWords': instance.mutedWords,
+  'matchWholeWord': instance.matchWholeWord,
+  'shareCrashLogsAndAnalytics': instance.shareCrashLogsAndAnalytics,
+  'fullScreen': instance.fullScreen,
+  'fullScreenChatOverlay': instance.fullScreenChatOverlay,
+  'pinnedChannelIds': instance.pinnedChannelIds,
+};
 
 const _$ThemeTypeEnumMap = {
   ThemeType.system: 'system',
   ThemeType.light: 'light',
   ThemeType.dark: 'dark',
-  ThemeType.black: 'black',
+};
+
+const _$StreamViewerSortEnumMap = {
+  StreamViewerSort.viewersDesc: 'viewersDesc',
+  StreamViewerSort.viewersAsc: 'viewersAsc',
 };
 
 const _$TimestampTypeEnumMap = {
@@ -120,8 +198,19 @@ const _$LandscapeCutoutTypeEnumMap = {
 // ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
 
 mixin _$SettingsStore on _SettingsStoreBase, Store {
-  late final _$themeTypeAtom =
-      Atom(name: '_SettingsStoreBase.themeType', context: context);
+  Computed<double>? _$effectiveChatDelayComputed;
+
+  @override
+  double get effectiveChatDelay =>
+      (_$effectiveChatDelayComputed ??= Computed<double>(
+        () => super.effectiveChatDelay,
+        name: '_SettingsStoreBase.effectiveChatDelay',
+      )).value;
+
+  late final _$themeTypeAtom = Atom(
+    name: '_SettingsStoreBase.themeType',
+    context: context,
+  );
 
   @override
   ThemeType get themeType {
@@ -136,8 +225,28 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$showThumbnailsAtom =
-      Atom(name: '_SettingsStoreBase.showThumbnails', context: context);
+  late final _$accentColorAtom = Atom(
+    name: '_SettingsStoreBase.accentColor',
+    context: context,
+  );
+
+  @override
+  int get accentColor {
+    _$accentColorAtom.reportRead();
+    return super.accentColor;
+  }
+
+  @override
+  set accentColor(int value) {
+    _$accentColorAtom.reportWrite(value, super.accentColor, () {
+      super.accentColor = value;
+    });
+  }
+
+  late final _$showThumbnailsAtom = Atom(
+    name: '_SettingsStoreBase.showThumbnails',
+    context: context,
+  );
 
   @override
   bool get showThumbnails {
@@ -152,8 +261,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$largeStreamCardAtom =
-      Atom(name: '_SettingsStoreBase.largeStreamCard', context: context);
+  late final _$largeStreamCardAtom = Atom(
+    name: '_SettingsStoreBase.largeStreamCard',
+    context: context,
+  );
 
   @override
   bool get largeStreamCard {
@@ -168,8 +279,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$launchUrlExternalAtom =
-      Atom(name: '_SettingsStoreBase.launchUrlExternal', context: context);
+  late final _$launchUrlExternalAtom = Atom(
+    name: '_SettingsStoreBase.launchUrlExternal',
+    context: context,
+  );
 
   @override
   bool get launchUrlExternal {
@@ -184,8 +297,46 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$showVideoAtom =
-      Atom(name: '_SettingsStoreBase.showVideo', context: context);
+  late final _$streamLanguagesAtom = Atom(
+    name: '_SettingsStoreBase.streamLanguages',
+    context: context,
+  );
+
+  @override
+  List<String> get streamLanguages {
+    _$streamLanguagesAtom.reportRead();
+    return super.streamLanguages;
+  }
+
+  @override
+  set streamLanguages(List<String> value) {
+    _$streamLanguagesAtom.reportWrite(value, super.streamLanguages, () {
+      super.streamLanguages = value;
+    });
+  }
+
+  late final _$streamViewerSortAtom = Atom(
+    name: '_SettingsStoreBase.streamViewerSort',
+    context: context,
+  );
+
+  @override
+  StreamViewerSort get streamViewerSort {
+    _$streamViewerSortAtom.reportRead();
+    return super.streamViewerSort;
+  }
+
+  @override
+  set streamViewerSort(StreamViewerSort value) {
+    _$streamViewerSortAtom.reportWrite(value, super.streamViewerSort, () {
+      super.streamViewerSort = value;
+    });
+  }
+
+  late final _$showVideoAtom = Atom(
+    name: '_SettingsStoreBase.showVideo',
+    context: context,
+  );
 
   @override
   bool get showVideo {
@@ -200,8 +351,86 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$showOverlayAtom =
-      Atom(name: '_SettingsStoreBase.showOverlay', context: context);
+  late final _$defaultToHighestQualityAtom = Atom(
+    name: '_SettingsStoreBase.defaultToHighestQuality',
+    context: context,
+  );
+
+  @override
+  bool get defaultToHighestQuality {
+    _$defaultToHighestQualityAtom.reportRead();
+    return super.defaultToHighestQuality;
+  }
+
+  @override
+  set defaultToHighestQuality(bool value) {
+    _$defaultToHighestQualityAtom.reportWrite(
+      value,
+      super.defaultToHighestQuality,
+      () {
+        super.defaultToHighestQuality = value;
+      },
+    );
+  }
+
+  late final _$useTextureRenderingAtom = Atom(
+    name: '_SettingsStoreBase.useTextureRendering',
+    context: context,
+  );
+
+  @override
+  bool get useTextureRendering {
+    _$useTextureRenderingAtom.reportRead();
+    return super.useTextureRendering;
+  }
+
+  @override
+  set useTextureRendering(bool value) {
+    _$useTextureRenderingAtom.reportWrite(value, super.useTextureRendering, () {
+      super.useTextureRendering = value;
+    });
+  }
+
+  late final _$useNativePlayerAtom = Atom(
+    name: '_SettingsStoreBase.useNativePlayer',
+    context: context,
+  );
+
+  @override
+  bool get useNativePlayer {
+    _$useNativePlayerAtom.reportRead();
+    return super.useNativePlayer;
+  }
+
+  @override
+  set useNativePlayer(bool value) {
+    _$useNativePlayerAtom.reportWrite(value, super.useNativePlayer, () {
+      super.useNativePlayer = value;
+    });
+  }
+
+  late final _$blockTwitchAdsAtom = Atom(
+    name: '_SettingsStoreBase.blockTwitchAds',
+    context: context,
+  );
+
+  @override
+  bool get blockTwitchAds {
+    _$blockTwitchAdsAtom.reportRead();
+    return super.blockTwitchAds;
+  }
+
+  @override
+  set blockTwitchAds(bool value) {
+    _$blockTwitchAdsAtom.reportWrite(value, super.blockTwitchAds, () {
+      super.blockTwitchAds = value;
+    });
+  }
+
+  late final _$showOverlayAtom = Atom(
+    name: '_SettingsStoreBase.showOverlay',
+    context: context,
+  );
 
   @override
   bool get showOverlay {
@@ -216,8 +445,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$toggleableOverlayAtom =
-      Atom(name: '_SettingsStoreBase.toggleableOverlay', context: context);
+  late final _$toggleableOverlayAtom = Atom(
+    name: '_SettingsStoreBase.toggleableOverlay',
+    context: context,
+  );
 
   @override
   bool get toggleableOverlay {
@@ -232,24 +463,28 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$overlayOpacityAtom =
-      Atom(name: '_SettingsStoreBase.overlayOpacity', context: context);
+  late final _$showLatencyAtom = Atom(
+    name: '_SettingsStoreBase.showLatency',
+    context: context,
+  );
 
   @override
-  double get overlayOpacity {
-    _$overlayOpacityAtom.reportRead();
-    return super.overlayOpacity;
+  bool get showLatency {
+    _$showLatencyAtom.reportRead();
+    return super.showLatency;
   }
 
   @override
-  set overlayOpacity(double value) {
-    _$overlayOpacityAtom.reportWrite(value, super.overlayOpacity, () {
-      super.overlayOpacity = value;
+  set showLatency(bool value) {
+    _$showLatencyAtom.reportWrite(value, super.showLatency, () {
+      super.showLatency = value;
     });
   }
 
-  late final _$badgeScaleAtom =
-      Atom(name: '_SettingsStoreBase.badgeScale', context: context);
+  late final _$badgeScaleAtom = Atom(
+    name: '_SettingsStoreBase.badgeScale',
+    context: context,
+  );
 
   @override
   double get badgeScale {
@@ -264,8 +499,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$emoteScaleAtom =
-      Atom(name: '_SettingsStoreBase.emoteScale', context: context);
+  late final _$emoteScaleAtom = Atom(
+    name: '_SettingsStoreBase.emoteScale',
+    context: context,
+  );
 
   @override
   double get emoteScale {
@@ -280,8 +517,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$messageScaleAtom =
-      Atom(name: '_SettingsStoreBase.messageScale', context: context);
+  late final _$messageScaleAtom = Atom(
+    name: '_SettingsStoreBase.messageScale',
+    context: context,
+  );
 
   @override
   double get messageScale {
@@ -296,8 +535,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$messageSpacingAtom =
-      Atom(name: '_SettingsStoreBase.messageSpacing', context: context);
+  late final _$messageSpacingAtom = Atom(
+    name: '_SettingsStoreBase.messageSpacing',
+    context: context,
+  );
 
   @override
   double get messageSpacing {
@@ -312,8 +553,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$fontSizeAtom =
-      Atom(name: '_SettingsStoreBase.fontSize', context: context);
+  late final _$fontSizeAtom = Atom(
+    name: '_SettingsStoreBase.fontSize',
+    context: context,
+  );
 
   @override
   double get fontSize {
@@ -328,24 +571,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$useReadableColorsAtom =
-      Atom(name: '_SettingsStoreBase.useReadableColors', context: context);
-
-  @override
-  bool get useReadableColors {
-    _$useReadableColorsAtom.reportRead();
-    return super.useReadableColors;
-  }
-
-  @override
-  set useReadableColors(bool value) {
-    _$useReadableColorsAtom.reportWrite(value, super.useReadableColors, () {
-      super.useReadableColors = value;
-    });
-  }
-
-  late final _$showDeletedMessagesAtom =
-      Atom(name: '_SettingsStoreBase.showDeletedMessages', context: context);
+  late final _$showDeletedMessagesAtom = Atom(
+    name: '_SettingsStoreBase.showDeletedMessages',
+    context: context,
+  );
 
   @override
   bool get showDeletedMessages {
@@ -361,7 +590,9 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
   }
 
   late final _$showChatMessageDividersAtom = Atom(
-      name: '_SettingsStoreBase.showChatMessageDividers', context: context);
+    name: '_SettingsStoreBase.showChatMessageDividers',
+    context: context,
+  );
 
   @override
   bool get showChatMessageDividers {
@@ -371,14 +602,19 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
 
   @override
   set showChatMessageDividers(bool value) {
-    _$showChatMessageDividersAtom
-        .reportWrite(value, super.showChatMessageDividers, () {
-      super.showChatMessageDividers = value;
-    });
+    _$showChatMessageDividersAtom.reportWrite(
+      value,
+      super.showChatMessageDividers,
+      () {
+        super.showChatMessageDividers = value;
+      },
+    );
   }
 
-  late final _$timestampTypeAtom =
-      Atom(name: '_SettingsStoreBase.timestampType', context: context);
+  late final _$timestampTypeAtom = Atom(
+    name: '_SettingsStoreBase.timestampType',
+    context: context,
+  );
 
   @override
   TimestampType get timestampType {
@@ -393,24 +629,50 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$chatDelayAtom =
-      Atom(name: '_SettingsStoreBase.chatDelay', context: context);
+  late final _$showHistoricalTimestampsAtom = Atom(
+    name: '_SettingsStoreBase.showHistoricalTimestamps',
+    context: context,
+  );
 
   @override
-  double get chatDelay {
-    _$chatDelayAtom.reportRead();
-    return super.chatDelay;
+  bool get showHistoricalTimestamps {
+    _$showHistoricalTimestampsAtom.reportRead();
+    return super.showHistoricalTimestamps;
   }
 
   @override
-  set chatDelay(double value) {
-    _$chatDelayAtom.reportWrite(value, super.chatDelay, () {
-      super.chatDelay = value;
+  set showHistoricalTimestamps(bool value) {
+    _$showHistoricalTimestampsAtom.reportWrite(
+      value,
+      super.showHistoricalTimestamps,
+      () {
+        super.showHistoricalTimestamps = value;
+      },
+    );
+  }
+
+  late final _$focusCurrentChannelAtom = Atom(
+    name: '_SettingsStoreBase.focusCurrentChannel',
+    context: context,
+  );
+
+  @override
+  bool get focusCurrentChannel {
+    _$focusCurrentChannelAtom.reportRead();
+    return super.focusCurrentChannel;
+  }
+
+  @override
+  set focusCurrentChannel(bool value) {
+    _$focusCurrentChannelAtom.reportWrite(value, super.focusCurrentChannel, () {
+      super.focusCurrentChannel = value;
     });
   }
 
   late final _$highlightFirstTimeChatterAtom = Atom(
-      name: '_SettingsStoreBase.highlightFirstTimeChatter', context: context);
+    name: '_SettingsStoreBase.highlightFirstTimeChatter',
+    context: context,
+  );
 
   @override
   bool get highlightFirstTimeChatter {
@@ -420,14 +682,19 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
 
   @override
   set highlightFirstTimeChatter(bool value) {
-    _$highlightFirstTimeChatterAtom
-        .reportWrite(value, super.highlightFirstTimeChatter, () {
-      super.highlightFirstTimeChatter = value;
-    });
+    _$highlightFirstTimeChatterAtom.reportWrite(
+      value,
+      super.highlightFirstTimeChatter,
+      () {
+        super.highlightFirstTimeChatter = value;
+      },
+    );
   }
 
-  late final _$showUserNoticesAtom =
-      Atom(name: '_SettingsStoreBase.showUserNotices', context: context);
+  late final _$showUserNoticesAtom = Atom(
+    name: '_SettingsStoreBase.showUserNotices',
+    context: context,
+  );
 
   @override
   bool get showUserNotices {
@@ -442,24 +709,136 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$showBottomBarAtom =
-      Atom(name: '_SettingsStoreBase.showBottomBar', context: context);
+  late final _$showTwitchEmotesAtom = Atom(
+    name: '_SettingsStoreBase.showTwitchEmotes',
+    context: context,
+  );
 
   @override
-  bool get showBottomBar {
-    _$showBottomBarAtom.reportRead();
-    return super.showBottomBar;
+  bool get showTwitchEmotes {
+    _$showTwitchEmotesAtom.reportRead();
+    return super.showTwitchEmotes;
   }
 
   @override
-  set showBottomBar(bool value) {
-    _$showBottomBarAtom.reportWrite(value, super.showBottomBar, () {
-      super.showBottomBar = value;
+  set showTwitchEmotes(bool value) {
+    _$showTwitchEmotesAtom.reportWrite(value, super.showTwitchEmotes, () {
+      super.showTwitchEmotes = value;
     });
   }
 
-  late final _$emoteMenuButtonOnLeftAtom =
-      Atom(name: '_SettingsStoreBase.emoteMenuButtonOnLeft', context: context);
+  late final _$showTwitchBadgesAtom = Atom(
+    name: '_SettingsStoreBase.showTwitchBadges',
+    context: context,
+  );
+
+  @override
+  bool get showTwitchBadges {
+    _$showTwitchBadgesAtom.reportRead();
+    return super.showTwitchBadges;
+  }
+
+  @override
+  set showTwitchBadges(bool value) {
+    _$showTwitchBadgesAtom.reportWrite(value, super.showTwitchBadges, () {
+      super.showTwitchBadges = value;
+    });
+  }
+
+  late final _$show7TVEmotesAtom = Atom(
+    name: '_SettingsStoreBase.show7TVEmotes',
+    context: context,
+  );
+
+  @override
+  bool get show7TVEmotes {
+    _$show7TVEmotesAtom.reportRead();
+    return super.show7TVEmotes;
+  }
+
+  @override
+  set show7TVEmotes(bool value) {
+    _$show7TVEmotesAtom.reportWrite(value, super.show7TVEmotes, () {
+      super.show7TVEmotes = value;
+    });
+  }
+
+  late final _$showBTTVEmotesAtom = Atom(
+    name: '_SettingsStoreBase.showBTTVEmotes',
+    context: context,
+  );
+
+  @override
+  bool get showBTTVEmotes {
+    _$showBTTVEmotesAtom.reportRead();
+    return super.showBTTVEmotes;
+  }
+
+  @override
+  set showBTTVEmotes(bool value) {
+    _$showBTTVEmotesAtom.reportWrite(value, super.showBTTVEmotes, () {
+      super.showBTTVEmotes = value;
+    });
+  }
+
+  late final _$showBTTVBadgesAtom = Atom(
+    name: '_SettingsStoreBase.showBTTVBadges',
+    context: context,
+  );
+
+  @override
+  bool get showBTTVBadges {
+    _$showBTTVBadgesAtom.reportRead();
+    return super.showBTTVBadges;
+  }
+
+  @override
+  set showBTTVBadges(bool value) {
+    _$showBTTVBadgesAtom.reportWrite(value, super.showBTTVBadges, () {
+      super.showBTTVBadges = value;
+    });
+  }
+
+  late final _$showFFZEmotesAtom = Atom(
+    name: '_SettingsStoreBase.showFFZEmotes',
+    context: context,
+  );
+
+  @override
+  bool get showFFZEmotes {
+    _$showFFZEmotesAtom.reportRead();
+    return super.showFFZEmotes;
+  }
+
+  @override
+  set showFFZEmotes(bool value) {
+    _$showFFZEmotesAtom.reportWrite(value, super.showFFZEmotes, () {
+      super.showFFZEmotes = value;
+    });
+  }
+
+  late final _$showFFZBadgesAtom = Atom(
+    name: '_SettingsStoreBase.showFFZBadges',
+    context: context,
+  );
+
+  @override
+  bool get showFFZBadges {
+    _$showFFZBadgesAtom.reportRead();
+    return super.showFFZBadges;
+  }
+
+  @override
+  set showFFZBadges(bool value) {
+    _$showFFZBadgesAtom.reportWrite(value, super.showFFZBadges, () {
+      super.showFFZBadges = value;
+    });
+  }
+
+  late final _$emoteMenuButtonOnLeftAtom = Atom(
+    name: '_SettingsStoreBase.emoteMenuButtonOnLeft',
+    context: context,
+  );
 
   @override
   bool get emoteMenuButtonOnLeft {
@@ -469,31 +848,55 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
 
   @override
   set emoteMenuButtonOnLeft(bool value) {
-    _$emoteMenuButtonOnLeftAtom.reportWrite(value, super.emoteMenuButtonOnLeft,
-        () {
-      super.emoteMenuButtonOnLeft = value;
-    });
+    _$emoteMenuButtonOnLeftAtom.reportWrite(
+      value,
+      super.emoteMenuButtonOnLeft,
+      () {
+        super.emoteMenuButtonOnLeft = value;
+      },
+    );
   }
 
-  late final _$chatNotificationsOnBottomAtom = Atom(
-      name: '_SettingsStoreBase.chatNotificationsOnBottom', context: context);
+  late final _$persistChatTabsAtom = Atom(
+    name: '_SettingsStoreBase.persistChatTabs',
+    context: context,
+  );
 
   @override
-  bool get chatNotificationsOnBottom {
-    _$chatNotificationsOnBottomAtom.reportRead();
-    return super.chatNotificationsOnBottom;
+  bool get persistChatTabs {
+    _$persistChatTabsAtom.reportRead();
+    return super.persistChatTabs;
   }
 
   @override
-  set chatNotificationsOnBottom(bool value) {
-    _$chatNotificationsOnBottomAtom
-        .reportWrite(value, super.chatNotificationsOnBottom, () {
-      super.chatNotificationsOnBottom = value;
+  set persistChatTabs(bool value) {
+    _$persistChatTabsAtom.reportWrite(value, super.persistChatTabs, () {
+      super.persistChatTabs = value;
     });
   }
 
-  late final _$landscapeChatLeftSideAtom =
-      Atom(name: '_SettingsStoreBase.landscapeChatLeftSide', context: context);
+  late final _$secondaryTabsAtom = Atom(
+    name: '_SettingsStoreBase.secondaryTabs',
+    context: context,
+  );
+
+  @override
+  List<PersistedChatTab> get secondaryTabs {
+    _$secondaryTabsAtom.reportRead();
+    return super.secondaryTabs;
+  }
+
+  @override
+  set secondaryTabs(List<PersistedChatTab> value) {
+    _$secondaryTabsAtom.reportWrite(value, super.secondaryTabs, () {
+      super.secondaryTabs = value;
+    });
+  }
+
+  late final _$landscapeChatLeftSideAtom = Atom(
+    name: '_SettingsStoreBase.landscapeChatLeftSide',
+    context: context,
+  );
 
   @override
   bool get landscapeChatLeftSide {
@@ -503,14 +906,19 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
 
   @override
   set landscapeChatLeftSide(bool value) {
-    _$landscapeChatLeftSideAtom.reportWrite(value, super.landscapeChatLeftSide,
-        () {
-      super.landscapeChatLeftSide = value;
-    });
+    _$landscapeChatLeftSideAtom.reportWrite(
+      value,
+      super.landscapeChatLeftSide,
+      () {
+        super.landscapeChatLeftSide = value;
+      },
+    );
   }
 
   late final _$landscapeForceVerticalChatAtom = Atom(
-      name: '_SettingsStoreBase.landscapeForceVerticalChat', context: context);
+    name: '_SettingsStoreBase.landscapeForceVerticalChat',
+    context: context,
+  );
 
   @override
   bool get landscapeForceVerticalChat {
@@ -520,14 +928,19 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
 
   @override
   set landscapeForceVerticalChat(bool value) {
-    _$landscapeForceVerticalChatAtom
-        .reportWrite(value, super.landscapeForceVerticalChat, () {
-      super.landscapeForceVerticalChat = value;
-    });
+    _$landscapeForceVerticalChatAtom.reportWrite(
+      value,
+      super.landscapeForceVerticalChat,
+      () {
+        super.landscapeForceVerticalChat = value;
+      },
+    );
   }
 
-  late final _$landscapeCutoutAtom =
-      Atom(name: '_SettingsStoreBase.landscapeCutout', context: context);
+  late final _$landscapeCutoutAtom = Atom(
+    name: '_SettingsStoreBase.landscapeCutout',
+    context: context,
+  );
 
   @override
   LandscapeCutoutType get landscapeCutout {
@@ -542,8 +955,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$chatWidthAtom =
-      Atom(name: '_SettingsStoreBase.chatWidth', context: context);
+  late final _$chatWidthAtom = Atom(
+    name: '_SettingsStoreBase.chatWidth',
+    context: context,
+  );
 
   @override
   double get chatWidth {
@@ -559,8 +974,9 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
   }
 
   late final _$fullScreenChatOverlayOpacityAtom = Atom(
-      name: '_SettingsStoreBase.fullScreenChatOverlayOpacity',
-      context: context);
+    name: '_SettingsStoreBase.fullScreenChatOverlayOpacity',
+    context: context,
+  );
 
   @override
   double get fullScreenChatOverlayOpacity {
@@ -570,31 +986,37 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
 
   @override
   set fullScreenChatOverlayOpacity(double value) {
-    _$fullScreenChatOverlayOpacityAtom
-        .reportWrite(value, super.fullScreenChatOverlayOpacity, () {
-      super.fullScreenChatOverlayOpacity = value;
-    });
+    _$fullScreenChatOverlayOpacityAtom.reportWrite(
+      value,
+      super.fullScreenChatOverlayOpacity,
+      () {
+        super.fullScreenChatOverlayOpacity = value;
+      },
+    );
   }
 
-  late final _$chatOnlyPreventSleepAtom =
-      Atom(name: '_SettingsStoreBase.chatOnlyPreventSleep', context: context);
+  late final _$keepScreenAwakeAtom = Atom(
+    name: '_SettingsStoreBase.keepScreenAwake',
+    context: context,
+  );
 
   @override
-  bool get chatOnlyPreventSleep {
-    _$chatOnlyPreventSleepAtom.reportRead();
-    return super.chatOnlyPreventSleep;
+  bool get keepScreenAwake {
+    _$keepScreenAwakeAtom.reportRead();
+    return super.keepScreenAwake;
   }
 
   @override
-  set chatOnlyPreventSleep(bool value) {
-    _$chatOnlyPreventSleepAtom.reportWrite(value, super.chatOnlyPreventSleep,
-        () {
-      super.chatOnlyPreventSleep = value;
+  set keepScreenAwake(bool value) {
+    _$keepScreenAwakeAtom.reportWrite(value, super.keepScreenAwake, () {
+      super.keepScreenAwake = value;
     });
   }
 
-  late final _$autocompleteAtom =
-      Atom(name: '_SettingsStoreBase.autocomplete', context: context);
+  late final _$autocompleteAtom = Atom(
+    name: '_SettingsStoreBase.autocomplete',
+    context: context,
+  );
 
   @override
   bool get autocomplete {
@@ -609,8 +1031,118 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
+  late final _$showRecentMessagesAtom = Atom(
+    name: '_SettingsStoreBase.showRecentMessages',
+    context: context,
+  );
+
+  @override
+  bool get showRecentMessages {
+    _$showRecentMessagesAtom.reportRead();
+    return super.showRecentMessages;
+  }
+
+  @override
+  set showRecentMessages(bool value) {
+    _$showRecentMessagesAtom.reportWrite(value, super.showRecentMessages, () {
+      super.showRecentMessages = value;
+    });
+  }
+
+  late final _$autoSyncChatDelayAtom = Atom(
+    name: '_SettingsStoreBase.autoSyncChatDelay',
+    context: context,
+  );
+
+  @override
+  bool get autoSyncChatDelay {
+    _$autoSyncChatDelayAtom.reportRead();
+    return super.autoSyncChatDelay;
+  }
+
+  @override
+  set autoSyncChatDelay(bool value) {
+    _$autoSyncChatDelayAtom.reportWrite(value, super.autoSyncChatDelay, () {
+      super.autoSyncChatDelay = value;
+    });
+  }
+
+  late final _$chatDelayAtom = Atom(
+    name: '_SettingsStoreBase.chatDelay',
+    context: context,
+  );
+
+  @override
+  double get chatDelay {
+    _$chatDelayAtom.reportRead();
+    return super.chatDelay;
+  }
+
+  @override
+  set chatDelay(double value) {
+    _$chatDelayAtom.reportWrite(value, super.chatDelay, () {
+      super.chatDelay = value;
+    });
+  }
+
+  late final _$syncedChatDelayAtom = Atom(
+    name: '_SettingsStoreBase.syncedChatDelay',
+    context: context,
+  );
+
+  @override
+  double get syncedChatDelay {
+    _$syncedChatDelayAtom.reportRead();
+    return super.syncedChatDelay;
+  }
+
+  @override
+  set syncedChatDelay(double value) {
+    _$syncedChatDelayAtom.reportWrite(value, super.syncedChatDelay, () {
+      super.syncedChatDelay = value;
+    });
+  }
+
+  late final _$mutedWordsAtom = Atom(
+    name: '_SettingsStoreBase.mutedWords',
+    context: context,
+  );
+
+  @override
+  List<String> get mutedWords {
+    _$mutedWordsAtom.reportRead();
+    return super.mutedWords;
+  }
+
+  @override
+  set mutedWords(List<String> value) {
+    _$mutedWordsAtom.reportWrite(value, super.mutedWords, () {
+      super.mutedWords = value;
+    });
+  }
+
+  late final _$matchWholeWordAtom = Atom(
+    name: '_SettingsStoreBase.matchWholeWord',
+    context: context,
+  );
+
+  @override
+  bool get matchWholeWord {
+    _$matchWholeWordAtom.reportRead();
+    return super.matchWholeWord;
+  }
+
+  @override
+  set matchWholeWord(bool value) {
+    _$matchWholeWordAtom.reportWrite(value, super.matchWholeWord, () {
+      super.matchWholeWord = value;
+    });
+  }
+
   late final _$shareCrashLogsAndAnalyticsAtom = Atom(
-      name: '_SettingsStoreBase.shareCrashLogsAndAnalytics', context: context);
+    name: '_SettingsStoreBase.shareCrashLogsAndAnalytics',
+    context: context,
+  );
 
   @override
   bool get shareCrashLogsAndAnalytics {
@@ -620,14 +1152,19 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
 
   @override
   set shareCrashLogsAndAnalytics(bool value) {
-    _$shareCrashLogsAndAnalyticsAtom
-        .reportWrite(value, super.shareCrashLogsAndAnalytics, () {
-      super.shareCrashLogsAndAnalytics = value;
-    });
+    _$shareCrashLogsAndAnalyticsAtom.reportWrite(
+      value,
+      super.shareCrashLogsAndAnalytics,
+      () {
+        super.shareCrashLogsAndAnalytics = value;
+      },
+    );
   }
 
-  late final _$fullScreenAtom =
-      Atom(name: '_SettingsStoreBase.fullScreen', context: context);
+  late final _$fullScreenAtom = Atom(
+    name: '_SettingsStoreBase.fullScreen',
+    context: context,
+  );
 
   @override
   bool get fullScreen {
@@ -642,8 +1179,10 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     });
   }
 
-  late final _$fullScreenChatOverlayAtom =
-      Atom(name: '_SettingsStoreBase.fullScreenChatOverlay', context: context);
+  late final _$fullScreenChatOverlayAtom = Atom(
+    name: '_SettingsStoreBase.fullScreenChatOverlay',
+    context: context,
+  );
 
   @override
   bool get fullScreenChatOverlay {
@@ -653,19 +1192,43 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
 
   @override
   set fullScreenChatOverlay(bool value) {
-    _$fullScreenChatOverlayAtom.reportWrite(value, super.fullScreenChatOverlay,
-        () {
-      super.fullScreenChatOverlay = value;
+    _$fullScreenChatOverlayAtom.reportWrite(
+      value,
+      super.fullScreenChatOverlay,
+      () {
+        super.fullScreenChatOverlay = value;
+      },
+    );
+  }
+
+  late final _$pinnedChannelIdsAtom = Atom(
+    name: '_SettingsStoreBase.pinnedChannelIds',
+    context: context,
+  );
+
+  @override
+  List<String> get pinnedChannelIds {
+    _$pinnedChannelIdsAtom.reportRead();
+    return super.pinnedChannelIds;
+  }
+
+  @override
+  set pinnedChannelIds(List<String> value) {
+    _$pinnedChannelIdsAtom.reportWrite(value, super.pinnedChannelIds, () {
+      super.pinnedChannelIds = value;
     });
   }
 
-  late final _$_SettingsStoreBaseActionController =
-      ActionController(name: '_SettingsStoreBase', context: context);
+  late final _$_SettingsStoreBaseActionController = ActionController(
+    name: '_SettingsStoreBase',
+    context: context,
+  );
 
   @override
   void resetGeneralSettings() {
     final _$actionInfo = _$_SettingsStoreBaseActionController.startAction(
-        name: '_SettingsStoreBase.resetGeneralSettings');
+      name: '_SettingsStoreBase.resetGeneralSettings',
+    );
     try {
       return super.resetGeneralSettings();
     } finally {
@@ -673,10 +1236,23 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
     }
   }
 
+  @override
+  void _migrateNativePlayerDefault() {
+    final _$actionInfo = _$_SettingsStoreBaseActionController.startAction(
+      name: '_SettingsStoreBase._migrateNativePlayerDefault',
+    );
+    try {
+      return super._migrateNativePlayerDefault();
+    } finally {
+      _$_SettingsStoreBaseActionController.endAction(_$actionInfo);
+    }
+  }
+
   @override
   void resetVideoSettings() {
     final _$actionInfo = _$_SettingsStoreBaseActionController.startAction(
-        name: '_SettingsStoreBase.resetVideoSettings');
+      name: '_SettingsStoreBase.resetVideoSettings',
+    );
     try {
       return super.resetVideoSettings();
     } finally {
@@ -687,7 +1263,8 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
   @override
   void resetChatSettings() {
     final _$actionInfo = _$_SettingsStoreBaseActionController.startAction(
-        name: '_SettingsStoreBase.resetChatSettings');
+      name: '_SettingsStoreBase.resetChatSettings',
+    );
     try {
       return super.resetChatSettings();
     } finally {
@@ -698,7 +1275,8 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
   @override
   void resetOtherSettings() {
     final _$actionInfo = _$_SettingsStoreBaseActionController.startAction(
-        name: '_SettingsStoreBase.resetOtherSettings');
+      name: '_SettingsStoreBase.resetOtherSettings',
+    );
     try {
       return super.resetOtherSettings();
     } finally {
@@ -709,7 +1287,8 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
   @override
   void resetGlobalConfigs() {
     final _$actionInfo = _$_SettingsStoreBaseActionController.startAction(
-        name: '_SettingsStoreBase.resetGlobalConfigs');
+      name: '_SettingsStoreBase.resetGlobalConfigs',
+    );
     try {
       return super.resetGlobalConfigs();
     } finally {
@@ -720,7 +1299,8 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
   @override
   void resetAllSettings() {
     final _$actionInfo = _$_SettingsStoreBaseActionController.startAction(
-        name: '_SettingsStoreBase.resetAllSettings');
+      name: '_SettingsStoreBase.resetAllSettings',
+    );
     try {
       return super.resetAllSettings();
     } finally {
@@ -732,38 +1312,60 @@ mixin _$SettingsStore on _SettingsStoreBase, Store {
   String toString() {
     return '''
 themeType: ${themeType},
+accentColor: ${accentColor},
 showThumbnails: ${showThumbnails},
 largeStreamCard: ${largeStreamCard},
 launchUrlExternal: ${launchUrlExternal},
+streamLanguages: ${streamLanguages},
+streamViewerSort: ${streamViewerSort},
 showVideo: ${showVideo},
+defaultToHighestQuality: ${defaultToHighestQuality},
+useTextureRendering: ${useTextureRendering},
+useNativePlayer: ${useNativePlayer},
+blockTwitchAds: ${blockTwitchAds},
 showOverlay: ${showOverlay},
 toggleableOverlay: ${toggleableOverlay},
-overlayOpacity: ${overlayOpacity},
+showLatency: ${showLatency},
 badgeScale: ${badgeScale},
 emoteScale: ${emoteScale},
 messageScale: ${messageScale},
 messageSpacing: ${messageSpacing},
 fontSize: ${fontSize},
-useReadableColors: ${useReadableColors},
 showDeletedMessages: ${showDeletedMessages},
 showChatMessageDividers: ${showChatMessageDividers},
 timestampType: ${timestampType},
-chatDelay: ${chatDelay},
+showHistoricalTimestamps: ${showHistoricalTimestamps},
+focusCurrentChannel: ${focusCurrentChannel},
 highlightFirstTimeChatter: ${highlightFirstTimeChatter},
 showUserNotices: ${showUserNotices},
-showBottomBar: ${showBottomBar},
+showTwitchEmotes: ${showTwitchEmotes},
+showTwitchBadges: ${showTwitchBadges},
+show7TVEmotes: ${show7TVEmotes},
+showBTTVEmotes: ${showBTTVEmotes},
+showBTTVBadges: ${showBTTVBadges},
+showFFZEmotes: ${showFFZEmotes},
+showFFZBadges: ${showFFZBadges},
 emoteMenuButtonOnLeft: ${emoteMenuButtonOnLeft},
-chatNotificationsOnBottom: ${chatNotificationsOnBottom},
+persistChatTabs: ${persistChatTabs},
+secondaryTabs: ${secondaryTabs},
 landscapeChatLeftSide: ${landscapeChatLeftSide},
 landscapeForceVerticalChat: ${landscapeForceVerticalChat},
 landscapeCutout: ${landscapeCutout},
 chatWidth: ${chatWidth},
 fullScreenChatOverlayOpacity: ${fullScreenChatOverlayOpacity},
-chatOnlyPreventSleep: ${chatOnlyPreventSleep},
+keepScreenAwake: ${keepScreenAwake},
 autocomplete: ${autocomplete},
+showRecentMessages: ${showRecentMessages},
+autoSyncChatDelay: ${autoSyncChatDelay},
+chatDelay: ${chatDelay},
+syncedChatDelay: ${syncedChatDelay},
+mutedWords: ${mutedWords},
+matchWholeWord: ${matchWholeWord},
 shareCrashLogsAndAnalytics: ${shareCrashLogsAndAnalytics},
 fullScreen: ${fullScreen},
-fullScreenChatOverlay: ${fullScreenChatOverlay}
+fullScreenChatOverlay: ${fullScreenChatOverlay},
+pinnedChannelIds: ${pinnedChannelIds},
+effectiveChatDelay: ${effectiveChatDelay}
     ''';
   }
 }
diff --git a/lib/screens/settings/stores/user_store.dart b/lib/screens/settings/stores/user_store.dart
index e4d6d336..de29e1da 100644
--- a/lib/screens/settings/stores/user_store.dart
+++ b/lib/screens/settings/stores/user_store.dart
@@ -1,6 +1,12 @@
+import 'dart:math';
+
+import 'package:frosty/apis/base_api_client.dart';
 import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/apis/twitch_integrity.dart';
 import 'package:frosty/models/user.dart';
 import 'package:mobx/mobx.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 part 'user_store.g.dart';
 
@@ -8,6 +14,10 @@ class UserStore = UserStoreBase with _$UserStore;
 
 abstract class UserStoreBase with Store {
   final TwitchApi twitchApi;
+  final TwitchGqlApi twitchGqlApi;
+
+  /// Whether the active auth token includes Frosty's moderator OAuth scopes.
+  final bool Function() hasModeratorScopes;
 
   /// The current user's info.
   @readonly
@@ -17,35 +27,229 @@ abstract class UserStoreBase with Store {
   @readonly
   var _blockedUsers = ObservableList<UserBlockedTwitch>();
 
+  /// The list of channel IDs the user moderates.
+  @readonly
+  var _moderatedChannels = ObservableList<String>();
+
+  /// Cached follow state for channels queried this session (id → following).
+  final _followCache = ObservableMap<String, bool>();
+
+  static const _deviceIdKey = 'twitch_gql_device_id';
+
+  String? _deviceId;
+  String? _integrityToken;
+  int _integrityExpirationMs = 0;
+
   ReactionDisposer? _disposeReaction;
 
-  UserStoreBase({required this.twitchApi});
+  UserStoreBase({
+    required this.twitchApi,
+    required this.twitchGqlApi,
+    required this.hasModeratorScopes,
+  });
 
   @action
-  Future<void> init({required Map<String, String> headers}) async {
+  Future<void> init() async {
     // Get and update the current user's info.
-    _details = await twitchApi.getUserInfo(headers: headers);
+    _details = await twitchApi.getUserInfo();
 
-    // Get and update the current user's list of blocked users.
+    // Get and update non-critical user info.
     // Don't use await because having a huge list of blocked users will block the UI.
     if (_details?.id != null) {
       twitchApi
-          .getUserBlockedList(id: _details!.id, headers: headers)
+          .getUserBlockedList(id: _details!.id)
           .then((blockedUsers) => _blockedUsers = blockedUsers.asObservable());
+      // Never hit moderated-channels Helix without moderator scopes — that 401
+      // is what nags non-mod users after an app upgrade.
+      if (hasModeratorScopes()) {
+        twitchApi
+            .getModeratedChannels(id: _details!.id)
+            .then(
+              (channels) => _moderatedChannels = channels.asObservable(),
+            );
+      } else {
+        _moderatedChannels = ObservableList<String>();
+      }
     }
 
-    _disposeReaction = autorun((_) =>
-        _blockedUsers.sort((a, b) => a.userLogin.compareTo(b.userLogin)));
+    _disposeReaction?.call();
+    _disposeReaction = autorun(
+      (_) => _blockedUsers.sort((a, b) => a.userLogin.compareTo(b.userLogin)),
+    );
+  }
+
+  /// Whether we already know follow state for [channelId] this session.
+  bool? cachedIsFollowing(String channelId) => _followCache[channelId];
+
+  @action
+  Future<bool> isFollowingChannel(String channelId) async {
+    final cached = _followCache[channelId];
+    if (cached != null) return cached;
+
+    final userId = _details?.id;
+    if (userId == null) return false;
+
+    final following = await twitchApi.isFollowingChannel(
+      userId: userId,
+      broadcasterId: channelId,
+    );
+    _followCache[channelId] = following;
+    return following;
+  }
+
+  /// Follows [targetId] via web GQL. [gqlToken] is the Twitch web cookie token.
+  @action
+  Future<void> follow({
+    required String targetId,
+    required String gqlToken,
+  }) async {
+    await _followMutation(
+      targetId: targetId,
+      gqlToken: gqlToken,
+      follow: true,
+    );
+    _followCache[targetId] = true;
+  }
+
+  /// Unfollows [targetId] via web GQL.
+  @action
+  Future<void> unfollow({
+    required String targetId,
+    required String gqlToken,
+  }) async {
+    await _followMutation(
+      targetId: targetId,
+      gqlToken: gqlToken,
+      follow: false,
+    );
+    _followCache[targetId] = false;
+  }
+
+  Future<void> _followMutation({
+    required String targetId,
+    required String gqlToken,
+    required bool follow,
+  }) async {
+    await runWithGqlIntegrity(
+      gqlToken: gqlToken,
+      action: ({authToken, integrityToken, deviceId}) {
+        if (follow) {
+          return twitchGqlApi.followUser(
+            targetId: targetId,
+            authToken: authToken!,
+            integrityToken: integrityToken,
+            deviceId: deviceId,
+          );
+        }
+        return twitchGqlApi.unfollowUser(
+          targetId: targetId,
+          authToken: authToken!,
+          integrityToken: integrityToken,
+          deviceId: deviceId,
+        );
+      },
+    );
+  }
+
+  /// Runs a GQL call with optional Client-Integrity; refreshes once on
+  /// [IntegrityCheckException] when a web [gqlToken] is available.
+  ///
+  /// Dio-minted tokens that are `is_bad_bot` are discarded; callers should
+  /// then capture credentials via a WebView and [applyWebIntegrity].
+  Future<T> runWithGqlIntegrity<T>({
+    required String? gqlToken,
+    required Future<T> Function({
+      required String? authToken,
+      required String? integrityToken,
+      required String? deviceId,
+    }) action,
+  }) async {
+    final deviceId = await _ensureDeviceId();
+    final authToken =
+        gqlToken != null && gqlToken.isNotEmpty ? gqlToken : null;
+
+    Future<T> run(String? integrityToken) => action(
+          authToken: authToken,
+          integrityToken: integrityToken,
+          deviceId: _deviceId ?? deviceId,
+        );
+
+    try {
+      return await run(_validIntegrityToken());
+    } on IntegrityCheckException {
+      if (authToken == null) {
+        clearIntegrity();
+        rethrow;
+      }
+      try {
+        final integrity = await twitchGqlApi.fetchIntegrityToken(
+          authToken: authToken,
+          deviceId: _deviceId ?? deviceId,
+        );
+        _integrityToken = integrity.token;
+        _integrityExpirationMs = integrity.expirationMs;
+        return await run(integrity.token);
+      } on IntegrityCheckException {
+        clearIntegrity();
+        rethrow;
+      }
+    }
+  }
+
+  /// Stores WebView-captured integrity (must match [GqlIntegrityCredentials.deviceId]).
+  Future<void> applyWebIntegrity(GqlIntegrityCredentials credentials) async {
+    if (TwitchIntegrity.isBadBot(credentials.integrityToken)) {
+      clearIntegrity();
+      throw const IntegrityCheckException(
+        'Twitch integrity token flagged as bad bot',
+      );
+    }
+    _integrityToken = credentials.integrityToken;
+    _integrityExpirationMs = credentials.expirationMs;
+    _deviceId = credentials.deviceId;
+    final prefs = await SharedPreferences.getInstance();
+    await prefs.setString(_deviceIdKey, credentials.deviceId);
+  }
+
+  void clearIntegrity() {
+    _integrityToken = null;
+    _integrityExpirationMs = 0;
+  }
+
+  String? _validIntegrityToken() {
+    if (_integrityToken == null) return null;
+    if (TwitchIntegrity.isBadBot(_integrityToken!)) {
+      clearIntegrity();
+      return null;
+    }
+    if (DateTime.now().millisecondsSinceEpoch >= _integrityExpirationMs - 60000) {
+      return null;
+    }
+    return _integrityToken;
+  }
+
+  Future<String> _ensureDeviceId() async {
+    if (_deviceId != null) return _deviceId!;
+    final prefs = await SharedPreferences.getInstance();
+    var id = prefs.getString(_deviceIdKey);
+    if (id == null || id.isEmpty) {
+      final random = Random.secure();
+      id = List.generate(
+        32,
+        (_) => random.nextInt(16).toRadixString(16),
+      ).join();
+      await prefs.setString(_deviceIdKey, id);
+    }
+    _deviceId = id;
+    return id;
   }
 
   @action
   Future<void> block({
     required String targetId,
     required String displayName,
-    required Map<String, String> headers,
   }) async {
-    final success =
-        await twitchApi.blockUser(userId: targetId, headers: headers);
+    final success = await twitchApi.blockUser(userId: targetId);
 
     if (success) {
       _blockedUsers.add(UserBlockedTwitch(targetId, displayName, displayName));
@@ -53,24 +257,96 @@ abstract class UserStoreBase with Store {
   }
 
   @action
-  Future<void> unblock(
-      {required String targetId, required Map<String, String> headers}) async {
-    final success =
-        await twitchApi.unblockUser(userId: targetId, headers: headers);
-    if (success) await refreshBlockedUsers(headers: headers);
+  Future<void> unblock({required String targetId}) async {
+    final success = await twitchApi.unblockUser(userId: targetId);
+    if (success) await refreshBlockedUsers();
   }
 
   @action
-  Future<void> refreshBlockedUsers(
-          {required Map<String, String> headers}) async =>
-      _blockedUsers = (await twitchApi.getUserBlockedList(
-              id: _details!.id, headers: headers))
-          .asObservable();
+  Future<void> refreshBlockedUsers() async => _blockedUsers =
+      (await twitchApi.getUserBlockedList(id: _details!.id)).asObservable();
+
+  /// Re-fetches which channels the user moderates. Mod status is otherwise only
+  /// loaded once at login, so call this when entering a channel to reflect mod
+  /// status granted or revoked since then.
+  @action
+  Future<void> refreshModeratedChannels() async {
+    if (_details?.id == null || !hasModeratorScopes()) return;
+    _moderatedChannels =
+        (await twitchApi.getModeratedChannels(id: _details!.id)).asObservable();
+  }
+
+  bool isModerator(String channelId) {
+    return _moderatedChannels.contains(channelId);
+  }
+
+  /// Whether the logged-in user can moderate [channelId] — either a moderator
+  /// of that channel or its broadcaster (the broadcaster isn't in their own
+  /// moderator list but can still use the moderation endpoints).
+  ///
+  /// Role only — does not require moderator OAuth scopes. Use
+  /// [canPerformModeratorActions] before calling Helix.
+  bool canModerate(String channelId) =>
+      _details?.id == channelId || isModerator(channelId);
+
+  /// Role + moderator OAuth scopes — safe to call Helix mod endpoints.
+  bool canPerformModeratorActions(String channelId) =>
+      _details?.id != null &&
+      hasModeratorScopes() &&
+      canModerate(channelId);
+
+  @action
+  Future<bool> deleteMessage({
+    required String broadcasterId,
+    required String messageId,
+  }) async {
+    if (!canPerformModeratorActions(broadcasterId)) return false;
+    return twitchApi.deleteChatMessage(
+      broadcasterId: broadcasterId,
+      moderatorId: _details!.id,
+      messageId: messageId,
+    );
+  }
+
+  @action
+  Future<bool> banOrTimeoutUser({
+    required String broadcasterId,
+    required String userIdToBan,
+    int? duration,
+    String? reason,
+  }) async {
+    if (!canPerformModeratorActions(broadcasterId)) return false;
+    return twitchApi.banUser(
+      broadcasterId: broadcasterId,
+      moderatorId: _details!.id,
+      userIdToBan: userIdToBan,
+      duration: duration,
+      reason: reason,
+    );
+  }
+
+  /// Removes a ban or timeout for [userIdToUnban] in the channel.
+  @action
+  Future<bool> unbanUser({
+    required String broadcasterId,
+    required String userIdToUnban,
+  }) async {
+    if (!canPerformModeratorActions(broadcasterId)) return false;
+    return twitchApi.unbanUser(
+      broadcasterId: broadcasterId,
+      moderatorId: _details!.id,
+      userId: userIdToUnban,
+    );
+  }
 
   @action
   void dispose() {
     _details = null;
     _blockedUsers.clear();
-    if (_disposeReaction != null) _disposeReaction!();
+    _moderatedChannels.clear();
+    _followCache.clear();
+    clearIntegrity();
+    _disposeReaction?.call();
+    _disposeReaction = null;
   }
 }
diff --git a/lib/screens/settings/stores/user_store.g.dart b/lib/screens/settings/stores/user_store.g.dart
index 3e3bf117..e138aa77 100644
--- a/lib/screens/settings/stores/user_store.g.dart
+++ b/lib/screens/settings/stores/user_store.g.dart
@@ -9,8 +9,10 @@ part of 'user_store.dart';
 // ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
 
 mixin _$UserStore on UserStoreBase, Store {
-  late final _$_detailsAtom =
-      Atom(name: 'UserStoreBase._details', context: context);
+  late final _$_detailsAtom = Atom(
+    name: 'UserStoreBase._details',
+    context: context,
+  );
 
   UserTwitch? get details {
     _$_detailsAtom.reportRead();
@@ -27,8 +29,10 @@ mixin _$UserStore on UserStoreBase, Store {
     });
   }
 
-  late final _$_blockedUsersAtom =
-      Atom(name: 'UserStoreBase._blockedUsers', context: context);
+  late final _$_blockedUsersAtom = Atom(
+    name: 'UserStoreBase._blockedUsers',
+    context: context,
+  );
 
   ObservableList<UserBlockedTwitch> get blockedUsers {
     _$_blockedUsersAtom.reportRead();
@@ -45,52 +49,186 @@ mixin _$UserStore on UserStoreBase, Store {
     });
   }
 
-  late final _$initAsyncAction =
-      AsyncAction('UserStoreBase.init', context: context);
+  late final _$_moderatedChannelsAtom = Atom(
+    name: 'UserStoreBase._moderatedChannels',
+    context: context,
+  );
 
-  @override
-  Future<void> init({required Map<String, String> headers}) {
-    return _$initAsyncAction.run(() => super.init(headers: headers));
+  ObservableList<String> get moderatedChannels {
+    _$_moderatedChannelsAtom.reportRead();
+    return super._moderatedChannels;
   }
 
-  late final _$blockAsyncAction =
-      AsyncAction('UserStoreBase.block', context: context);
+  @override
+  ObservableList<String> get _moderatedChannels => moderatedChannels;
 
   @override
-  Future<void> block(
-      {required String targetId,
-      required String displayName,
-      required Map<String, String> headers}) {
-    return _$blockAsyncAction.run(() => super
-        .block(targetId: targetId, displayName: displayName, headers: headers));
+  set _moderatedChannels(ObservableList<String> value) {
+    _$_moderatedChannelsAtom.reportWrite(value, super._moderatedChannels, () {
+      super._moderatedChannels = value;
+    });
   }
 
-  late final _$unblockAsyncAction =
-      AsyncAction('UserStoreBase.unblock', context: context);
+  late final _$initAsyncAction = AsyncAction(
+    'UserStoreBase.init',
+    context: context,
+  );
 
   @override
-  Future<void> unblock(
-      {required String targetId, required Map<String, String> headers}) {
-    return _$unblockAsyncAction
-        .run(() => super.unblock(targetId: targetId, headers: headers));
+  Future<void> init() {
+    return _$initAsyncAction.run(() => super.init());
   }
 
-  late final _$refreshBlockedUsersAsyncAction =
-      AsyncAction('UserStoreBase.refreshBlockedUsers', context: context);
+  late final _$isFollowingChannelAsyncAction = AsyncAction(
+    'UserStoreBase.isFollowingChannel',
+    context: context,
+  );
 
   @override
-  Future<void> refreshBlockedUsers({required Map<String, String> headers}) {
-    return _$refreshBlockedUsersAsyncAction
-        .run(() => super.refreshBlockedUsers(headers: headers));
+  Future<bool> isFollowingChannel(String channelId) {
+    return _$isFollowingChannelAsyncAction.run(
+      () => super.isFollowingChannel(channelId),
+    );
   }
 
-  late final _$UserStoreBaseActionController =
-      ActionController(name: 'UserStoreBase', context: context);
+  late final _$followAsyncAction = AsyncAction(
+    'UserStoreBase.follow',
+    context: context,
+  );
+
+  @override
+  Future<void> follow({required String targetId, required String gqlToken}) {
+    return _$followAsyncAction.run(
+      () => super.follow(targetId: targetId, gqlToken: gqlToken),
+    );
+  }
+
+  late final _$unfollowAsyncAction = AsyncAction(
+    'UserStoreBase.unfollow',
+    context: context,
+  );
+
+  @override
+  Future<void> unfollow({required String targetId, required String gqlToken}) {
+    return _$unfollowAsyncAction.run(
+      () => super.unfollow(targetId: targetId, gqlToken: gqlToken),
+    );
+  }
+
+  late final _$blockAsyncAction = AsyncAction(
+    'UserStoreBase.block',
+    context: context,
+  );
+
+  @override
+  Future<void> block({required String targetId, required String displayName}) {
+    return _$blockAsyncAction.run(
+      () => super.block(targetId: targetId, displayName: displayName),
+    );
+  }
+
+  late final _$unblockAsyncAction = AsyncAction(
+    'UserStoreBase.unblock',
+    context: context,
+  );
+
+  @override
+  Future<void> unblock({required String targetId}) {
+    return _$unblockAsyncAction.run(() => super.unblock(targetId: targetId));
+  }
+
+  late final _$refreshBlockedUsersAsyncAction = AsyncAction(
+    'UserStoreBase.refreshBlockedUsers',
+    context: context,
+  );
+
+  @override
+  Future<void> refreshBlockedUsers() {
+    return _$refreshBlockedUsersAsyncAction.run(
+      () => super.refreshBlockedUsers(),
+    );
+  }
+
+  late final _$refreshModeratedChannelsAsyncAction = AsyncAction(
+    'UserStoreBase.refreshModeratedChannels',
+    context: context,
+  );
+
+  @override
+  Future<void> refreshModeratedChannels() {
+    return _$refreshModeratedChannelsAsyncAction.run(
+      () => super.refreshModeratedChannels(),
+    );
+  }
+
+  late final _$deleteMessageAsyncAction = AsyncAction(
+    'UserStoreBase.deleteMessage',
+    context: context,
+  );
+
+  @override
+  Future<bool> deleteMessage({
+    required String broadcasterId,
+    required String messageId,
+  }) {
+    return _$deleteMessageAsyncAction.run(
+      () => super.deleteMessage(
+        broadcasterId: broadcasterId,
+        messageId: messageId,
+      ),
+    );
+  }
+
+  late final _$banOrTimeoutUserAsyncAction = AsyncAction(
+    'UserStoreBase.banOrTimeoutUser',
+    context: context,
+  );
+
+  @override
+  Future<bool> banOrTimeoutUser({
+    required String broadcasterId,
+    required String userIdToBan,
+    int? duration,
+    String? reason,
+  }) {
+    return _$banOrTimeoutUserAsyncAction.run(
+      () => super.banOrTimeoutUser(
+        broadcasterId: broadcasterId,
+        userIdToBan: userIdToBan,
+        duration: duration,
+        reason: reason,
+      ),
+    );
+  }
+
+  late final _$unbanUserAsyncAction = AsyncAction(
+    'UserStoreBase.unbanUser',
+    context: context,
+  );
+
+  @override
+  Future<bool> unbanUser({
+    required String broadcasterId,
+    required String userIdToUnban,
+  }) {
+    return _$unbanUserAsyncAction.run(
+      () => super.unbanUser(
+        broadcasterId: broadcasterId,
+        userIdToUnban: userIdToUnban,
+      ),
+    );
+  }
+
+  late final _$UserStoreBaseActionController = ActionController(
+    name: 'UserStoreBase',
+    context: context,
+  );
 
   @override
   void dispose() {
     final _$actionInfo = _$UserStoreBaseActionController.startAction(
-        name: 'UserStoreBase.dispose');
+      name: 'UserStoreBase.dispose',
+    );
     try {
       return super.dispose();
     } finally {
diff --git a/lib/screens/settings/video_settings.dart b/lib/screens/settings/video_settings.dart
index 34ce9f5b..6e3ba50e 100644
--- a/lib/screens/settings/video_settings.dart
+++ b/lib/screens/settings/video_settings.dart
@@ -1,51 +1,96 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:frosty/screens/settings/stores/settings_store.dart';
-import 'package:frosty/screens/settings/widgets/settings_list_slider.dart';
 import 'package:frosty/screens/settings/widgets/settings_list_switch.dart';
+import 'package:frosty/utils.dart';
 import 'package:frosty/widgets/section_header.dart';
+import 'package:frosty/widgets/settings_page_layout.dart';
 
 class VideoSettings extends StatelessWidget {
   final SettingsStore settingsStore;
 
-  const VideoSettings({Key? key, required this.settingsStore})
-      : super(key: key);
+  const VideoSettings({super.key, required this.settingsStore});
 
   @override
   Widget build(BuildContext context) {
     return Observer(
-      builder: (context) => ListView(
+      builder: (context) => SettingsPageLayout(
         children: [
-          const SectionHeader('Player'),
+          const SectionHeader('Player', isFirst: true),
           SettingsListSwitch(
-            title: 'Enable video',
+            title: 'Show video player',
             value: settingsStore.showVideo,
             onChanged: (newValue) => settingsStore.showVideo = newValue,
           ),
+          if (settingsStore.showVideo)
+            SettingsListSwitch(
+              title: 'Native player',
+              subtitle: const Text(
+                'Picture-in-Picture, quality selection, and lower latency. Turn off to use the legacy WebView player.',
+              ),
+              value: settingsStore.useNativePlayer,
+              onChanged: (newValue) =>
+                  settingsStore.useNativePlayer = newValue,
+            ),
+          if (settingsStore.showVideo)
+            SettingsListSwitch(
+              title: 'Block Twitch ads',
+              subtitle: Text(
+                settingsStore.useNativePlayer
+                    ? 'Uses TwitchAdSolutions (vaft): popout/embed/autoplay player types and backup streams during ad breaks.'
+                    : 'Injects the vaft userscript into the WebView. Native player is more reliable — enable it above if ads still play.',
+              ),
+              value: settingsStore.blockTwitchAds,
+              onChanged: (newValue) {
+                settingsStore.blockTwitchAds = newValue;
+                // Ad blocking is most effective on the native path.
+                if (newValue) settingsStore.useNativePlayer = true;
+              },
+            ),
+          if (!Platform.isIOS || isIPad())
+            SettingsListSwitch(
+              title: 'Default to highest quality',
+              value: settingsStore.defaultToHighestQuality,
+              onChanged: (newValue) =>
+                  settingsStore.defaultToHighestQuality = newValue,
+            ),
+          if (Platform.isAndroid)
+            SettingsListSwitch(
+              title: 'Use fast video rendering',
+              subtitle: const Text(
+                'Uses a faster WebView rendering method. Disable if you experience crashes while watching streams.',
+              ),
+              value: settingsStore.useTextureRendering,
+              onChanged: (newValue) =>
+                  settingsStore.useTextureRendering = newValue,
+            ),
           const SectionHeader('Overlay'),
           SettingsListSwitch(
             title: 'Use custom video overlay',
             subtitle: const Text(
-                'Replaces Twitch\'s default web overlay with a mobile-friendly version.'),
+              'Replaces Twitch\'s default web overlay with a mobile-friendly version.',
+            ),
             value: settingsStore.showOverlay,
             onChanged: (newValue) => settingsStore.showOverlay = newValue,
           ),
           SettingsListSwitch(
-            title: 'Long-press player to toggle overlay',
+            title: 'Toggle overlay on long-press',
             subtitle: const Text(
-                'Allows switching between Twitch\'s overlay and the custom overlay.'),
+              'Switch between Twitch\'s overlay and the custom overlay.',
+            ),
             value: settingsStore.toggleableOverlay,
-            onChanged: (newValue) => settingsStore.toggleableOverlay = newValue,
+            onChanged: (newValue) =>
+                settingsStore.toggleableOverlay = newValue,
           ),
-          SettingsListSlider(
-            title: 'Custom overlay opacity',
-            trailing:
-                '${(settingsStore.overlayOpacity * 100).toStringAsFixed(0)}%',
-            subtitle:
-                'Adjusts the opacity (transparency) of the custom video overlay when active.',
-            value: settingsStore.overlayOpacity,
-            divisions: 10,
-            onChanged: (newValue) => settingsStore.overlayOpacity = newValue,
+          SettingsListSwitch(
+            title: 'Show latency',
+            subtitle: const Text(
+              'Displays the stream latency in the video overlay.',
+            ),
+            value: settingsStore.showLatency,
+            onChanged: (newValue) => settingsStore.showLatency = newValue,
           ),
         ],
       ),
diff --git a/lib/screens/settings/widgets/release_notes.dart b/lib/screens/settings/widgets/release_notes.dart
new file mode 100644
index 00000000..a004e100
--- /dev/null
+++ b/lib/screens/settings/widgets/release_notes.dart
@@ -0,0 +1,132 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_markdown_plus/flutter_markdown_plus.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
+import 'package:provider/provider.dart';
+import 'package:url_launcher/url_launcher_string.dart';
+
+class ReleaseNotes extends StatefulWidget {
+  static const routeName = 'ReleaseNotes';
+
+  const ReleaseNotes({super.key});
+
+  @override
+  State<ReleaseNotes> createState() => _ReleaseNotesState();
+}
+
+class _ReleaseNotesState extends State<ReleaseNotes> {
+  final _scrollController = ScrollController();
+  String releaseNotes = '';
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+
+    rootBundle.loadString('assets/release-notes.md').then((changelog) {
+      setState(() {
+        releaseNotes = changelog;
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return Scaffold(
+      backgroundColor: theme.scaffoldBackgroundColor,
+      extendBody: true,
+      extendBodyBehindAppBar: true,
+      appBar: AppBar(
+        centerTitle: false,
+        elevation: 0,
+        backgroundColor: Colors.transparent,
+        surfaceTintColor: Colors.transparent,
+        systemOverlayStyle: SystemUiOverlayStyle(
+          statusBarColor: Colors.transparent,
+          statusBarIconBrightness: theme.brightness == Brightness.dark
+              ? Brightness.light
+              : Brightness.dark,
+        ),
+        leading: IconButton(
+          tooltip: 'Back',
+          icon: Icon(Icons.adaptive.arrow_back_rounded),
+          onPressed: Navigator.of(context).pop,
+        ),
+        title: const Text('Release notes'),
+      ),
+      body: Stack(
+        children: [
+          // Main scrollable content
+          Positioned.fill(
+            child: FrostyScrollbar(
+              controller: _scrollController,
+              padding: EdgeInsets.only(
+                top: MediaQuery.of(context).padding.top + kToolbarHeight,
+              ),
+              child: Markdown(
+                padding: EdgeInsets.fromLTRB(
+                  16 + MediaQuery.of(context).padding.left,
+                  MediaQuery.of(context).padding.top + kToolbarHeight,
+                  16 + MediaQuery.of(context).padding.right,
+                  16,
+                ),
+                controller: _scrollController,
+                data: releaseNotes,
+                styleSheet: MarkdownStyleSheet(
+                  h2: const TextStyle(fontSize: 20),
+                  h3: const TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                  ),
+                  h3Padding: const EdgeInsets.only(top: 16),
+                  h4: const TextStyle(fontSize: 14),
+                  h4Padding: const EdgeInsets.only(top: 16),
+                  p: const TextStyle(fontSize: 14),
+                  horizontalRuleDecoration: const BoxDecoration(
+                    border: Border(
+                      top: BorderSide(color: Colors.transparent, width: 32),
+                    ),
+                  ),
+                ),
+                onTapLink: (text, href, title) {
+                  if (href != null) {
+                    launchUrlString(
+                      href,
+                      mode: context.read<SettingsStore>().launchUrlExternal
+                          ? LaunchMode.externalApplication
+                          : LaunchMode.inAppBrowserView,
+                    );
+                  }
+                },
+              ),
+            ),
+          ),
+          // Blurred app bar overlay
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: BlurredContainer(
+              gradientDirection: GradientDirection.up,
+              padding: EdgeInsets.only(
+                top: MediaQuery.of(context).padding.top,
+                left: MediaQuery.of(context).padding.left,
+                right: MediaQuery.of(context).padding.right,
+              ),
+              child: const SizedBox(height: kToolbarHeight),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/screens/settings/widgets/settings_list_select.dart b/lib/screens/settings/widgets/settings_list_select.dart
index ad3f8dbd..b79606fa 100644
--- a/lib/screens/settings/widgets/settings_list_select.dart
+++ b/lib/screens/settings/widgets/settings_list_select.dart
@@ -1,73 +1,42 @@
 import 'package:flutter/material.dart';
-import 'package:frosty/widgets/bottom_sheet.dart';
 
 /// A custom-styled adaptive [ListTile] with options to select.
 class SettingsListSelect extends StatelessWidget {
-  final String title;
+  final String? title;
   final String? subtitle;
   final String selectedOption;
   final List<String> options;
   final ValueChanged<String> onChanged;
 
   const SettingsListSelect({
-    Key? key,
-    required this.title,
+    super.key,
+    this.title,
     this.subtitle,
     required this.selectedOption,
     required this.options,
     required this.onChanged,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
     return ListTile(
-      isThreeLine: subtitle != null,
-      title: Text(title, style: const TextStyle(fontWeight: FontWeight.w500)),
-      subtitle: subtitle != null ? Text(subtitle!) : null,
-      trailing: SizedBox(
-        height: double.infinity,
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Opacity(
-              opacity: 0.8,
-              child: Text(
-                selectedOption,
-              ),
-            ),
-            const Icon(Icons.chevron_right_rounded),
-          ],
-        ),
-      ),
-      onTap: () => showModalBottomSheet(
-        backgroundColor: Colors.transparent,
-        isScrollControlled: true,
-        context: context,
-        builder: (context) => FrostyBottomSheet(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Padding(
-                padding: const EdgeInsets.all(16.0),
-                child: Text(
-                  'Select ${title.toLowerCase()}',
-                  style: const TextStyle(
-                      fontWeight: FontWeight.bold, fontSize: 18),
+      title: title != null ? Text(title!) : null,
+      subtitle: Padding(
+        padding: title != null
+            ? const EdgeInsets.symmetric(vertical: 8)
+            : EdgeInsets.zero,
+        child: SegmentedButton(
+          style: const ButtonStyle(visualDensity: VisualDensity.compact),
+          segments: options
+              .map(
+                (option) => ButtonSegment(
+                  value: option,
+                  label: Text(option, overflow: TextOverflow.ellipsis),
                 ),
-              ),
-              ...options
-                  .map((option) => ListTile(
-                      title: Text(option),
-                      trailing: selectedOption == option
-                          ? const Icon(Icons.check_rounded)
-                          : null,
-                      onTap: () {
-                        onChanged(option);
-                        Navigator.of(context).pop();
-                      }))
-                  .toList()
-            ],
-          ),
+              )
+              .toList(),
+          selected: {selectedOption},
+          onSelectionChanged: (selection) => onChanged(selection.first),
         ),
       ),
     );
diff --git a/lib/screens/settings/widgets/settings_list_slider.dart b/lib/screens/settings/widgets/settings_list_slider.dart
index b7981424..cf9979f4 100644
--- a/lib/screens/settings/widgets/settings_list_slider.dart
+++ b/lib/screens/settings/widgets/settings_list_slider.dart
@@ -1,9 +1,8 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 /// A custom-styled adaptive [Slider].
-class SettingsListSlider extends StatelessWidget {
+class SettingsListSlider extends StatefulWidget {
   final String title;
   final String trailing;
   final String? subtitle;
@@ -14,7 +13,7 @@ class SettingsListSlider extends StatelessWidget {
   final int? divisions;
 
   const SettingsListSlider({
-    Key? key,
+    super.key,
     required this.title,
     required this.trailing,
     this.subtitle,
@@ -23,36 +22,62 @@ class SettingsListSlider extends StatelessWidget {
     this.min = 0.0,
     this.max = 1.0,
     this.divisions,
-  }) : super(key: key);
+  });
 
-  static const _textStyle = TextStyle(fontWeight: FontWeight.w500);
+  @override
+  State<SettingsListSlider> createState() => _SettingsListSliderState();
+}
+
+class _SettingsListSliderState extends State<SettingsListSlider> {
+  int? _previousStep;
+
+  void _handleChanged(double newValue) {
+    if (widget.divisions != null) {
+      final step =
+          ((newValue - widget.min) /
+                  (widget.max - widget.min) *
+                  widget.divisions!)
+              .round();
+      if (_previousStep != null && step != _previousStep) {
+        HapticFeedback.selectionClick();
+      }
+      _previousStep = step;
+    }
+    widget.onChanged?.call(newValue);
+  }
 
   @override
   Widget build(BuildContext context) {
     return ListTile(
-      contentPadding:
-          const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
       title: Row(
         children: [
-          Text(title, style: _textStyle),
+          Text(widget.title),
           const Spacer(),
-          Text(trailing,
-              style: _textStyle.copyWith(
-                  fontFeatures: [const FontFeature.tabularFigures()])),
+          Text(
+            widget.trailing,
+            style: const TextStyle(
+              fontFeatures: [FontFeature.tabularFigures()],
+            ),
+          ),
         ],
       ),
-      subtitle: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Slider.adaptive(
-            value: value,
-            min: min,
-            max: max,
-            divisions: divisions,
-            onChanged: onChanged,
-          ),
-          if (subtitle != null) Text(subtitle!),
-        ],
+      subtitle: Padding(
+        padding: const EdgeInsets.only(bottom: 8),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Slider.adaptive(
+              value: widget.value,
+              min: widget.min,
+              max: widget.max,
+              divisions: widget.divisions,
+              onChanged:
+                  widget.onChanged != null ? _handleChanged : null,
+            ),
+            if (widget.subtitle != null) Text(widget.subtitle!),
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/screens/settings/widgets/settings_list_switch.dart b/lib/screens/settings/widgets/settings_list_switch.dart
index 053ed989..97669e5b 100644
--- a/lib/screens/settings/widgets/settings_list_switch.dart
+++ b/lib/screens/settings/widgets/settings_list_switch.dart
@@ -1,28 +1,33 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 /// A custom-styled adaptive [SwitchListTile].
 class SettingsListSwitch extends StatelessWidget {
-  final String? title;
+  final String title;
   final Widget? subtitle;
   final bool value;
   final ValueChanged<bool>? onChanged;
 
   const SettingsListSwitch({
-    Key? key,
-    this.title,
+    super.key,
+    required this.title,
     this.subtitle,
     this.onChanged,
     required this.value,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
     return SwitchListTile.adaptive(
-      isThreeLine: subtitle != null,
-      title: Text(title!, style: const TextStyle(fontWeight: FontWeight.w500)),
+      title: Text(title),
       subtitle: subtitle,
       value: value,
-      onChanged: onChanged,
+      onChanged: onChanged != null
+          ? (newValue) {
+              HapticFeedback.selectionClick();
+              onChanged!(newValue);
+            }
+          : null,
     );
   }
 }
diff --git a/lib/screens/settings/widgets/settings_muted_words.dart b/lib/screens/settings/widgets/settings_muted_words.dart
new file mode 100644
index 00000000..44ccebad
--- /dev/null
+++ b/lib/screens/settings/widgets/settings_muted_words.dart
@@ -0,0 +1,142 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/utils/modal_bottom_sheet.dart';
+import 'package:frosty/widgets/alert_message.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
+
+class SettingsMutedWords extends StatefulWidget {
+  final SettingsStore settingsStore;
+  const SettingsMutedWords({super.key, required this.settingsStore});
+
+  @override
+  State<SettingsMutedWords> createState() => _SettingsMutedWordsState();
+}
+
+class _SettingsMutedWordsState extends State<SettingsMutedWords> {
+  late final SettingsStore settingsStore;
+  final TextEditingController textController = TextEditingController();
+  final FocusNode textFieldFocusNode = FocusNode();
+
+  @override
+  void initState() {
+    settingsStore = widget.settingsStore;
+    super.initState();
+  }
+
+  void addMutedWord(String text) {
+    settingsStore.mutedWords = [...settingsStore.mutedWords, text];
+
+    textController.clear();
+    textFieldFocusNode.unfocus();
+  }
+
+  void removeMutedWord(int index) {
+    settingsStore.mutedWords = [...settingsStore.mutedWords..removeAt(index)];
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      trailing: const Icon(Icons.edit),
+      title: const Text('Muted keywords'),
+      onTap: () => showModalBottomSheetWithProperFocus(
+        isScrollControlled: true,
+        context: context,
+        builder: (context) => SizedBox(
+          height: MediaQuery.of(context).size.height * 0.8,
+          child: Observer(
+            builder: (context) {
+              return Column(
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.fromLTRB(12, 0, 12, 8),
+                    child: TextField(
+                      controller: textController,
+                      focusNode: textFieldFocusNode,
+                      onChanged: (value) {
+                        textController.text = value;
+                      },
+                      onSubmitted: (value) {
+                        addMutedWord(value);
+                      },
+                      autocorrect: false,
+                      decoration: InputDecoration(
+                        hintText: 'Enter keywords to mute',
+                        suffixIcon: IconButton(
+                          tooltip: textController.text.isEmpty
+                              ? 'Cancel'
+                              : 'Add keyword',
+                          onPressed: () {
+                            if (textController.text.isEmpty) {
+                              textFieldFocusNode.unfocus();
+                            } else {
+                              addMutedWord(textController.text);
+                            }
+                          },
+                          icon: const Icon(Icons.check),
+                        ),
+                      ),
+                    ),
+                  ),
+                  if (settingsStore.mutedWords.isEmpty)
+                    const Expanded(
+                      child: AlertMessage(
+                        message: 'No muted keywords',
+                        vertical: true,
+                      ),
+                    ),
+                  Expanded(
+                    child: FrostyScrollbar(
+                      child: ListView.builder(
+                        itemCount: settingsStore.mutedWords.length,
+                        itemBuilder: (context, index) {
+                          return ListTile(
+                            title: Text(
+                              settingsStore.mutedWords.elementAt(index),
+                            ),
+                            trailing: IconButton(
+                              icon: const Icon(
+                                Icons.delete_outline_rounded,
+                              ),
+                              onPressed: () {
+                                final word =
+                                    settingsStore.mutedWords.elementAt(index);
+                                removeMutedWord(index);
+                                ScaffoldMessenger.of(context).showSnackBar(
+                                  SnackBar(
+                                    content: Text("Removed '$word'"),
+                                    action: SnackBarAction(
+                                      label: 'Undo',
+                                      onPressed: () {
+                                        settingsStore.mutedWords = [
+                                          ...settingsStore.mutedWords,
+                                          word,
+                                        ];
+                                      },
+                                    ),
+                                  ),
+                                );
+                              },
+                            ),
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+                ],
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  void dispose() {
+    textController.dispose();
+    textFieldFocusNode.dispose();
+    super.dispose();
+  }
+}
diff --git a/lib/screens/settings/widgets/settings_tile_route.dart b/lib/screens/settings/widgets/settings_tile_route.dart
index 976df8de..7a24ce4f 100644
--- a/lib/screens/settings/widgets/settings_tile_route.dart
+++ b/lib/screens/settings/widgets/settings_tile_route.dart
@@ -1,35 +1,102 @@
 import 'package:flutter/material.dart';
-import 'package:frosty/widgets/app_bar.dart';
+import 'package:flutter/services.dart';
+import 'package:frosty/widgets/blurred_container.dart';
 
 class SettingsTileRoute extends StatelessWidget {
   final Widget leading;
   final String title;
   final Widget child;
+  final bool useScaffold;
 
   const SettingsTileRoute({
-    Key? key,
+    super.key,
     required this.leading,
     required this.title,
     required this.child,
-  }) : super(key: key);
+    this.useScaffold = true,
+  });
 
   @override
   Widget build(BuildContext context) {
     return ListTile(
       leading: leading,
-      title: Text(title, style: const TextStyle(fontWeight: FontWeight.w600)),
+      title: Text(title),
       trailing: const Icon(Icons.chevron_right_rounded),
       onTap: () => Navigator.of(context).push(
         MaterialPageRoute(
-          builder: (context) => Scaffold(
-            appBar: FrostyAppBar(title: Text(title)),
-            body: SafeArea(
-              bottom: false,
-              child: child,
-            ),
-          ),
+          settings: RouteSettings(name: title),
+          builder: (context) => useScaffold
+              ? _BlurredSettingsPage(title: title, child: child)
+              : child,
         ),
       ),
     );
   }
 }
+
+class _BlurredSettingsPage extends StatelessWidget {
+  final String title;
+  final Widget child;
+
+  const _BlurredSettingsPage({required this.title, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return Scaffold(
+      backgroundColor: theme.scaffoldBackgroundColor,
+      extendBody: true,
+      extendBodyBehindAppBar: true,
+      appBar: AppBar(
+        centerTitle: false,
+        elevation: 0,
+        backgroundColor: Colors.transparent,
+        surfaceTintColor: Colors.transparent,
+        systemOverlayStyle: SystemUiOverlayStyle(
+          statusBarColor: Colors.transparent,
+          statusBarIconBrightness: theme.brightness == Brightness.dark
+              ? Brightness.light
+              : Brightness.dark,
+        ),
+        leading: IconButton(
+          tooltip: 'Back',
+          icon: Icon(Icons.adaptive.arrow_back_rounded),
+          onPressed: Navigator.of(context).pop,
+        ),
+        title: Text(title),
+      ),
+      body: Stack(
+        children: [
+          // Main scrollable content
+          Positioned.fill(
+            child: SafeArea(
+              top: false,
+              bottom: false,
+              child: MediaQuery.removePadding(
+                context: context,
+                removeTop: true,
+                child: child,
+              ),
+            ),
+          ),
+          // Blurred app bar overlay - positioned AFTER content so it renders on top
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: BlurredContainer(
+              gradientDirection: GradientDirection.up,
+              padding: EdgeInsets.only(
+                top: MediaQuery.of(context).padding.top,
+                left: MediaQuery.of(context).padding.left,
+                right: MediaQuery.of(context).padding.right,
+              ),
+              child: const SizedBox(height: kToolbarHeight),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/services/cookie_extractor.dart b/lib/services/cookie_extractor.dart
new file mode 100644
index 00000000..cca2b028
--- /dev/null
+++ b/lib/services/cookie_extractor.dart
@@ -0,0 +1,9 @@
+import 'package:flutter/services.dart';
+
+class CookieExtractor {
+  static const _channel = MethodChannel('frosty/cookie_extractor');
+
+  static Future<String?> extractTwitchAuthToken() async {
+    return await _channel.invokeMethod<String>('extractTwitchAuthToken');
+  }
+}
diff --git a/lib/services/shared_timer_service.dart b/lib/services/shared_timer_service.dart
new file mode 100644
index 00000000..08975e36
--- /dev/null
+++ b/lib/services/shared_timer_service.dart
@@ -0,0 +1,62 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+
+/// A singleton service that provides a shared timer for synchronizing uptime displays
+/// across all stream cards. This prevents multiple independent timers from running
+/// and ensures all uptime displays update simultaneously.
+class SharedTimerService extends ChangeNotifier {
+  static final SharedTimerService _instance = SharedTimerService._internal();
+  static SharedTimerService get instance => _instance;
+
+  SharedTimerService._internal();
+
+  Timer? _timer;
+  int _listenerCount = 0;
+  DateTime _lastTick = DateTime.now();
+
+  /// The current time that should be used for all uptime calculations
+  DateTime get currentTime => _lastTick;
+
+  /// Starts the shared timer when the first listener is added
+  @override
+  void addListener(VoidCallback listener) {
+    super.addListener(listener);
+    _listenerCount++;
+
+    // Start the timer when we get the first listener
+    if (_listenerCount == 1) {
+      _startTimer();
+    }
+  }
+
+  /// Stops the shared timer when the last listener is removed
+  @override
+  void removeListener(VoidCallback listener) {
+    super.removeListener(listener);
+    _listenerCount--;
+
+    // Stop the timer when we have no more listeners
+    if (_listenerCount == 0) {
+      _stopTimer();
+    }
+  }
+
+  void _startTimer() {
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      _lastTick = DateTime.now();
+      notifyListeners();
+    });
+  }
+
+  void _stopTimer() {
+    _timer?.cancel();
+    _timer = null;
+  }
+
+  @override
+  void dispose() {
+    _stopTimer();
+    super.dispose();
+  }
+}
diff --git a/lib/stores/global_assets_store.dart b/lib/stores/global_assets_store.dart
new file mode 100644
index 00000000..aedf7126
--- /dev/null
+++ b/lib/stores/global_assets_store.dart
@@ -0,0 +1,253 @@
+import 'package:firebase_crashlytics/firebase_crashlytics.dart';
+import 'package:flutter/foundation.dart';
+import 'package:frosty/apis/bttv_api.dart';
+import 'package:frosty/apis/ffz_api.dart';
+import 'package:frosty/apis/seventv_api.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/models/badges.dart';
+import 'package:frosty/models/emotes.dart';
+import 'package:mobx/mobx.dart';
+
+part 'global_assets_store.g.dart';
+
+/// Singleton-like store for caching global emotes and badges.
+/// Provided at app root level via Provider, shared across all chat tabs.
+class GlobalAssetsStore = GlobalAssetsStoreBase with _$GlobalAssetsStore;
+
+abstract class GlobalAssetsStoreBase with Store {
+  final TwitchApi twitchApi;
+  final BTTVApi bttvApi;
+  final FFZApi ffzApi;
+  final SevenTVApi sevenTVApi;
+
+  GlobalAssetsStoreBase({
+    required this.twitchApi,
+    required this.bttvApi,
+    required this.ffzApi,
+    required this.sevenTVApi,
+  });
+
+  // ============= Loading State =============
+
+  /// Whether global assets have been loaded at least once.
+  @readonly
+  var _isLoaded = false;
+
+  /// Whether global assets are currently being fetched.
+  @readonly
+  var _isLoading = false;
+
+  /// Completer to allow multiple callers to await the same load operation.
+  Future<void>? _loadingFuture;
+
+  // ============= Global Emotes =============
+
+  /// Global Twitch emotes.
+  @readonly
+  var _twitchGlobalEmotes = <Emote>[];
+
+  /// Global 7TV emotes.
+  @readonly
+  var _sevenTVGlobalEmotes = <Emote>[];
+
+  /// Global BTTV emotes.
+  @readonly
+  var _bttvGlobalEmotes = <Emote>[];
+
+  /// Global FFZ emotes.
+  @readonly
+  var _ffzGlobalEmotes = <Emote>[];
+
+  // ============= Global Badges =============
+
+  /// Global Twitch badges (badge key -> ChatBadge).
+  @readonly
+  var _twitchGlobalBadges = <String, ChatBadge>{};
+
+  /// BTTV badges (providerId -> ChatBadge).
+  @readonly
+  var _bttvBadges = <String, ChatBadge>{};
+
+  /// FFZ badges (userId to list of ChatBadge).
+  @readonly
+  var _ffzBadges = <String, List<ChatBadge>>{};
+
+  // ============= Computed Properties =============
+
+  /// All global emotes combined into a single map (name -> Emote).
+  @computed
+  Map<String, Emote> get globalEmoteMap {
+    final result = <String, Emote>{};
+    for (final emote in _twitchGlobalEmotes) {
+      result[emote.name] = emote;
+    }
+    for (final emote in _sevenTVGlobalEmotes) {
+      result[emote.name] = emote;
+    }
+    for (final emote in _bttvGlobalEmotes) {
+      result[emote.name] = emote;
+    }
+    for (final emote in _ffzGlobalEmotes) {
+      result[emote.name] = emote;
+    }
+    return result;
+  }
+
+  // ============= Methods =============
+
+  /// Ensures global assets are loaded. Safe to call multiple times.
+  /// Returns immediately if already loaded, or waits for in-progress load.
+  @action
+  Future<void> ensureLoaded({
+    bool showTwitchEmotes = true,
+    bool showTwitchBadges = true,
+    bool show7TVEmotes = true,
+    bool showBTTVEmotes = true,
+    bool showBTTVBadges = true,
+    bool showFFZEmotes = true,
+    bool showFFZBadges = true,
+  }) async {
+    // Already loaded - return immediately
+    if (_isLoaded) return;
+
+    // Currently loading - wait for existing operation
+    if (_isLoading && _loadingFuture != null) {
+      await _loadingFuture;
+      return;
+    }
+
+    // Start new load operation
+    _isLoading = true;
+    _loadingFuture = _fetchGlobalAssets(
+      showTwitchEmotes: showTwitchEmotes,
+      showTwitchBadges: showTwitchBadges,
+      show7TVEmotes: show7TVEmotes,
+      showBTTVEmotes: showBTTVEmotes,
+      showBTTVBadges: showBTTVBadges,
+      showFFZEmotes: showFFZEmotes,
+      showFFZBadges: showFFZBadges,
+    );
+
+    await _loadingFuture;
+    _isLoading = false;
+    _isLoaded = true;
+    _loadingFuture = null;
+  }
+
+  /// Force refresh global assets (e.g., when settings change).
+  @action
+  Future<void> refresh({
+    bool showTwitchEmotes = true,
+    bool showTwitchBadges = true,
+    bool show7TVEmotes = true,
+    bool showBTTVEmotes = true,
+    bool showBTTVBadges = true,
+    bool showFFZEmotes = true,
+    bool showFFZBadges = true,
+  }) async {
+    _isLoaded = false;
+    await ensureLoaded(
+      showTwitchEmotes: showTwitchEmotes,
+      showTwitchBadges: showTwitchBadges,
+      show7TVEmotes: show7TVEmotes,
+      showBTTVEmotes: showBTTVEmotes,
+      showBTTVBadges: showBTTVBadges,
+      showFFZEmotes: showFFZEmotes,
+      showFFZBadges: showFFZBadges,
+    );
+  }
+
+  @action
+  Future<void> _fetchGlobalAssets({
+    required bool showTwitchEmotes,
+    required bool showTwitchBadges,
+    required bool show7TVEmotes,
+    required bool showBTTVEmotes,
+    required bool showBTTVBadges,
+    required bool showFFZEmotes,
+    required bool showFFZBadges,
+  }) async {
+    void onAssetError(dynamic error, StackTrace stack) {
+      debugPrint('GlobalAssetsStore error: $error');
+      FirebaseCrashlytics.instance.recordError(
+        error,
+        stack,
+        reason: 'Global asset fetch failed',
+      );
+    }
+
+    await Future.wait([
+      // Twitch global emotes
+      if (showTwitchEmotes)
+        twitchApi
+            .getEmotesGlobal()
+            .then((emotes) => _twitchGlobalEmotes = emotes)
+            .catchError((e, StackTrace stack) {
+              onAssetError(e, stack);
+              _twitchGlobalEmotes = <Emote>[];
+              return _twitchGlobalEmotes;
+            }),
+      // 7TV global emotes
+      if (show7TVEmotes)
+        sevenTVApi
+            .getEmotesGlobal()
+            .then((emotes) => _sevenTVGlobalEmotes = emotes)
+            .catchError((e, StackTrace stack) {
+              onAssetError(e, stack);
+              _sevenTVGlobalEmotes = <Emote>[];
+              return _sevenTVGlobalEmotes;
+            }),
+      // BTTV global emotes
+      if (showBTTVEmotes)
+        bttvApi
+            .getEmotesGlobal()
+            .then((emotes) => _bttvGlobalEmotes = emotes)
+            .catchError((e, StackTrace stack) {
+              onAssetError(e, stack);
+              _bttvGlobalEmotes = <Emote>[];
+              return _bttvGlobalEmotes;
+            }),
+      // FFZ global emotes
+      if (showFFZEmotes)
+        ffzApi
+            .getEmotesGlobal()
+            .then((emotes) => _ffzGlobalEmotes = emotes)
+            .catchError((e, StackTrace stack) {
+              onAssetError(e, stack);
+              _ffzGlobalEmotes = <Emote>[];
+              return _ffzGlobalEmotes;
+            }),
+
+      // Twitch global badges
+      if (showTwitchBadges)
+        twitchApi
+            .getBadgesGlobal()
+            .then((badges) => _twitchGlobalBadges = badges)
+            .catchError((e, StackTrace stack) {
+              onAssetError(e, stack);
+              _twitchGlobalBadges = <String, ChatBadge>{};
+              return _twitchGlobalBadges;
+            }),
+      // BTTV badges (global - provider ID to badge mapping)
+      if (showBTTVBadges)
+        bttvApi.getBadges().then((badges) => _bttvBadges = badges).catchError((
+          e,
+          StackTrace stack,
+        ) {
+          onAssetError(e, stack);
+          _bttvBadges = <String, ChatBadge>{};
+          return _bttvBadges;
+        }),
+      // FFZ badges (global - user ID to badges mapping)
+      if (showFFZBadges)
+        ffzApi.getBadges().then((badges) => _ffzBadges = badges).catchError((
+          e,
+          StackTrace stack,
+        ) {
+          onAssetError(e, stack);
+          _ffzBadges = <String, List<ChatBadge>>{};
+          return _ffzBadges;
+        }),
+    ]);
+  }
+}
diff --git a/lib/stores/global_assets_store.g.dart b/lib/stores/global_assets_store.g.dart
new file mode 100644
index 00000000..e780cd98
--- /dev/null
+++ b/lib/stores/global_assets_store.g.dart
@@ -0,0 +1,295 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'global_assets_store.dart';
+
+// **************************************************************************
+// StoreGenerator
+// **************************************************************************
+
+// ignore_for_file: non_constant_identifier_names, unnecessary_brace_in_string_interps, unnecessary_lambdas, prefer_expression_function_bodies, lines_longer_than_80_chars, avoid_as, avoid_annotating_with_dynamic, no_leading_underscores_for_local_identifiers
+
+mixin _$GlobalAssetsStore on GlobalAssetsStoreBase, Store {
+  Computed<Map<String, Emote>>? _$globalEmoteMapComputed;
+
+  @override
+  Map<String, Emote> get globalEmoteMap =>
+      (_$globalEmoteMapComputed ??= Computed<Map<String, Emote>>(
+        () => super.globalEmoteMap,
+        name: 'GlobalAssetsStoreBase.globalEmoteMap',
+      )).value;
+
+  late final _$_isLoadedAtom = Atom(
+    name: 'GlobalAssetsStoreBase._isLoaded',
+    context: context,
+  );
+
+  bool get isLoaded {
+    _$_isLoadedAtom.reportRead();
+    return super._isLoaded;
+  }
+
+  @override
+  bool get _isLoaded => isLoaded;
+
+  @override
+  set _isLoaded(bool value) {
+    _$_isLoadedAtom.reportWrite(value, super._isLoaded, () {
+      super._isLoaded = value;
+    });
+  }
+
+  late final _$_isLoadingAtom = Atom(
+    name: 'GlobalAssetsStoreBase._isLoading',
+    context: context,
+  );
+
+  bool get isLoading {
+    _$_isLoadingAtom.reportRead();
+    return super._isLoading;
+  }
+
+  @override
+  bool get _isLoading => isLoading;
+
+  @override
+  set _isLoading(bool value) {
+    _$_isLoadingAtom.reportWrite(value, super._isLoading, () {
+      super._isLoading = value;
+    });
+  }
+
+  late final _$_twitchGlobalEmotesAtom = Atom(
+    name: 'GlobalAssetsStoreBase._twitchGlobalEmotes',
+    context: context,
+  );
+
+  List<Emote> get twitchGlobalEmotes {
+    _$_twitchGlobalEmotesAtom.reportRead();
+    return super._twitchGlobalEmotes;
+  }
+
+  @override
+  List<Emote> get _twitchGlobalEmotes => twitchGlobalEmotes;
+
+  @override
+  set _twitchGlobalEmotes(List<Emote> value) {
+    _$_twitchGlobalEmotesAtom.reportWrite(value, super._twitchGlobalEmotes, () {
+      super._twitchGlobalEmotes = value;
+    });
+  }
+
+  late final _$_sevenTVGlobalEmotesAtom = Atom(
+    name: 'GlobalAssetsStoreBase._sevenTVGlobalEmotes',
+    context: context,
+  );
+
+  List<Emote> get sevenTVGlobalEmotes {
+    _$_sevenTVGlobalEmotesAtom.reportRead();
+    return super._sevenTVGlobalEmotes;
+  }
+
+  @override
+  List<Emote> get _sevenTVGlobalEmotes => sevenTVGlobalEmotes;
+
+  @override
+  set _sevenTVGlobalEmotes(List<Emote> value) {
+    _$_sevenTVGlobalEmotesAtom.reportWrite(
+      value,
+      super._sevenTVGlobalEmotes,
+      () {
+        super._sevenTVGlobalEmotes = value;
+      },
+    );
+  }
+
+  late final _$_bttvGlobalEmotesAtom = Atom(
+    name: 'GlobalAssetsStoreBase._bttvGlobalEmotes',
+    context: context,
+  );
+
+  List<Emote> get bttvGlobalEmotes {
+    _$_bttvGlobalEmotesAtom.reportRead();
+    return super._bttvGlobalEmotes;
+  }
+
+  @override
+  List<Emote> get _bttvGlobalEmotes => bttvGlobalEmotes;
+
+  @override
+  set _bttvGlobalEmotes(List<Emote> value) {
+    _$_bttvGlobalEmotesAtom.reportWrite(value, super._bttvGlobalEmotes, () {
+      super._bttvGlobalEmotes = value;
+    });
+  }
+
+  late final _$_ffzGlobalEmotesAtom = Atom(
+    name: 'GlobalAssetsStoreBase._ffzGlobalEmotes',
+    context: context,
+  );
+
+  List<Emote> get ffzGlobalEmotes {
+    _$_ffzGlobalEmotesAtom.reportRead();
+    return super._ffzGlobalEmotes;
+  }
+
+  @override
+  List<Emote> get _ffzGlobalEmotes => ffzGlobalEmotes;
+
+  @override
+  set _ffzGlobalEmotes(List<Emote> value) {
+    _$_ffzGlobalEmotesAtom.reportWrite(value, super._ffzGlobalEmotes, () {
+      super._ffzGlobalEmotes = value;
+    });
+  }
+
+  late final _$_twitchGlobalBadgesAtom = Atom(
+    name: 'GlobalAssetsStoreBase._twitchGlobalBadges',
+    context: context,
+  );
+
+  Map<String, ChatBadge> get twitchGlobalBadges {
+    _$_twitchGlobalBadgesAtom.reportRead();
+    return super._twitchGlobalBadges;
+  }
+
+  @override
+  Map<String, ChatBadge> get _twitchGlobalBadges => twitchGlobalBadges;
+
+  @override
+  set _twitchGlobalBadges(Map<String, ChatBadge> value) {
+    _$_twitchGlobalBadgesAtom.reportWrite(value, super._twitchGlobalBadges, () {
+      super._twitchGlobalBadges = value;
+    });
+  }
+
+  late final _$_bttvBadgesAtom = Atom(
+    name: 'GlobalAssetsStoreBase._bttvBadges',
+    context: context,
+  );
+
+  Map<String, ChatBadge> get bttvBadges {
+    _$_bttvBadgesAtom.reportRead();
+    return super._bttvBadges;
+  }
+
+  @override
+  Map<String, ChatBadge> get _bttvBadges => bttvBadges;
+
+  @override
+  set _bttvBadges(Map<String, ChatBadge> value) {
+    _$_bttvBadgesAtom.reportWrite(value, super._bttvBadges, () {
+      super._bttvBadges = value;
+    });
+  }
+
+  late final _$_ffzBadgesAtom = Atom(
+    name: 'GlobalAssetsStoreBase._ffzBadges',
+    context: context,
+  );
+
+  Map<String, List<ChatBadge>> get ffzBadges {
+    _$_ffzBadgesAtom.reportRead();
+    return super._ffzBadges;
+  }
+
+  @override
+  Map<String, List<ChatBadge>> get _ffzBadges => ffzBadges;
+
+  @override
+  set _ffzBadges(Map<String, List<ChatBadge>> value) {
+    _$_ffzBadgesAtom.reportWrite(value, super._ffzBadges, () {
+      super._ffzBadges = value;
+    });
+  }
+
+  late final _$ensureLoadedAsyncAction = AsyncAction(
+    'GlobalAssetsStoreBase.ensureLoaded',
+    context: context,
+  );
+
+  @override
+  Future<void> ensureLoaded({
+    bool showTwitchEmotes = true,
+    bool showTwitchBadges = true,
+    bool show7TVEmotes = true,
+    bool showBTTVEmotes = true,
+    bool showBTTVBadges = true,
+    bool showFFZEmotes = true,
+    bool showFFZBadges = true,
+  }) {
+    return _$ensureLoadedAsyncAction.run(
+      () => super.ensureLoaded(
+        showTwitchEmotes: showTwitchEmotes,
+        showTwitchBadges: showTwitchBadges,
+        show7TVEmotes: show7TVEmotes,
+        showBTTVEmotes: showBTTVEmotes,
+        showBTTVBadges: showBTTVBadges,
+        showFFZEmotes: showFFZEmotes,
+        showFFZBadges: showFFZBadges,
+      ),
+    );
+  }
+
+  late final _$refreshAsyncAction = AsyncAction(
+    'GlobalAssetsStoreBase.refresh',
+    context: context,
+  );
+
+  @override
+  Future<void> refresh({
+    bool showTwitchEmotes = true,
+    bool showTwitchBadges = true,
+    bool show7TVEmotes = true,
+    bool showBTTVEmotes = true,
+    bool showBTTVBadges = true,
+    bool showFFZEmotes = true,
+    bool showFFZBadges = true,
+  }) {
+    return _$refreshAsyncAction.run(
+      () => super.refresh(
+        showTwitchEmotes: showTwitchEmotes,
+        showTwitchBadges: showTwitchBadges,
+        show7TVEmotes: show7TVEmotes,
+        showBTTVEmotes: showBTTVEmotes,
+        showBTTVBadges: showBTTVBadges,
+        showFFZEmotes: showFFZEmotes,
+        showFFZBadges: showFFZBadges,
+      ),
+    );
+  }
+
+  late final _$_fetchGlobalAssetsAsyncAction = AsyncAction(
+    'GlobalAssetsStoreBase._fetchGlobalAssets',
+    context: context,
+  );
+
+  @override
+  Future<void> _fetchGlobalAssets({
+    required bool showTwitchEmotes,
+    required bool showTwitchBadges,
+    required bool show7TVEmotes,
+    required bool showBTTVEmotes,
+    required bool showBTTVBadges,
+    required bool showFFZEmotes,
+    required bool showFFZBadges,
+  }) {
+    return _$_fetchGlobalAssetsAsyncAction.run(
+      () => super._fetchGlobalAssets(
+        showTwitchEmotes: showTwitchEmotes,
+        showTwitchBadges: showTwitchBadges,
+        show7TVEmotes: show7TVEmotes,
+        showBTTVEmotes: showBTTVEmotes,
+        showBTTVBadges: showBTTVBadges,
+        showFFZEmotes: showFFZEmotes,
+        showFFZBadges: showFFZBadges,
+      ),
+    );
+  }
+
+  @override
+  String toString() {
+    return '''
+globalEmoteMap: ${globalEmoteMap}
+    ''';
+  }
+}
diff --git a/lib/theme.dart b/lib/theme.dart
new file mode 100644
index 00000000..19eb4f80
--- /dev/null
+++ b/lib/theme.dart
@@ -0,0 +1,310 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+
+/// Shared shadow for overlay controls and text on top of video content.
+const kOverlayShadow = [
+  Shadow(
+    offset: Offset(0, 1),
+    blurRadius: 4,
+    color: Color.fromRGBO(0, 0, 0, 0.3),
+  ),
+];
+
+/// App-specific semantic colors that extend Material's [ColorScheme].
+///
+/// Colors that map to Material 3 roles use [ColorScheme] directly:
+/// - Links → [ColorScheme.primary]
+/// - Mentions → [ColorScheme.error]
+/// - First-time chatters → [ColorScheme.tertiary]
+///
+/// Access via `Theme.of(context).extension<FrostyColors>()!` or the
+/// `context.frostyColors` convenience extension.
+class FrostyColors extends ThemeExtension<FrostyColors> {
+  final Color highlightedMessage;
+  final Color emoteOnly;
+  final Color followersOnly;
+  final Color slowMode;
+  final Color subOnly;
+  final Color uniqueMode;
+  final Color overlayOnSurface;
+
+  const FrostyColors({
+    required this.highlightedMessage,
+    required this.emoteOnly,
+    required this.followersOnly,
+    required this.slowMode,
+    required this.subOnly,
+    required this.uniqueMode,
+    required this.overlayOnSurface,
+  });
+
+  static FrostyColors light({required ColorScheme colorScheme}) => FrostyColors(
+    highlightedMessage: colorScheme.primary,
+    emoteOnly: const Color(0xFFFFB74D),
+    followersOnly: const Color(0xFFF44336),
+    slowMode: const Color(0xFF2196F3),
+    subOnly: const Color(0xFF4CAF50),
+    uniqueMode: const Color(0xFFAB47BC),
+    overlayOnSurface: Colors.white,
+  );
+
+  static FrostyColors dark({required ColorScheme colorScheme}) => FrostyColors(
+    highlightedMessage: colorScheme.primary,
+    emoteOnly: const Color(0xFFFFCC80),
+    followersOnly: const Color(0xFFE57373),
+    slowMode: const Color(0xFF64B5F6),
+    subOnly: const Color(0xFF81C784),
+    uniqueMode: const Color(0xFFBA68C8),
+    overlayOnSurface: Colors.white,
+  );
+
+  @override
+  FrostyColors copyWith({
+    Color? highlightedMessage,
+    Color? emoteOnly,
+    Color? followersOnly,
+    Color? slowMode,
+    Color? subOnly,
+    Color? uniqueMode,
+    Color? overlayOnSurface,
+  }) {
+    return FrostyColors(
+      highlightedMessage: highlightedMessage ?? this.highlightedMessage,
+      emoteOnly: emoteOnly ?? this.emoteOnly,
+      followersOnly: followersOnly ?? this.followersOnly,
+      slowMode: slowMode ?? this.slowMode,
+      subOnly: subOnly ?? this.subOnly,
+      uniqueMode: uniqueMode ?? this.uniqueMode,
+      overlayOnSurface: overlayOnSurface ?? this.overlayOnSurface,
+    );
+  }
+
+  @override
+  FrostyColors lerp(FrostyColors? other, double t) {
+    if (other is! FrostyColors) return this;
+    return FrostyColors(
+      highlightedMessage: Color.lerp(highlightedMessage, other.highlightedMessage, t)!,
+      emoteOnly: Color.lerp(emoteOnly, other.emoteOnly, t)!,
+      followersOnly: Color.lerp(followersOnly, other.followersOnly, t)!,
+      slowMode: Color.lerp(slowMode, other.slowMode, t)!,
+      subOnly: Color.lerp(subOnly, other.subOnly, t)!,
+      uniqueMode: Color.lerp(uniqueMode, other.uniqueMode, t)!,
+      overlayOnSurface: Color.lerp(overlayOnSurface, other.overlayOnSurface, t)!,
+    );
+  }
+}
+
+class FrostyThemes {
+  final Color colorSchemeSeed;
+
+  const FrostyThemes({required this.colorSchemeSeed});
+
+  ThemeData get light => createBaseTheme(
+    colorScheme: ColorScheme.fromSeed(seedColor: colorSchemeSeed),
+    backgroundColor: const Color.fromRGBO(248, 248, 248, 1),
+  );
+
+  ThemeData get dark => createBaseTheme(
+    colorScheme: ColorScheme.fromSeed(
+      seedColor: colorSchemeSeed,
+      brightness: Brightness.dark,
+    ),
+    backgroundColor: Colors.black,
+  );
+
+  ThemeData createBaseTheme({
+    required ColorScheme colorScheme,
+    Color? backgroundColor,
+  }) {
+    final borderColor = colorScheme.outlineVariant.withValues(alpha: 0.5);
+
+    const borderWidth = 0.5;
+
+    return ThemeData(
+      extensions: [
+        colorScheme.brightness == Brightness.dark
+            ? FrostyColors.dark(colorScheme: colorScheme)
+            : FrostyColors.light(colorScheme: colorScheme),
+      ],
+      colorScheme: colorScheme,
+      fontFamily: 'Inter',
+      splashFactory: Platform.isIOS ? NoSplash.splashFactory : null,
+      textSelectionTheme: TextSelectionThemeData(
+        cursorColor: colorScheme.primary,
+        selectionColor: colorScheme.primary.withValues(alpha: 0.3),
+        selectionHandleColor: colorScheme.primary,
+      ),
+      scaffoldBackgroundColor: backgroundColor,
+      bottomSheetTheme: BottomSheetThemeData(
+        showDragHandle: true,
+        backgroundColor: backgroundColor,
+        surfaceTintColor: backgroundColor,
+      ),
+      menuTheme: MenuThemeData(
+        style: MenuStyle(
+          padding: const WidgetStatePropertyAll(
+            EdgeInsets.symmetric(vertical: 2),
+          ),
+          shape: WidgetStatePropertyAll(
+            RoundedRectangleBorder(
+              borderRadius: const BorderRadius.all(Radius.circular(12)),
+              side: BorderSide(color: borderColor),
+            ),
+          ),
+        ),
+      ),
+      menuButtonTheme: MenuButtonThemeData(
+        style: MenuItemButton.styleFrom(
+          visualDensity: VisualDensity.compact,
+          minimumSize: const Size(0, 40),
+          padding: const EdgeInsets.symmetric(horizontal: 12),
+          tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+        ),
+      ),
+      dialogTheme: DialogThemeData(
+        backgroundColor: backgroundColor,
+        surfaceTintColor: backgroundColor,
+        shape: RoundedRectangleBorder(
+          borderRadius: const BorderRadius.all(Radius.circular(16)),
+          side: BorderSide(color: borderColor),
+        ),
+      ),
+      appBarTheme: AppBarTheme(
+        elevation: 0,
+        backgroundColor: backgroundColor,
+        surfaceTintColor: backgroundColor,
+        titleSpacing: 0,
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+        filled: true,
+        fillColor: colorScheme.surfaceContainerHighest.withValues(alpha: 0.6),
+        hintStyle: TextStyle(
+          color: colorScheme.onSurfaceVariant,
+          fontWeight: FontWeight.normal,
+        ),
+        border: OutlineInputBorder(
+          borderRadius: const BorderRadius.all(Radius.circular(100)),
+          borderSide: BorderSide.none,
+        ),
+        enabledBorder: OutlineInputBorder(
+          borderRadius: const BorderRadius.all(Radius.circular(100)),
+          borderSide: BorderSide.none,
+        ),
+        disabledBorder: OutlineInputBorder(
+          borderRadius: const BorderRadius.all(Radius.circular(100)),
+          borderSide: BorderSide.none,
+        ),
+        focusedBorder: OutlineInputBorder(
+          borderRadius: const BorderRadius.all(Radius.circular(100)),
+          borderSide: BorderSide(
+            color: colorScheme.primary.withValues(alpha: 0.8),
+            width: 1.5,
+          ),
+        ),
+      ),
+      listTileTheme: ListTileThemeData(
+        titleTextStyle: TextStyle(
+          color: colorScheme.onSurface,
+          fontSize: 15,
+          fontWeight: FontWeight.w500,
+          letterSpacing: -0.011,
+          height: 1.5,
+        ),
+        subtitleTextStyle: TextStyle(
+          color: colorScheme.onSurfaceVariant.withValues(alpha: 0.7),
+          fontSize: 13,
+          height: 1.4,
+        ),
+        leadingAndTrailingTextStyle: TextStyle(
+          color: colorScheme.onSurfaceVariant.withValues(alpha: 0.6),
+        ),
+      ),
+      navigationBarTheme: NavigationBarThemeData(
+        elevation: 0,
+        backgroundColor: backgroundColor,
+        height: 64,
+        labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
+        indicatorColor: Colors.transparent,
+        indicatorShape: const CircleBorder(),
+        overlayColor: const WidgetStatePropertyAll(Colors.transparent),
+      ),
+      tabBarTheme: const TabBarThemeData(
+        dividerColor: Colors.transparent,
+        tabAlignment: TabAlignment.start,
+      ),
+      tooltipTheme: TooltipThemeData(
+        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+        showDuration: const Duration(seconds: 2),
+        decoration: BoxDecoration(
+          color: colorScheme.surface,
+          borderRadius: const BorderRadius.all(Radius.circular(12)),
+          border: Border.all(color: borderColor),
+        ),
+        textStyle: TextStyle(color: colorScheme.onSurface),
+      ),
+      snackBarTheme: SnackBarThemeData(
+        showCloseIcon: true,
+        backgroundColor: backgroundColor,
+        shape: RoundedRectangleBorder(
+          side: BorderSide(color: borderColor),
+          borderRadius: const BorderRadius.all(Radius.circular(12)),
+        ),
+        behavior: SnackBarBehavior.floating,
+      ),
+      dividerTheme: DividerThemeData(
+        thickness: borderWidth,
+        space: borderWidth,
+        color: borderColor,
+      ),
+      textTheme: TextTheme(
+        // Alert dialog title
+        headlineSmall: TextStyle(
+          fontSize: 18,
+          fontWeight: FontWeight.w600,
+          letterSpacing: -0.019,
+        ),
+
+        // App bar title
+        titleLarge: TextStyle(
+          fontSize: 24,
+          fontWeight: FontWeight.w600,
+          letterSpacing: -0.019,
+        ),
+
+        // Section titles
+        titleMedium: TextStyle(
+          fontWeight: FontWeight.w600,
+          letterSpacing: -0.011,
+        ),
+
+        // Tab bar title
+        titleSmall: TextStyle(
+          fontSize: 16,
+          fontWeight: FontWeight.w600,
+          letterSpacing: -0.011,
+        ),
+
+        // Labels
+        labelLarge: TextStyle(
+          fontWeight: FontWeight.w500,
+          letterSpacing: -0.006,
+        ),
+        labelMedium: TextStyle(fontWeight: FontWeight.w500, letterSpacing: 0),
+        labelSmall: TextStyle(
+          fontWeight: FontWeight.w500,
+          letterSpacing: 0.005,
+        ),
+
+        // Body text
+        bodyLarge: TextStyle(
+          fontWeight: FontWeight.w500,
+          letterSpacing: -0.011,
+        ),
+        bodyMedium: TextStyle(letterSpacing: -0.006),
+        bodySmall: TextStyle(letterSpacing: 0),
+      ),
+    );
+  }
+}
diff --git a/lib/utils.dart b/lib/utils.dart
new file mode 100644
index 00000000..f0b35278
--- /dev/null
+++ b/lib/utils.dart
@@ -0,0 +1,122 @@
+import 'dart:io';
+import 'dart:math' as math;
+
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:flutter/material.dart';
+import 'package:frosty/constants.dart';
+
+// --- Contrast helpers ---
+double _linearize(double c) =>
+    c <= 0.03928 ? c / 12.92 : math.pow((c + 0.055) / 1.055, 2.4).toDouble();
+
+double _relativeLuminance(Color c) {
+  final r = _linearize(c.r);
+  final g = _linearize(c.g);
+  final b = _linearize(c.b);
+  return 0.2126 * r + 0.7152 * g + 0.0722 * b;
+}
+
+double _contrastRatio(Color a, Color b) {
+  final l1 = _relativeLuminance(a);
+  final l2 = _relativeLuminance(b);
+  final hi = l1 > l2 ? l1 : l2;
+  final lo = l1 > l2 ? l2 : l1;
+  return (hi + 0.05) / (lo + 0.05);
+}
+
+/// Adjusts [color] just enough to reach [targetContrast] on the app's background.
+/// Defaults to Theme.of(context).scaffoldBackgroundColor; if transparent, falls
+/// back to theme.colorScheme.surface.
+///
+/// For normal-size text use 4.5; for large/bold labels you can pass 3.0.
+Color adjustChatNameColor(
+  BuildContext context,
+  Color color, {
+  Color? background,
+  double targetContrast = 4.5,
+}) {
+  final theme = Theme.of(context);
+
+  // Pick background: scaffoldBackgroundColor -> surface (if scaffold is transparent).
+  Color bg = background ?? theme.scaffoldBackgroundColor;
+  if (bg.a == 0.0) {
+    // Some themes leave scaffold transparent and paint surfaces; use surface then.
+    bg = theme.colorScheme.surface;
+  }
+
+  if (_contrastRatio(color, bg) >= targetContrast) return color;
+
+  final hsl0 = HSLColor.fromColor(color);
+  final bool darkBg = _relativeLuminance(bg) < 0.5;
+
+  // Binary search lightness toward the needed extreme with gentle sat easing.
+  double lo = darkBg ? hsl0.lightness : 0.0;
+  double hi = darkBg ? 1.0 : hsl0.lightness;
+  double bestL = hsl0.lightness;
+
+  for (int i = 0; i < 16; i++) {
+    final mid = (lo + hi) / 2.0;
+    final t = (mid - 0.5).abs() * 2; // 0..1 near ends
+    final easedSat = (hsl0.saturation * (1 - 0.25 * t * t)).clamp(0.0, 1.0);
+    final candidate = hsl0
+        .withLightness(mid)
+        .withSaturation(easedSat)
+        .toColor();
+
+    if (_contrastRatio(candidate, bg) >= targetContrast) {
+      bestL = mid;
+      if (darkBg) {
+        hi = mid; // go brighter, but keep minimal change
+      } else {
+        lo = mid; // go darker
+      }
+    } else {
+      if (darkBg) {
+        lo = mid;
+      } else {
+        hi = mid;
+      }
+    }
+  }
+
+  final t = (bestL - 0.5).abs() * 2;
+  final easedSat = (hsl0.saturation * (1 - 0.25 * t * t)).clamp(0.0, 1.0);
+  return hsl0.withLightness(bestL).withSaturation(easedSat).toColor();
+}
+
+String getReadableName(String displayName, String username) {
+  // If display name equals username, don't add redundant parentheses
+  if (displayName == username) {
+    return displayName;
+  }
+
+  // If display name contains only digits, don't add username
+  if (regexNumbersOnly.hasMatch(displayName)) {
+    return displayName;
+  }
+
+  // If display name contains English letters, don't add username
+  if (regexEnglish.hasMatch(displayName)) {
+    return displayName;
+  }
+
+  // Otherwise (non-English characters, possibly with numbers), add username
+  return '$displayName ($username)';
+}
+
+var _isIPad = false;
+
+bool isIPad() {
+  return _isIPad;
+}
+
+Future<void> initUtils() async {
+  // Determine whether the device is an iPad or not.
+  if (Platform.isIOS) {
+    final deviceInfo = DeviceInfoPlugin();
+    final info = await deviceInfo.iosInfo;
+    if (info.model.toLowerCase().contains('ipad')) {
+      _isIPad = true;
+    }
+  }
+}
diff --git a/lib/utils/context_extensions.dart b/lib/utils/context_extensions.dart
new file mode 100644
index 00000000..f666821a
--- /dev/null
+++ b/lib/utils/context_extensions.dart
@@ -0,0 +1,109 @@
+import 'package:flutter/material.dart';
+import 'package:frosty/apis/bttv_api.dart';
+import 'package:frosty/apis/ffz_api.dart';
+import 'package:frosty/apis/seventv_api.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/stores/global_assets_store.dart';
+import 'package:frosty/theme.dart';
+import 'package:provider/provider.dart';
+
+/// Static utility class for orientation-related operations
+class OrientationUtils {
+  /// Gets the current orientation from the given context
+  static Orientation getCurrentOrientation(BuildContext context) {
+    return MediaQuery.orientationOf(context);
+  }
+
+  /// Returns true if the current orientation is portrait
+  static bool isPortrait(BuildContext context) {
+    return MediaQuery.orientationOf(context) == Orientation.portrait;
+  }
+
+  /// Returns true if the current orientation is landscape
+  static bool isLandscape(BuildContext context) {
+    return MediaQuery.orientationOf(context) == Orientation.landscape;
+  }
+}
+
+/// Comprehensive context extensions for common Flutter patterns
+extension ContextExtensions on BuildContext {
+  // ===== THEME & STYLING =====
+
+  /// Gets the current theme
+  ThemeData get theme => Theme.of(this);
+
+  /// Gets the current color scheme
+  ColorScheme get colorScheme => Theme.of(this).colorScheme;
+
+  /// Gets the current text theme
+  TextTheme get textTheme => Theme.of(this).textTheme;
+
+  /// Gets the scaffold background color
+  Color get scaffoldColor => Theme.of(this).scaffoldBackgroundColor;
+
+  /// Gets body small text color (commonly used for secondary text)
+  Color? get bodySmallColor => Theme.of(this).textTheme.bodySmall?.color;
+
+  /// Gets the app's custom semantic colors
+  FrostyColors get frostyColors => Theme.of(this).extension<FrostyColors>()!;
+
+  /// Gets the default text style
+  TextStyle get defaultTextStyle => DefaultTextStyle.of(this).style;
+
+  // ===== SCREEN & LAYOUT =====
+
+  /// Gets the screen width
+  double get screenWidth => MediaQuery.sizeOf(this).width;
+
+  /// Gets the screen height
+  double get screenHeight => MediaQuery.sizeOf(this).height;
+
+  /// Gets the safe area padding top (commonly used)
+  double get safePaddingTop => MediaQuery.paddingOf(this).top;
+
+  /// Gets the safe area padding bottom (commonly used)
+  double get safePaddingBottom => MediaQuery.paddingOf(this).bottom;
+
+  // ===== PROVIDER ACCESS =====
+
+  /// Gets TwitchApi from provider
+  TwitchApi get twitchApi => read<TwitchApi>();
+
+  /// Gets TwitchGqlApi from provider
+  TwitchGqlApi get twitchGqlApi => read<TwitchGqlApi>();
+
+  /// Gets AuthStore from provider
+  AuthStore get authStore => read<AuthStore>();
+
+  /// Gets SettingsStore from provider
+  SettingsStore get settingsStore => read<SettingsStore>();
+
+  /// Gets FFZApi from provider
+  FFZApi get ffzApi => read<FFZApi>();
+
+  /// Gets BTTVApi from provider
+  BTTVApi get bttvApi => read<BTTVApi>();
+
+  /// Gets SevenTVApi from provider
+  SevenTVApi get sevenTVApi => read<SevenTVApi>();
+
+  /// Gets GlobalAssetsStore from provider
+  GlobalAssetsStore get globalAssetsStore => read<GlobalAssetsStore>();
+
+  // ===== ORIENTATION =====
+
+  /// Returns true if currently in portrait orientation
+  bool get isPortrait => OrientationUtils.isPortrait(this);
+
+  /// Returns true if currently in landscape orientation
+  bool get isLandscape => OrientationUtils.isLandscape(this);
+}
+
+/// TextScaler extensions for common scaling operations
+extension TextScalerExtensions on double {
+  /// Creates a linear text scaler with this scale factor
+  TextScaler get textScaler => TextScaler.linear(this);
+}
diff --git a/lib/utils/modal_bottom_sheet.dart b/lib/utils/modal_bottom_sheet.dart
new file mode 100644
index 00000000..9dcd33dd
--- /dev/null
+++ b/lib/utils/modal_bottom_sheet.dart
@@ -0,0 +1,49 @@
+import 'package:flutter/material.dart';
+
+/// Shows a modal bottom sheet that properly handles focus restoration.
+///
+/// This prevents Flutter from automatically restoring focus to text fields
+/// after the sheet is dismissed by clearing the focus scope before opening.
+Future<T?> showModalBottomSheetWithProperFocus<T>({
+  required BuildContext context,
+  required WidgetBuilder builder,
+  bool isScrollControlled = false,
+  bool useRootNavigator = false,
+  bool isDismissible = true,
+  bool enableDrag = true,
+  Color? backgroundColor,
+  double? elevation,
+  ShapeBorder? shape,
+  Clip? clipBehavior,
+  BoxConstraints? constraints,
+  Color? barrierColor,
+  String? barrierLabel,
+  AnimationController? transitionAnimationController,
+  Offset? anchorPoint,
+}) {
+  // Clear focus and its history so it can't be auto-restored
+  FocusScope.of(context).unfocus();
+
+  return showModalBottomSheet<T>(
+    context: context,
+    builder: builder,
+    isScrollControlled: isScrollControlled,
+    useRootNavigator: useRootNavigator,
+    isDismissible: isDismissible,
+    enableDrag: enableDrag,
+    backgroundColor: backgroundColor,
+    elevation: elevation,
+    shape: shape,
+    clipBehavior: clipBehavior,
+    constraints: constraints,
+    barrierColor: barrierColor,
+    barrierLabel: barrierLabel,
+    transitionAnimationController: transitionAnimationController,
+    anchorPoint: anchorPoint,
+  ).whenComplete(() {
+    // Additional safety: clear any focus that might have been restored
+    if (context.mounted) {
+      FocusManager.instance.primaryFocus?.unfocus();
+    }
+  });
+}
diff --git a/lib/utils/twitch_oauth_scopes.dart b/lib/utils/twitch_oauth_scopes.dart
new file mode 100644
index 00000000..8e0677f9
--- /dev/null
+++ b/lib/utils/twitch_oauth_scopes.dart
@@ -0,0 +1,94 @@
+/// Core OAuth scopes Frosty requests on a normal Twitch login.
+///
+/// Matches the pre-moderator-tools set so existing tokens remain valid without
+/// a re-consent nag for non-moderators.
+const twitchUserScopes = <String>[
+  'chat:read',
+  'chat:edit',
+  'user:read:follows',
+  'user:read:blocked_users',
+  'user:manage:blocked_users',
+  'user:manage:chat_color',
+];
+
+/// Moderator-only scopes requested via an explicit opt-in upgrade.
+const twitchModeratorScopes = <String>[
+  'user:read:moderated_channels',
+  'moderator:manage:chat_messages',
+  'moderator:manage:banned_users',
+];
+
+/// Core + moderator scopes for an opted-in moderator session.
+const twitchAllUserScopes = <String>[
+  ...twitchUserScopes,
+  ...twitchModeratorScopes,
+];
+
+/// Space-separated scope string for Twitch's authorize URL (core only).
+String get twitchUserScopeQuery => twitchUserScopes.join(' ');
+
+/// Space-separated scope string for Twitch's authorize URL (core + mod).
+String get twitchAllUserScopeQuery => twitchAllUserScopes.join(' ');
+
+/// Human-readable labels for Frosty-requested scopes.
+const twitchScopeLabels = <String, String>{
+  'chat:read': 'Read chat messages',
+  'chat:edit': 'Send chat messages',
+  'user:read:follows': 'View followed channels',
+  'user:read:blocked_users': 'View blocked users',
+  'user:manage:blocked_users': 'Block and unblock users',
+  'user:manage:chat_color': 'Change chat name color',
+  'user:read:moderated_channels': 'View channels you moderate',
+  'moderator:manage:chat_messages': 'Delete chat messages as a moderator',
+  'moderator:manage:banned_users': 'Timeout and ban users as a moderator',
+};
+
+/// Whether [granted] includes every moderator scope Frosty needs.
+bool hasModeratorScopes(Iterable<String> granted) =>
+    missingTwitchScopes(
+      granted: granted,
+      required: twitchModeratorScopes,
+    ).isEmpty;
+
+/// Scopes in [required] that are not present in [granted].
+List<String> missingTwitchScopes({
+  required Iterable<String> granted,
+  Iterable<String> required = twitchUserScopes,
+}) {
+  final grantedSet = granted.toSet();
+  return required.where((scope) => !grantedSet.contains(scope)).toList();
+}
+
+String _scopeBullets(Iterable<String> scopes) => scopes
+    .map((scope) => '• ${twitchScopeLabels[scope] ?? scope}')
+    .join('\n');
+
+/// Dialog body for a Twitch Helix/OAuth 401 on a core (non-mod) request.
+///
+/// Missing-permissions copy only lists **core** scopes. A token that already
+/// has core scopes is treated as expired/invalid rather than "missing mod
+/// permissions" so non-mods are never nagged about moderator consent.
+String unauthorizedDialogMessage({
+  required bool isLoggedIn,
+  required Iterable<String> grantedScopes,
+}) {
+  if (!isLoggedIn) {
+    return 'Your session has expired. Please log in again to continue.';
+  }
+
+  final missing = missingTwitchScopes(granted: grantedScopes);
+  if (missing.isEmpty) {
+    return 'Your session has expired. Please log in again to continue.';
+  }
+
+  return 'Frosty needs additional Twitch permissions:\n\n'
+      '${_scopeBullets(missing)}\n\n'
+      'Log in again to grant them.';
+}
+
+/// Copy for the explicit moderator-tools opt-in dialog.
+String enableModeratorToolsDialogMessage() {
+  return 'Enable moderator tools to manage chat in channels you moderate:\n\n'
+      '${_scopeBullets(twitchModeratorScopes)}\n\n'
+      'You will be asked to authorize these permissions with Twitch.';
+}
diff --git a/lib/widgets/accent_color_picker_dialog.dart b/lib/widgets/accent_color_picker_dialog.dart
new file mode 100644
index 00000000..5c97b3ac
--- /dev/null
+++ b/lib/widgets/accent_color_picker_dialog.dart
@@ -0,0 +1,88 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_colorpicker/flutter_colorpicker.dart';
+import 'package:frosty/widgets/frosty_dialog.dart';
+
+class AccentColorPickerDialog extends StatefulWidget {
+  final Color initialColor;
+  final ValueChanged<Color> onColorChanged;
+
+  const AccentColorPickerDialog({
+    super.key,
+    required this.initialColor,
+    required this.onColorChanged,
+  });
+
+  @override
+  State<AccentColorPickerDialog> createState() =>
+      _AccentColorPickerDialogState();
+}
+
+class _AccentColorPickerDialogState extends State<AccentColorPickerDialog> {
+  late Color currentColor;
+
+  @override
+  void initState() {
+    super.initState();
+    currentColor = widget.initialColor;
+  }
+
+  void _generateRandomColor() {
+    HapticFeedback.lightImpact();
+    final random = Random();
+    final newColor = Color.fromARGB(
+      255,
+      random.nextInt(256),
+      random.nextInt(256),
+      random.nextInt(256),
+    );
+    setState(() => currentColor = newColor);
+    widget.onColorChanged(newColor);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FrostyDialog(
+      title: 'Accent color',
+      content: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            ColorPicker(
+              pickerColor: currentColor,
+              onColorChanged: (newColor) {
+                setState(() => currentColor = newColor);
+                widget.onColorChanged(newColor);
+              },
+              enableAlpha: false,
+              pickerAreaBorderRadius: const BorderRadius.all(
+                Radius.circular(8),
+              ),
+              labelTypes: const [],
+            ),
+            SizedBox(
+              width: double.infinity,
+              child: FilledButton.tonalIcon(
+                icon: const Icon(Icons.casino_rounded),
+                onPressed: _generateRandomColor,
+                label: const Text('Random'),
+              ),
+            ),
+          ],
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.pop(context),
+          child: const Text('Cancel'),
+        ),
+        FilledButton(
+          onPressed: () => Navigator.pop(context),
+          child: const Text('Done'),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/accent_color_setting.dart b/lib/widgets/accent_color_setting.dart
new file mode 100644
index 00000000..fb7201f5
--- /dev/null
+++ b/lib/widgets/accent_color_setting.dart
@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/widgets/accent_color_picker_dialog.dart';
+
+class AccentColorSetting extends StatelessWidget {
+  final SettingsStore settingsStore;
+
+  const AccentColorSetting({super.key, required this.settingsStore});
+
+  @override
+  Widget build(BuildContext context) {
+    return Observer(
+      builder: (context) => ListTile(
+        title: const Text('Accent color'),
+        trailing: IconButton(
+          icon: DecoratedBox(
+            position: DecorationPosition.foreground,
+            decoration: BoxDecoration(
+              shape: BoxShape.circle,
+              border: Border.all(
+                color: Theme.of(context).colorScheme.onSurface,
+                width: 2,
+              ),
+            ),
+            child: CircleAvatar(
+              backgroundColor: Color(settingsStore.accentColor),
+              radius: 16,
+            ),
+          ),
+          onPressed: () {
+            showDialog(
+              context: context,
+              builder: (context) => AccentColorPickerDialog(
+                initialColor: Color(settingsStore.accentColor),
+                onColorChanged: (newColor) =>
+                    settingsStore.accentColor = newColor.toARGB32(),
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/alert_message.dart b/lib/widgets/alert_message.dart
index 295fe84d..71eadc54 100644
--- a/lib/widgets/alert_message.dart
+++ b/lib/widgets/alert_message.dart
@@ -4,33 +4,79 @@ import 'package:flutter/material.dart';
 class AlertMessage extends StatelessWidget {
   final String message;
   final Color? color;
+  final bool centered;
+  final EdgeInsetsGeometry? padding;
+  final bool vertical;
+  final IconData? trailingIcon;
+  final VoidCallback? onTrailingIconPressed;
 
   const AlertMessage({
-    Key? key,
+    super.key,
     required this.message,
+    this.centered = true,
     this.color,
-  }) : super(key: key);
+    this.padding,
+    this.vertical = false,
+    this.trailingIcon,
+    this.onTrailingIconPressed,
+  });
 
   @override
   Widget build(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        Icon(
-          Icons.info_outline_rounded,
-          color: color ?? Colors.grey,
-        ),
-        const SizedBox(width: 5.0),
-        Flexible(
-          child: Text(
+    final colorScheme = Theme.of(context).colorScheme;
+    final defaultColor =
+        vertical ? colorScheme.onSurfaceVariant : colorScheme.onSurface;
+
+    final Widget widget;
+
+    if (vertical) {
+      widget = Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        mainAxisSize: MainAxisSize.min,
+        spacing: 8,
+        children: [
+          Icon(Icons.info_outline_rounded, color: color ?? defaultColor),
+          Text(
             message,
-            style: TextStyle(
-              fontWeight: FontWeight.w500,
-              color: color ?? Colors.grey,
+            textAlign: centered ? TextAlign.center : TextAlign.start,
+            style: TextStyle(color: color ?? defaultColor),
+          ),
+        ],
+      );
+    } else {
+      widget = Row(
+        mainAxisAlignment: centered
+            ? MainAxisAlignment.center
+            : MainAxisAlignment.start,
+        spacing: 8,
+        children: [
+          Icon(Icons.info_outline_rounded, color: color ?? defaultColor),
+          Flexible(
+            child: Text(
+              message,
+              style: TextStyle(color: color ?? defaultColor),
             ),
           ),
-        ),
-      ],
-    );
+          if (trailingIcon != null) ...[
+            const SizedBox(width: 8),
+            IconButton(
+              icon: Icon(trailingIcon, color: color ?? defaultColor),
+              onPressed: onTrailingIconPressed,
+              padding: EdgeInsets.zero,
+              constraints: const BoxConstraints(),
+              iconSize: 20,
+            ),
+          ],
+        ],
+      );
+    }
+
+    final effectivePadding =
+        padding ??
+        (vertical ? const EdgeInsets.symmetric(horizontal: 24) : null);
+
+    return effectivePadding != null
+        ? Padding(padding: effectivePadding, child: widget)
+        : widget;
   }
 }
diff --git a/lib/widgets/animate_scale.dart b/lib/widgets/animate_scale.dart
deleted file mode 100644
index 00d154c4..00000000
--- a/lib/widgets/animate_scale.dart
+++ /dev/null
@@ -1,67 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// A widget than animates its scale when tapped/held on.
-class AnimateScale extends StatefulWidget {
-  final void Function()? onTap;
-  final void Function()? onLongPress;
-  final Widget child;
-
-  const AnimateScale({
-    Key? key,
-    this.onTap,
-    this.onLongPress,
-    required this.child,
-  }) : super(key: key);
-
-  @override
-  State<AnimateScale> createState() => _AnimateScaleState();
-}
-
-class _AnimateScaleState extends State<AnimateScale>
-    with SingleTickerProviderStateMixin {
-  late final _animationController = AnimationController(
-    vsync: this,
-    upperBound: 0.05,
-  );
-
-  @override
-  Widget build(BuildContext context) {
-    const duration = Duration(milliseconds: 200);
-    const downCurve = Curves.easeOut;
-    const upCurve = Curves.easeIn;
-
-    return InkWell(
-      onTap: widget.onTap,
-      onTapDown: (_) => _animationController.animateTo(
-        _animationController.upperBound,
-        curve: downCurve,
-        duration: duration,
-      ),
-      onLongPress: widget.onLongPress,
-      onTapUp: (_) => _animationController.animateTo(
-        _animationController.lowerBound,
-        curve: upCurve,
-        duration: duration,
-      ),
-      onTapCancel: () => _animationController.animateTo(
-        _animationController.lowerBound,
-        curve: upCurve,
-        duration: duration,
-      ),
-      child: AnimatedBuilder(
-        animation: _animationController,
-        child: widget.child,
-        builder: (context, child) => Transform.scale(
-          scale: 1 - _animationController.value,
-          child: child,
-        ),
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
-}
diff --git a/lib/widgets/animated_scroll_border.dart b/lib/widgets/animated_scroll_border.dart
new file mode 100644
index 00000000..500817d4
--- /dev/null
+++ b/lib/widgets/animated_scroll_border.dart
@@ -0,0 +1,152 @@
+import 'package:flutter/material.dart';
+
+enum ScrollBorderPosition { top, bottom }
+
+class AnimatedScrollBorder extends StatefulWidget {
+  final ScrollController scrollController;
+  final ScrollBorderPosition position;
+  final bool isReversed; // For lists with reverse: true
+
+  const AnimatedScrollBorder({
+    super.key,
+    required this.scrollController,
+    this.position = ScrollBorderPosition.top,
+    this.isReversed = false,
+  });
+
+  @override
+  State<AnimatedScrollBorder> createState() => _AnimatedScrollBorderState();
+}
+
+class _AnimatedScrollBorderState extends State<AnimatedScrollBorder> {
+  bool _shouldShowBorder = false;
+
+  @override
+  void initState() {
+    super.initState();
+    // Default to visible for bottom borders until we know we're at the end
+    if (widget.position == ScrollBorderPosition.bottom) {
+      _shouldShowBorder = true;
+    }
+    widget.scrollController.addListener(_updateScrollState);
+    _updateScrollState(); // Initial check
+    // Also check after a frame to ensure scroll controller is attached
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _updateScrollState();
+    });
+  }
+
+  @override
+  void didUpdateWidget(AnimatedScrollBorder oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.scrollController != oldWidget.scrollController) {
+      oldWidget.scrollController.removeListener(_updateScrollState);
+      widget.scrollController.addListener(_updateScrollState);
+      _updateScrollState(); // Initial check for new controller
+    }
+  }
+
+  @override
+  void dispose() {
+    widget.scrollController.removeListener(_updateScrollState);
+    super.dispose();
+  }
+
+  void _updateScrollState() {
+    if (!mounted) return;
+
+    bool shouldShow = false;
+
+    if (widget.position == ScrollBorderPosition.top) {
+      // Show border when scrolled away from top.
+      if (!widget.scrollController.hasClients) {
+        shouldShow = false;
+      } else {
+        // Safely access position to handle ScrollController state transitions
+        final ScrollPosition? pos;
+        try {
+          pos = widget.scrollController.position;
+        } catch (e) {
+          // ScrollController might be attached to multiple scroll views during rebuilds
+          shouldShow = false;
+          if (shouldShow != _shouldShowBorder) {
+            setState(() {
+              _shouldShowBorder = shouldShow;
+            });
+          }
+          return;
+        }
+        final bool hasDims = pos.hasPixels && pos.haveDimensions;
+        if (!hasDims) {
+          shouldShow = false;
+        } else if (!widget.isReversed) {
+          shouldShow = pos.pixels > 0;
+        } else {
+          // For reversed lists, the visual "top" corresponds to maxScrollExtent.
+          final bool noScrollExtent = pos.maxScrollExtent <= 0.5;
+          if (noScrollExtent) {
+            shouldShow = false;
+          } else {
+            final bool reachedTop = pos.pixels >= (pos.maxScrollExtent - 1.0);
+            shouldShow = !reachedTop;
+          }
+        }
+      }
+    } else {
+      // Bottom border: default visible, hide only when we've reached the end
+      if (!widget.scrollController.hasClients) {
+        shouldShow = true; // default visible before attachment/first layout
+      } else {
+        // Safely access position to handle ScrollController state transitions
+        final ScrollPosition? pos;
+        try {
+          pos = widget.scrollController.position;
+        } catch (e) {
+          // ScrollController might be attached to multiple scroll views during rebuilds
+          shouldShow = true; // default to visible for bottom border
+          if (shouldShow != _shouldShowBorder) {
+            setState(() {
+              _shouldShowBorder = shouldShow;
+            });
+          }
+          return;
+        }
+        final bool hasDims = pos.hasPixels && pos.haveDimensions;
+        if (!hasDims) {
+          shouldShow = true; // keep visible until dimensions are known
+        } else {
+          // If there is no scrollable extent, keep it visible (default)
+          final bool noScrollExtent = pos.maxScrollExtent <= 0.5;
+          if (noScrollExtent) {
+            shouldShow = true;
+          } else {
+            // Hide only when we're essentially at the end
+            final bool reachedEnd = pos.pixels >= (pos.maxScrollExtent - 1.0);
+            shouldShow = !reachedEnd;
+          }
+        }
+      }
+    }
+
+    if (shouldShow != _shouldShowBorder) {
+      setState(() {
+        _shouldShowBorder = shouldShow;
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedSwitcher(
+      switchInCurve: Curves.easeOut,
+      switchOutCurve: Curves.easeIn,
+      duration: const Duration(milliseconds: 200),
+      child: _shouldShowBorder
+          ? const Divider()
+          : Divider(
+              key: ValueKey(_shouldShowBorder),
+              color: Colors.transparent,
+            ),
+    );
+  }
+}
diff --git a/lib/widgets/block_report_modal.dart b/lib/widgets/block_report_modal.dart
deleted file mode 100644
index 19758468..00000000
--- a/lib/widgets/block_report_modal.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:frosty/screens/settings/stores/auth_store.dart';
-import 'package:frosty/widgets/app_bar.dart';
-import 'package:frosty/widgets/bottom_sheet.dart';
-import 'package:frosty/widgets/list_tile.dart';
-import 'package:webview_flutter/webview_flutter.dart';
-
-class BlockReportModal extends StatelessWidget {
-  final AuthStore authStore;
-  final String name;
-  final String userLogin;
-  final String userId;
-
-  const BlockReportModal({
-    Key? key,
-    required this.authStore,
-    required this.name,
-    required this.userLogin,
-    required this.userId,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return FrostyBottomSheet(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          if (authStore.isLoggedIn)
-            FrostyListTile(
-              leading: const Icon(Icons.block_rounded),
-              onTap: () => authStore
-                  .showBlockDialog(context,
-                      targetUser: name, targetUserId: userId)
-                  .then((_) => Navigator.pop(context)),
-              title: 'Block $name',
-            ),
-          FrostyListTile(
-            leading: const Icon(Icons.outlined_flag_rounded),
-            onTap: () => Navigator.push(
-              context,
-              MaterialPageRoute(
-                builder: (context) {
-                  return Scaffold(
-                    appBar: FrostyAppBar(
-                      title: Text('Report $name'),
-                    ),
-                    body: WebView(
-                      initialUrl: 'https://www.twitch.tv/$userLogin/report',
-                      javascriptMode: JavascriptMode.unrestricted,
-                    ),
-                  );
-                },
-              ),
-            ),
-            title: 'Report $name',
-          )
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/blurred_container.dart b/lib/widgets/blurred_container.dart
new file mode 100644
index 00000000..d214c9f9
--- /dev/null
+++ b/lib/widgets/blurred_container.dart
@@ -0,0 +1,122 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+
+/// Gradient direction for the blurred container
+enum GradientDirection {
+  up, // Fade up (for top app bars)
+  down, // Fade down (for bottom app bars)
+  none, // No gradient (solid color)
+}
+
+/// Consistent blur effect configuration
+class BlurConfig {
+  static const double sigmaX = 16.0;
+  static const double sigmaY = 16.0;
+
+  // Theme-specific adjustments
+  static const double lightModeAlpha =
+      0.6; // Slightly more opaque in light mode
+  static const double darkModeAlpha =
+      0.3; // More opaque in dark mode for better visibility
+}
+
+/// A reusable container with consistent blur effect and background
+class BlurredContainer extends StatelessWidget {
+  final Widget child;
+  final EdgeInsetsGeometry? padding;
+  final double? sigmaX;
+  final double? sigmaY;
+  final double? backgroundAlpha;
+  final bool? forceDarkMode;
+  final GradientDirection gradientDirection;
+
+  const BlurredContainer({
+    super.key,
+    required this.child,
+    this.padding,
+    this.sigmaX,
+    this.sigmaY,
+    this.backgroundAlpha,
+    this.forceDarkMode,
+    this.gradientDirection = GradientDirection.none,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final isDark = forceDarkMode ?? (theme.brightness == Brightness.dark);
+
+    // Adaptive alpha based on theme for optimal visibility
+    final adaptiveAlpha =
+        backgroundAlpha ??
+        (isDark ? BlurConfig.darkModeAlpha : BlurConfig.lightModeAlpha);
+
+    // Use dark background color if forced, otherwise use theme color
+    final backgroundColor = forceDarkMode == true
+        ? Colors.black
+        : theme.scaffoldBackgroundColor;
+
+    // Create decoration based on gradient direction
+    Decoration decoration;
+    if (gradientDirection == GradientDirection.none) {
+      // Solid color (original behavior)
+      decoration = BoxDecoration(
+        color: backgroundColor.withValues(alpha: adaptiveAlpha),
+      );
+    } else {
+      List<Color> colors;
+      Alignment begin;
+      Alignment end;
+
+      List<double> stops;
+
+      if (gradientDirection == GradientDirection.up) {
+        // Fade up: 100% opacity at TOP, 0% at bottom
+        colors = [
+          backgroundColor,
+          backgroundColor.withValues(alpha: 0.7),
+          backgroundColor.withValues(alpha: 0.3),
+          backgroundColor.withValues(alpha: 0.0),
+        ];
+        stops = [0.0, 0.3, 0.7, 1.0];
+        begin = Alignment.topCenter;
+        end = Alignment.bottomCenter;
+      } else {
+        // Fade down: 0% at top, 100% opacity at BOTTOM
+        colors = [
+          backgroundColor.withValues(alpha: 0.0),
+          backgroundColor.withValues(alpha: 0.3),
+          backgroundColor.withValues(alpha: 0.7),
+          backgroundColor,
+        ];
+        stops = [0.0, 0.3, 0.7, 1.0];
+        begin = Alignment.topCenter;
+        end = Alignment.bottomCenter;
+      }
+
+      decoration = BoxDecoration(
+        gradient: LinearGradient(
+          begin: begin,
+          end: end,
+          colors: colors,
+          stops: stops,
+        ),
+      );
+    }
+
+    return ClipRect(
+      child: BackdropFilter(
+        filter: ImageFilter.blur(
+          sigmaX: sigmaX ?? BlurConfig.sigmaX,
+          sigmaY: sigmaY ?? BlurConfig.sigmaY,
+        ),
+        child: Container(
+          padding: padding,
+          decoration: decoration,
+          child: child,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/bottom_sheet.dart b/lib/widgets/bottom_sheet.dart
deleted file mode 100644
index 8cfbe489..00000000
--- a/lib/widgets/bottom_sheet.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter/material.dart';
-
-class FrostyBottomSheet extends StatelessWidget {
-  final Widget child;
-
-  const FrostyBottomSheet({Key? key, required this.child}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(
-        color: Theme.of(context).dialogBackgroundColor,
-        borderRadius: const BorderRadius.only(
-          topLeft: Radius.circular(15.0),
-          topRight: Radius.circular(15.0),
-        ),
-      ),
-      child: SafeArea(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            const FractionallySizedBox(
-              widthFactor: 0.2,
-              child: SizedBox(
-                child: Divider(
-                  height: 30.0,
-                  thickness: 2.0,
-                ),
-              ),
-            ),
-            Material(child: child),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/button.dart b/lib/widgets/button.dart
deleted file mode 100644
index e0909aa5..00000000
--- a/lib/widgets/button.dart
+++ /dev/null
@@ -1,126 +0,0 @@
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-
-/// A custom button that scales down when tapped/held on (sorta like a real button).
-class Button extends StatefulWidget {
-  final Color? color;
-  final bool fill;
-  final EdgeInsets padding;
-  final double? fontSize;
-  final Widget? icon;
-  final Function()? onPressed;
-  final Widget child;
-
-  const Button({
-    Key? key,
-    this.color,
-    this.fill = false,
-    this.padding = const EdgeInsets.symmetric(vertical: 15.0, horizontal: 10.0),
-    this.fontSize,
-    this.icon,
-    required this.onPressed,
-    required this.child,
-  }) : super(key: key);
-
-  @override
-  State<Button> createState() => _ButtonState();
-}
-
-class _ButtonState extends State<Button> with SingleTickerProviderStateMixin {
-  late final _animationController = AnimationController(
-    vsync: this,
-    upperBound: 0.05,
-  );
-
-  @override
-  Widget build(BuildContext context) {
-    final buttonStyle = ElevatedButton.styleFrom(
-      foregroundColor: widget.fill ? null : widget.color,
-      backgroundColor: widget.color == null || widget.fill
-          ? widget.color
-          : Colors.transparent,
-      padding: widget.padding,
-      splashFactory: Platform.isIOS ? NoSplash.splashFactory : null,
-      textStyle: DefaultTextStyle.of(context)
-          .style
-          .copyWith(fontWeight: FontWeight.w600, fontSize: widget.fontSize),
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10.0)),
-      elevation: widget.color == null ? 10.0 : 0.0,
-    ).copyWith(
-      elevation:
-          (widget.color == null || widget.fill) && widget.onPressed != null
-              ? MaterialStateProperty.resolveWith(
-                  (states) {
-                    if (states.contains(MaterialState.pressed)) {
-                      return 0.0;
-                    } else {
-                      return 5.0;
-                    }
-                  },
-                )
-              : MaterialStateProperty.all(0.0),
-    );
-
-    final button = widget.icon == null
-        ? ElevatedButton(
-            style: buttonStyle,
-            onPressed: widget.onPressed,
-            child: widget.child,
-          )
-        : ElevatedButton.icon(
-            style: buttonStyle,
-            onPressed: widget.onPressed,
-            icon: widget.icon!,
-            label: widget.child,
-          );
-
-    const duration = Duration(milliseconds: 200);
-
-    return AnimatedBuilder(
-      animation: _animationController,
-      child: widget.onPressed == null
-          ? button
-          : Listener(
-              onPointerDown: (_) {
-                if (mounted) {
-                  _animationController.animateTo(
-                    _animationController.upperBound,
-                    curve: Curves.easeOut,
-                    duration: duration,
-                  );
-                }
-              },
-              onPointerUp: (_) {
-                if (mounted) {
-                  _animationController.animateTo(
-                    _animationController.lowerBound,
-                    curve: Curves.easeIn,
-                    duration: duration,
-                  );
-                }
-              },
-              onPointerCancel: (_) {
-                if (mounted) {
-                  _animationController.animateTo(
-                    _animationController.lowerBound,
-                    curve: Curves.easeIn,
-                    duration: duration,
-                  );
-                }
-              },
-              child: button,
-            ),
-      builder: (context, child) => Transform.scale(
-        scale: 1 - _animationController.value,
-        child: child,
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
-  }
-}
diff --git a/lib/widgets/chat_input/emote_text_span_builder.dart b/lib/widgets/chat_input/emote_text_span_builder.dart
new file mode 100644
index 00000000..785140ff
--- /dev/null
+++ b/lib/widgets/chat_input/emote_text_span_builder.dart
@@ -0,0 +1,122 @@
+import 'package:extended_text_field/extended_text_field.dart';
+import 'package:flutter/material.dart';
+import 'package:frosty/models/emotes.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
+
+/// A [SpecialTextSpanBuilder] that renders emote names as inline images.
+///
+/// This builder parses input text word-by-word and converts recognized emote
+/// names into [ExtendedWidgetSpan] widgets displaying the emote image.
+/// Unrecognized words remain as regular text.
+class EmoteTextSpanBuilder extends SpecialTextSpanBuilder {
+  /// Map of emote names to their [Emote] objects (global + channel emotes).
+  final Map<String, Emote> emoteToObject;
+
+  /// Map of user-owned emotes (subscriber, bits, unlocked).
+  final Map<String, Emote> userEmoteToObject;
+
+  /// The height to render emotes at.
+  final double emoteSize;
+
+  EmoteTextSpanBuilder({
+    required this.emoteToObject,
+    required this.userEmoteToObject,
+    required this.emoteSize,
+  });
+
+  @override
+  TextSpan build(
+    String data, {
+    TextStyle? textStyle,
+    SpecialTextGestureTapCallback? onTap,
+  }) {
+    if (data.isEmpty) {
+      return TextSpan(text: '', style: textStyle);
+    }
+
+    final spans = <InlineSpan>[];
+    var currentIndex = 0;
+
+    // Split by spaces but preserve space positions
+    final parts = _splitPreservingSpaces(data);
+
+    for (final part in parts) {
+      if (part == ' ') {
+        // Add space as regular text
+        spans.add(TextSpan(text: ' ', style: textStyle));
+        currentIndex += 1;
+      } else if (part.isNotEmpty) {
+        // Check if this word is an emote - render immediately on exact match
+        final emote = emoteToObject[part] ?? userEmoteToObject[part];
+
+        if (emote != null) {
+          spans.add(_createEmoteSpan(emote, part, currentIndex));
+        } else {
+          spans.add(TextSpan(text: part, style: textStyle));
+        }
+        currentIndex += part.length;
+      }
+    }
+
+    return TextSpan(children: spans, style: textStyle);
+  }
+
+  /// Splits text into words and spaces, preserving the spaces as separate elements.
+  List<String> _splitPreservingSpaces(String text) {
+    final result = <String>[];
+    final buffer = StringBuffer();
+
+    for (var i = 0; i < text.length; i++) {
+      final char = text[i];
+      if (char == ' ') {
+        if (buffer.isNotEmpty) {
+          result.add(buffer.toString());
+          buffer.clear();
+        }
+        result.add(' ');
+      } else {
+        buffer.write(char);
+      }
+    }
+
+    if (buffer.isNotEmpty) {
+      result.add(buffer.toString());
+    }
+
+    return result;
+  }
+
+  /// Creates an [ExtendedWidgetSpan] for the given emote.
+  ExtendedWidgetSpan _createEmoteSpan(Emote emote, String text, int start) {
+    // Calculate dimensions - use emote's native size if available,
+    // otherwise use the configured emoteSize
+    final height = emote.height?.toDouble() ?? emoteSize;
+    final width = emote.width?.toDouble();
+
+    return ExtendedWidgetSpan(
+      actualText: text,
+      start: start,
+      alignment: PlaceholderAlignment.middle,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 1),
+        child: FrostyCachedNetworkImage(
+          imageUrl: emote.url,
+          height: height,
+          width: width,
+          useFade: false,
+        ),
+      ),
+    );
+  }
+
+  @override
+  SpecialText? createSpecialText(
+    String flag, {
+    TextStyle? textStyle,
+    SpecialTextGestureTapCallback? onTap,
+    int? index,
+  }) {
+    // We handle all parsing in the build method, so this returns null
+    return null;
+  }
+}
diff --git a/lib/widgets/dialog.dart b/lib/widgets/dialog.dart
deleted file mode 100644
index db700dd9..00000000
--- a/lib/widgets/dialog.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// A custom dialog that makes the title bold, puts the actions in a column, and adds a subtle border.
-class FrostyDialog extends StatelessWidget {
-  final String title;
-  final String? message;
-  final Widget? content;
-  final List<Widget>? actions;
-
-  const FrostyDialog({
-    Key? key,
-    this.actions,
-    required this.title,
-    this.message,
-    this.content,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return AlertDialog(
-      titlePadding: const EdgeInsets.fromLTRB(20.0, 30.0, 20.0, 20.0),
-      contentPadding: const EdgeInsets.fromLTRB(20.0, 0.0, 20.0, 20.0),
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(15.0),
-      ),
-      title: Text(
-        title,
-        style: const TextStyle(fontWeight: FontWeight.bold),
-        textAlign: TextAlign.center,
-      ),
-      content: SingleChildScrollView(
-        child: Column(children: [
-          content ?? Text(message!, textAlign: TextAlign.center),
-          if (actions != null) ...[
-            const SizedBox(height: 25.0),
-            ...?actions?.map(
-              (action) => Container(
-                width: double.infinity,
-                padding: const EdgeInsets.only(top: 5.0),
-                child: action,
-              ),
-            ),
-          ],
-        ]),
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/draggable_divider.dart b/lib/widgets/draggable_divider.dart
new file mode 100644
index 00000000..79f41c83
--- /dev/null
+++ b/lib/widgets/draggable_divider.dart
@@ -0,0 +1,195 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+/// A draggable vertical divider that allows users to resize content areas
+class DraggableDivider extends StatefulWidget {
+  /// Called when the divider is being dragged
+  final ValueChanged<double> onDrag;
+
+  /// Called when dragging starts
+  final VoidCallback? onDragStart;
+
+  /// Called when dragging ends
+  final VoidCallback? onDragEnd;
+
+  /// The minimum width percentage (0.0 to 1.0)
+  final double minWidth;
+
+  /// The maximum width percentage (0.0 to 1.0)
+  final double maxWidth;
+
+  /// The current width percentage (0.0 to 1.0)
+  final double currentWidth;
+
+  /// Width of the draggable area
+  final double dragAreaWidth;
+
+  /// Whether the resizable area is on the left side of the divider
+  final bool isResizableOnLeft;
+
+  /// Whether to show the pill-shaped drag handle
+  final bool showHandle;
+
+  /// Whether to show the background divider line
+  final bool showDividerLine;
+
+  const DraggableDivider({
+    super.key,
+    required this.onDrag,
+    this.onDragStart,
+    this.onDragEnd,
+    this.minWidth = 0.2,
+    this.maxWidth = 0.8,
+    required this.currentWidth,
+    this.dragAreaWidth = 24.0,
+    this.isResizableOnLeft = true,
+    this.showHandle = true,
+    this.showDividerLine = true,
+  });
+
+  @override
+  State<DraggableDivider> createState() => _DraggableDividerState();
+}
+
+class _DraggableDividerState extends State<DraggableDivider> {
+  bool _isDragging = false;
+  bool _isHovered = false;
+  bool _hasHapticAtMin = false;
+  bool _hasHapticAtMax = false;
+
+  void _handlePanStart(DragStartDetails details) {
+    setState(() {
+      _isDragging = true;
+    });
+
+    // Reset haptic flags for new drag session
+    _hasHapticAtMin = false;
+    _hasHapticAtMax = false;
+
+    widget.onDragStart?.call();
+  }
+
+  void _handlePanUpdate(DragUpdateDetails details) {
+    // Use delta to update position incrementally for better accuracy
+    final RenderBox? renderBox = context.findRenderObject() as RenderBox?;
+    if (renderBox != null) {
+      // Get the total available width by finding the Row parent
+      RenderObject? current = renderBox.parent;
+      while (current != null && current is! RenderBox) {
+        current = current.parent;
+      }
+
+      if (current is RenderBox) {
+        final totalWidth = current.size.width;
+
+        // Convert delta movement to width percentage change
+        final deltaPercentage = details.delta.dx / totalWidth;
+
+        // If resizable area is on left, dragging right increases width
+        // If resizable area is on right, dragging left increases width
+        final newWidth = widget.isResizableOnLeft
+            ? (widget.currentWidth + deltaPercentage)
+            : (widget.currentWidth - deltaPercentage);
+
+        final clampedWidth = newWidth.clamp(widget.minWidth, widget.maxWidth);
+
+        widget.onDrag(clampedWidth);
+
+        // Provide haptic feedback once when reaching either end
+        if (clampedWidth <= widget.minWidth && !_hasHapticAtMin) {
+          HapticFeedback.lightImpact();
+          _hasHapticAtMin = true;
+        } else if (clampedWidth >= widget.maxWidth && !_hasHapticAtMax) {
+          HapticFeedback.lightImpact();
+          _hasHapticAtMax = true;
+        }
+      }
+    }
+  }
+
+  void _handlePanEnd(DragEndDetails details) {
+    setState(() {
+      _isDragging = false;
+    });
+
+    widget.onDragEnd?.call();
+  }
+
+  void _handleHover(bool hovering) {
+    setState(() {
+      _isHovered = hovering;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final colorScheme = theme.colorScheme;
+
+    return MouseRegion(
+      onEnter: (_) => _handleHover(true),
+      onExit: (_) => _handleHover(false),
+      cursor: SystemMouseCursors.resizeColumn,
+      child: GestureDetector(
+        onPanStart: _handlePanStart,
+        onPanUpdate: _handlePanUpdate,
+        onPanEnd: _handlePanEnd,
+        child: Container(
+          width: widget.dragAreaWidth,
+          color: Colors.transparent,
+          child: Stack(
+            alignment: Alignment.center,
+            children: [
+              // Background divider line - show only during interaction
+              if (_isDragging || _isHovered)
+                Center(
+                  child: AnimatedContainer(
+                    duration: const Duration(milliseconds: 150),
+                    curve: Curves.easeOut,
+                    width: _isDragging ? 4.0 : (_isHovered ? 3.0 : 1.0),
+                    decoration: BoxDecoration(
+                      color: _isDragging
+                          ? colorScheme.primary
+                          : (_isHovered
+                                ? colorScheme.onSurface.withValues(alpha: 0.3)
+                                : colorScheme.onSurface.withValues(alpha: 0.1)),
+                      borderRadius: BorderRadius.circular(2),
+                    ),
+                  ),
+                ),
+              // Modern drag handle
+              if (widget.showHandle)
+                AnimatedContainer(
+                  duration: const Duration(milliseconds: 200),
+                  curve: Curves.easeOut,
+                  width: _isDragging ? 12.0 : 10.0,
+                  height: _isDragging ? 52.0 : 48.0,
+                  decoration: BoxDecoration(
+                    color: colorScheme.primary.withValues(alpha: 0.9),
+                    borderRadius: BorderRadius.circular(12),
+                    boxShadow: [
+                      BoxShadow(
+                        color: colorScheme.shadow.withValues(alpha: 0.08),
+                        blurRadius: 4,
+                        offset: const Offset(0, 1),
+                      ),
+                    ],
+                  ),
+                  child: Center(
+                    child: Container(
+                      width: 2,
+                      height: _isDragging ? 20.0 : 16.0,
+                      decoration: BoxDecoration(
+                        color: colorScheme.onPrimary,
+                        borderRadius: BorderRadius.circular(1),
+                      ),
+                    ),
+                  ),
+                ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/expandable_section_header.dart b/lib/widgets/expandable_section_header.dart
new file mode 100644
index 00000000..1c6eb8a0
--- /dev/null
+++ b/lib/widgets/expandable_section_header.dart
@@ -0,0 +1,79 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:frosty/utils/context_extensions.dart';
+
+class ExpandableSectionHeader extends StatelessWidget {
+  final String text;
+  final EdgeInsets? padding;
+  final double? fontSize;
+  final bool isFirst;
+  final bool isExpanded;
+  final VoidCallback? onToggle;
+
+  const ExpandableSectionHeader(
+    this.text, {
+    super.key,
+    this.padding,
+    this.fontSize,
+    this.isFirst = false,
+    required this.isExpanded,
+    this.onToggle,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: onToggle != null
+          ? () {
+              HapticFeedback.selectionClick();
+              onToggle!();
+            }
+          : null,
+      child: Padding(
+        padding:
+            padding ??
+            EdgeInsets.fromLTRB(
+              16 + MediaQuery.of(context).padding.left,
+              0,
+              16 + MediaQuery.of(context).padding.right,
+              8,
+            ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            if (!isFirst) ...[const SizedBox(height: 32)],
+            Row(
+              children: [
+                Expanded(
+                  child: Text(
+                    text.toUpperCase(),
+                    style: TextStyle(
+                      fontSize: fontSize ?? 12,
+                      fontWeight: FontWeight.w500,
+                      letterSpacing: 0.8,
+                      color: context.colorScheme.onSurfaceVariant.withValues(
+                        alpha: 0.6,
+                      ),
+                    ),
+                  ),
+                ),
+                AnimatedRotation(
+                  turns: isExpanded ? 0.5 : 0.0,
+                  duration: const Duration(milliseconds: 200),
+                  child: Icon(
+                    Icons.keyboard_arrow_down,
+                    color: context.colorScheme.onSurfaceVariant.withValues(
+                      alpha: 0.6,
+                    ),
+                    size: 20,
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/external_browser_setting.dart b/lib/widgets/external_browser_setting.dart
new file mode 100644
index 00000000..1ff5bc57
--- /dev/null
+++ b/lib/widgets/external_browser_setting.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/screens/settings/widgets/settings_list_switch.dart';
+
+class ExternalBrowserSetting extends StatelessWidget {
+  final SettingsStore settingsStore;
+
+  const ExternalBrowserSetting({super.key, required this.settingsStore});
+
+  @override
+  Widget build(BuildContext context) {
+    return Observer(
+      builder: (context) => SettingsListSwitch(
+        title: 'Open links in external browser',
+        value: settingsStore.launchUrlExternal,
+        onChanged: (newValue) => settingsStore.launchUrlExternal = newValue,
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/follow_button.dart b/lib/widgets/follow_button.dart
new file mode 100644
index 00000000..c90b8c5a
--- /dev/null
+++ b/lib/widgets/follow_button.dart
@@ -0,0 +1,206 @@
+import 'package:flutter/material.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/screens/onboarding/login_webview.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/widgets/alert_message.dart';
+import 'package:frosty/widgets/follow_channel_controller.dart';
+import 'package:frosty/widgets/frosty_dialog.dart';
+import 'package:frosty/widgets/integrity_webview_dialog.dart';
+
+/// Compact Follow / Unfollow control for channel headers.
+class FollowButton extends StatefulWidget {
+  final AuthStore authStore;
+  final String userId;
+  final String displayName;
+  final bool? initialIsFollowing;
+  final ValueChanged<bool>? onFollowChanged;
+
+  const FollowButton({
+    super.key,
+    required this.authStore,
+    required this.userId,
+    required this.displayName,
+    this.initialIsFollowing,
+    this.onFollowChanged,
+  });
+
+  @override
+  State<FollowButton> createState() => _FollowButtonState();
+}
+
+class _FollowButtonState extends State<FollowButton> {
+  late final FollowChannelController _controller = FollowChannelController(
+    authStore: widget.authStore,
+    userId: widget.userId,
+    initialIsFollowing: widget.initialIsFollowing,
+    onChanged: () {
+      if (mounted) setState(() {});
+    },
+  );
+
+  @override
+  void initState() {
+    super.initState();
+    _controller.init();
+  }
+
+  Future<void> _onPressed() async {
+    if (!_controller.canFollow ||
+        _controller.isFollowing == null ||
+        _controller.actionInProgress) {
+      return;
+    }
+
+    final wasFollowing = _controller.isFollowing!;
+
+    try {
+      final nowFollowing = await _controller.toggle();
+      if (!mounted) return;
+      widget.onFollowChanged?.call(nowFollowing);
+      _showResultSnack(nowFollowing);
+    } on FollowNeedsWebSessionException {
+      if (!mounted) return;
+      await _promptLinkWebSession();
+    } on IntegrityCheckException {
+      if (!mounted) return;
+      await _handleIntegrity(wasFollowing: wasFollowing);
+    } on ApiException catch (e) {
+      if (!mounted) return;
+      _showErrorSnack(e.message);
+    } catch (_) {
+      if (!mounted) return;
+      _showErrorSnack(
+        wasFollowing
+            ? 'Could not unfollow ${widget.displayName}'
+            : 'Could not follow ${widget.displayName}',
+      );
+    }
+  }
+
+  Future<void> _handleIntegrity({required bool wasFollowing}) async {
+    final gqlToken = widget.authStore.gqlToken;
+    if (gqlToken == null) {
+      _controller.clearActionInProgress();
+      await _promptLinkWebSession();
+      return;
+    }
+
+    final credentials = await showIntegrityWebViewDialog(
+      context: context,
+      gqlToken: gqlToken,
+    );
+    if (!mounted) return;
+
+    if (credentials == null) {
+      _controller.clearActionInProgress();
+      _showErrorSnack('Follow cancelled — Twitch verification required');
+      return;
+    }
+
+    try {
+      final nowFollowing = await _controller.retryAfterIntegrity(
+        wasFollowing: wasFollowing,
+        credentials: credentials,
+      );
+      if (!mounted) return;
+      widget.onFollowChanged?.call(nowFollowing);
+      _showResultSnack(nowFollowing);
+    } on ApiException catch (e) {
+      if (!mounted) return;
+      _showErrorSnack(e.message);
+    } catch (_) {
+      if (!mounted) return;
+      _showErrorSnack(
+        wasFollowing
+            ? 'Could not unfollow ${widget.displayName}'
+            : 'Could not follow ${widget.displayName}',
+      );
+    }
+  }
+
+  Future<void> _promptLinkWebSession() {
+    return showDialog<void>(
+      context: context,
+      builder: (dialogContext) => FrostyDialog(
+        title: 'Web session required',
+        message:
+            'Following channels needs your Twitch web session linked. Log in again to link it, then try follow/unfollow.',
+        actions: [
+          TextButton(
+            onPressed: Navigator.of(dialogContext).pop,
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () {
+              Navigator.of(dialogContext).pop();
+              Navigator.of(context).push(
+                MaterialPageRoute(builder: (context) => LoginWebView()),
+              );
+            },
+            child: const Text('Log in'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void _showResultSnack(bool nowFollowing) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: AlertMessage(
+          message: nowFollowing
+              ? 'Followed ${widget.displayName}'
+              : 'Unfollowed ${widget.displayName}',
+          centered: false,
+        ),
+      ),
+    );
+  }
+
+  void _showErrorSnack(String message) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: AlertMessage(message: message, centered: false),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (!_controller.shouldShow) {
+      return const SizedBox.shrink();
+    }
+
+    final following = _controller.isFollowing == true;
+    final busy = _controller.loading || _controller.actionInProgress;
+
+    return FilledButton.tonal(
+      onPressed: busy ? null : _onPressed,
+      style: FilledButton.styleFrom(
+        visualDensity: VisualDensity.compact,
+        padding: const EdgeInsets.symmetric(horizontal: 12),
+        minimumSize: const Size(0, 36),
+        tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+      ),
+      child: busy
+          ? const SizedBox(
+              width: 16,
+              height: 16,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            )
+          : Row(
+              mainAxisSize: MainAxisSize.min,
+              spacing: 6,
+              children: [
+                Icon(
+                  following
+                      ? Icons.favorite_rounded
+                      : Icons.favorite_border_rounded,
+                  size: 16,
+                ),
+                Text(following ? 'Unfollow' : 'Follow'),
+              ],
+            ),
+    );
+  }
+}
diff --git a/lib/widgets/follow_channel_controller.dart b/lib/widgets/follow_channel_controller.dart
new file mode 100644
index 00000000..46c45ff2
--- /dev/null
+++ b/lib/widgets/follow_channel_controller.dart
@@ -0,0 +1,150 @@
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_integrity.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+
+/// Shared follow/unfollow state + GQL mutations for channel UI.
+///
+/// Owns loading/action flags and the session cache via [AuthStore.user].
+/// Callers handle UI (integrity WebView, login prompt, snackbars).
+class FollowChannelController {
+  final AuthStore authStore;
+  final String userId;
+  final bool? initialIsFollowing;
+  final void Function() onChanged;
+
+  bool? isFollowing;
+  bool loading = false;
+  bool actionInProgress = false;
+
+  FollowChannelController({
+    required this.authStore,
+    required this.userId,
+    this.initialIsFollowing,
+    required this.onChanged,
+  });
+
+  bool get isSelf =>
+      authStore.user.details?.id != null &&
+      authStore.user.details!.id == userId;
+
+  bool get canFollow => authStore.isLoggedIn && !isSelf;
+
+  /// Whether the follow control should be visible (loading or known state).
+  bool get shouldShow => canFollow && (loading || isFollowing != null);
+
+  void init() {
+    if (!canFollow) return;
+    if (initialIsFollowing != null) {
+      isFollowing = initialIsFollowing;
+      onChanged();
+      return;
+    }
+    loadFollowState();
+  }
+
+  Future<void> loadFollowState() async {
+    final cached = authStore.user.cachedIsFollowing(userId);
+    if (cached != null) {
+      isFollowing = cached;
+      onChanged();
+      return;
+    }
+
+    loading = true;
+    onChanged();
+    try {
+      final following = await authStore.user.isFollowingChannel(userId);
+      isFollowing = following;
+    } catch (_) {
+      // Leave isFollowing null so the control stays hidden.
+    } finally {
+      loading = false;
+      onChanged();
+    }
+  }
+
+  /// Toggles follow. Returns the new following state on success.
+  ///
+  /// Throws [IntegrityCheckException] when a WebView integrity mint is needed,
+  /// [ApiException] for API errors, or [StateError] when not ready / no token.
+  Future<bool> toggle() async {
+    if (actionInProgress || isFollowing == null) {
+      throw StateError('Follow toggle not ready');
+    }
+
+    final gqlToken = authStore.gqlToken;
+    if (gqlToken == null) {
+      throw const FollowNeedsWebSessionException();
+    }
+
+    final following = isFollowing!;
+    actionInProgress = true;
+    onChanged();
+
+    try {
+      await _runMutation(following: following, gqlToken: gqlToken);
+    } catch (_) {
+      actionInProgress = false;
+      onChanged();
+      rethrow;
+    }
+
+    final nowFollowing = !following;
+    isFollowing = nowFollowing;
+    actionInProgress = false;
+    onChanged();
+    return nowFollowing;
+  }
+
+  /// After a WebView integrity mint, apply credentials and retry [toggle]'s
+  /// intended mutation (still based on the pre-toggle [wasFollowing] state).
+  Future<bool> retryAfterIntegrity({
+    required bool wasFollowing,
+    required GqlIntegrityCredentials credentials,
+  }) async {
+    final gqlToken = authStore.gqlToken;
+    if (gqlToken == null) {
+      throw const FollowNeedsWebSessionException();
+    }
+
+    actionInProgress = true;
+    onChanged();
+
+    try {
+      await authStore.user.applyWebIntegrity(credentials);
+      await _runMutation(following: wasFollowing, gqlToken: gqlToken);
+    } catch (_) {
+      actionInProgress = false;
+      onChanged();
+      rethrow;
+    }
+
+    final nowFollowing = !wasFollowing;
+    isFollowing = nowFollowing;
+    actionInProgress = false;
+    onChanged();
+    return nowFollowing;
+  }
+
+  Future<void> _runMutation({
+    required bool following,
+    required String gqlToken,
+  }) async {
+    if (following) {
+      await authStore.user.unfollow(targetId: userId, gqlToken: gqlToken);
+    } else {
+      await authStore.user.follow(targetId: userId, gqlToken: gqlToken);
+    }
+  }
+
+  void clearActionInProgress() {
+    if (!actionInProgress) return;
+    actionInProgress = false;
+    onChanged();
+  }
+}
+
+/// Thrown when follow needs a linked Twitch web (GQL) session.
+class FollowNeedsWebSessionException implements Exception {
+  const FollowNeedsWebSessionException();
+}
diff --git a/lib/widgets/app_bar.dart b/lib/widgets/frosty_app_bar.dart
similarity index 85%
rename from lib/widgets/app_bar.dart
rename to lib/widgets/frosty_app_bar.dart
index 6c9aabfe..b758fc95 100644
--- a/lib/widgets/app_bar.dart
+++ b/lib/widgets/frosty_app_bar.dart
@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 
-class FrostyAppBar extends StatelessWidget with PreferredSizeWidget {
+class FrostyAppBar extends StatelessWidget implements PreferredSizeWidget {
   final Widget title;
   final bool? centerTitle;
   final List<Widget>? actions;
 
   const FrostyAppBar({
-    Key? key,
+    super.key,
     required this.title,
     this.centerTitle,
     this.actions,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/cached_image.dart b/lib/widgets/frosty_cached_network_image.dart
similarity index 74%
rename from lib/widgets/cached_image.dart
rename to lib/widgets/frosty_cached_network_image.dart
index b86787df..0f1f9934 100644
--- a/lib/widgets/cached_image.dart
+++ b/lib/widgets/frosty_cached_network_image.dart
@@ -1,9 +1,11 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/widgets.dart';
+import 'package:frosty/cache_manager.dart';
 
 /// A wrapper around [CachedNetworkImage] that adds custom defaults for Frosty.
 class FrostyCachedNetworkImage extends StatelessWidget {
   final String imageUrl;
+  final String? cacheKey;
   final double? width;
   final double? height;
   final Color? color;
@@ -14,8 +16,9 @@ class FrostyCachedNetworkImage extends StatelessWidget {
   final BoxFit? fit;
 
   const FrostyCachedNetworkImage({
-    Key? key,
+    super.key,
     required this.imageUrl,
+    this.cacheKey,
     this.width,
     this.height,
     this.color,
@@ -24,25 +27,29 @@ class FrostyCachedNetworkImage extends StatelessWidget {
     this.useFade = true,
     this.useOldImageOnUrlChange = false,
     this.fit,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
     return CachedNetworkImage(
       imageUrl: imageUrl,
+      cacheKey: cacheKey,
       width: width,
       height: height,
       color: color,
       colorBlendMode: colorBlendMode,
       placeholder: placeholder,
       useOldImageOnUrlChange: useOldImageOnUrlChange,
-      fadeOutDuration:
-          useFade ? const Duration(milliseconds: 500) : Duration.zero,
-      fadeInDuration:
-          useFade ? const Duration(milliseconds: 500) : Duration.zero,
+      fadeOutDuration: useFade
+          ? const Duration(milliseconds: 500)
+          : Duration.zero,
+      fadeInDuration: useFade
+          ? const Duration(milliseconds: 500)
+          : Duration.zero,
       fadeInCurve: Curves.easeOut,
       fadeOutCurve: Curves.easeIn,
       fit: fit,
+      cacheManager: CustomCacheManager.instance,
     );
   }
 }
diff --git a/lib/widgets/frosty_dialog.dart b/lib/widgets/frosty_dialog.dart
new file mode 100644
index 00000000..ed4d9583
--- /dev/null
+++ b/lib/widgets/frosty_dialog.dart
@@ -0,0 +1,63 @@
+import 'package:flutter/material.dart';
+
+/// A custom dialog that makes the title bold, displays actions in a full-width row layout with 50/50 split for 2 buttons, and adds a subtle border.
+class FrostyDialog extends StatelessWidget {
+  final String title;
+  final String? message;
+  final Widget? content;
+  final List<Widget>? actions;
+
+  const FrostyDialog({
+    super.key,
+    this.actions,
+    required this.title,
+    this.message,
+    this.content,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      title: Text(title),
+      content: SingleChildScrollView(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            if (message != null) Text(message!),
+            ?content,
+            if (actions != null) ...[
+              const SizedBox(height: 16),
+              Row(
+                children: actions!.asMap().entries.map((entry) {
+                  final action = entry.value;
+                  final isLast = entry.key == actions!.length - 1;
+
+                  if (actions!.length == 1) {
+                    // Single button takes full width
+                    return Expanded(child: action);
+                  } else if (actions!.length == 2) {
+                    // Two buttons take 50% each
+                    return Expanded(
+                      child: Padding(
+                        padding: EdgeInsets.only(right: isLast ? 0 : 8),
+                        child: action,
+                      ),
+                    );
+                  } else {
+                    // More than 2 buttons - distribute evenly with padding
+                    return Expanded(
+                      child: Padding(
+                        padding: EdgeInsets.only(right: isLast ? 0 : 8),
+                        child: action,
+                      ),
+                    );
+                  }
+                }).toList(),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/frosty_notification.dart b/lib/widgets/frosty_notification.dart
new file mode 100644
index 00000000..6b1945c6
--- /dev/null
+++ b/lib/widgets/frosty_notification.dart
@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+
+class FrostyNotification extends StatelessWidget {
+  final String message;
+  final VoidCallback? onDismissed;
+  final bool showGradient;
+
+  const FrostyNotification({
+    super.key,
+    required this.message,
+    this.onDismissed,
+    this.showGradient = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final Widget notificationContent = BlurredContainer(
+      gradientDirection: showGradient
+          ? GradientDirection.up
+          : GradientDirection.none,
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+      child: Row(
+        children: [
+          Expanded(
+            child: Row(
+              spacing: 8,
+              children: [
+                Icon(Icons.info_outline_rounded, size: 20),
+                Expanded(
+                  child: Text(
+                    message,
+                    maxLines: 3,
+                    overflow: TextOverflow.ellipsis,
+                    style: TextStyle(fontWeight: FontWeight.w500),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          if (onDismissed != null)
+            IconButton(
+              onPressed: onDismissed,
+              icon: const Icon(Icons.close_rounded, size: 20),
+              visualDensity: VisualDensity.compact,
+              tooltip: 'Dismiss',
+              color: Theme.of(context).colorScheme.onSurfaceVariant,
+            ),
+        ],
+      ),
+    );
+
+    // Make it dismissible with swipe gesture if onDismissed is provided
+    if (onDismissed != null) {
+      return Dismissible(
+        key: ValueKey(message),
+        onDismissed: (_) => onDismissed!(),
+        direction: DismissDirection.up,
+        child: notificationContent,
+      );
+    }
+
+    return notificationContent;
+  }
+}
diff --git a/lib/widgets/frosty_page_view.dart b/lib/widgets/frosty_page_view.dart
new file mode 100644
index 00000000..f36e39f7
--- /dev/null
+++ b/lib/widgets/frosty_page_view.dart
@@ -0,0 +1,104 @@
+import 'package:flutter/material.dart';
+
+class FrostyPageView extends StatefulWidget {
+  final List<String> headers;
+  final List<Widget> children;
+
+  /// Actions keyed by tab index, shown trailing the tab bar
+  /// when that tab is selected.
+  final Map<int, Widget> tabActions;
+
+  const FrostyPageView({
+    super.key,
+    required this.headers,
+    required this.children,
+    this.tabActions = const {},
+  }) : assert(headers.length == children.length);
+
+  @override
+  State<FrostyPageView> createState() => _FrostyPageViewState();
+}
+
+class _FrostyPageViewState extends State<FrostyPageView>
+    with TickerProviderStateMixin {
+  late TabController _tabController;
+
+  void _handleTabChange() => setState(() {});
+
+  void _initTabController(int length) {
+    _tabController = TabController(length: length, vsync: this);
+    _tabController.addListener(_handleTabChange);
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _initTabController(widget.headers.length);
+  }
+
+  @override
+  void didUpdateWidget(FrostyPageView oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (_tabController.length != widget.headers.length) {
+      _tabController.removeListener(_handleTabChange);
+      _tabController.dispose();
+      _initTabController(widget.headers.length);
+    }
+  }
+
+  @override
+  void dispose() {
+    _tabController.removeListener(_handleTabChange);
+    _tabController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        // Avoid layout overflow during animated height transitions
+        // (e.g., when the emote menu is opening/closing and height is tiny).
+        const double minHeight = kTextTabBarHeight + 1;
+        if (constraints.maxHeight < minHeight) {
+          return const SizedBox.expand();
+        }
+
+        final trailingAction = widget.tabActions[_tabController.index];
+
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: TabBar(
+                    controller: _tabController,
+                    isScrollable: true,
+                    labelStyle: const TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w600,
+                    ),
+                    labelPadding:
+                        const EdgeInsets.symmetric(horizontal: 12),
+                    tabs: widget.headers
+                        .map((header) => Tab(text: header))
+                        .toList(),
+                  ),
+                ),
+                ?trailingAction,
+              ],
+            ),
+            const Divider(),
+            Expanded(
+              child: TabBarView(
+                controller: _tabController,
+                children: widget.children,
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+}
diff --git a/lib/widgets/frosty_photo_view_dialog.dart b/lib/widgets/frosty_photo_view_dialog.dart
new file mode 100644
index 00000000..69373f04
--- /dev/null
+++ b/lib/widgets/frosty_photo_view_dialog.dart
@@ -0,0 +1,225 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+import 'package:frosty/cache_manager.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:photo_view/photo_view.dart';
+
+class FrostyPhotoViewDialog extends StatefulWidget {
+  final String imageUrl;
+  final String? cacheKey;
+
+  const FrostyPhotoViewDialog({
+    super.key,
+    required this.imageUrl,
+    this.cacheKey,
+  });
+
+  @override
+  State<FrostyPhotoViewDialog> createState() => _FrostyPhotoViewDialogState();
+}
+
+class _FrostyPhotoViewDialogState extends State<FrostyPhotoViewDialog>
+    with TickerProviderStateMixin {
+  PhotoViewScaleState photoViewScaleState = PhotoViewScaleState.initial;
+  bool _isFullResolution = false;
+  String? _currentCacheKey;
+
+  // Vertical drag offset in pixels. Positive = dragging down.
+  double _dragOffset = 0.0;
+  late final AnimationController _resetController;
+  late Animation<double> _resetAnimation;
+  // Exit animation (translate in swipe direction + fade out) when dismissing
+  late final AnimationController _exitController;
+  late Animation<double> _exitTranslateAnimation;
+  late Animation<double> _exitOpacityAnimation;
+  double _imageOpacity = 1.0;
+  // Track swipe direction for dismissal animation
+  double _swipeDirection = 1.0; // 1.0 for down, -1.0 for up
+
+  @override
+  void initState() {
+    super.initState();
+    _currentCacheKey = widget.cacheKey;
+    _resetController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 200),
+    );
+    _resetAnimation = Tween<double>(begin: 0, end: 0).animate(_resetController)
+      ..addListener(() => setState(() => _dragOffset = _resetAnimation.value));
+    _exitController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 220),
+    );
+    _exitTranslateAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
+      CurvedAnimation(parent: _exitController, curve: Curves.easeOut),
+    )..addListener(() => setState(() {}));
+    _exitOpacityAnimation =
+        Tween<double>(begin: 1.0, end: 0.0).animate(
+          CurvedAnimation(parent: _exitController, curve: Curves.easeOut),
+        )..addListener(
+          () => setState(() => _imageOpacity = _exitOpacityAnimation.value),
+        );
+  }
+
+  void _toggleResolution() {
+    setState(() {
+      if (_isFullResolution) {
+        // Switch back to the original thumbnail version
+        _isFullResolution = false;
+        _currentCacheKey = widget.cacheKey;
+      } else {
+        // Load full resolution and clear cache key to force fresh fetch
+        _isFullResolution = true;
+        _currentCacheKey = null;
+      }
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Create full resolution URL
+    final fullResUrl = widget.imageUrl.replaceFirst('-{width}x{height}', '');
+    // Only stream card thumbnails include the placeholder; emotes do not.
+    // If replacement yields the same URL, there is no full-res variant.
+    final supportsFullRes = fullResUrl != widget.imageUrl;
+
+    final screenHeight = MediaQuery.of(context).size.height;
+    final fadeDistance = screenHeight * 0.20; // 20% of screen height
+    final buttonsOpacity = (1.0 - (_dragOffset.abs() / fadeDistance)).clamp(
+      0.0,
+      1.0,
+    );
+
+    return Stack(
+      alignment: Alignment.topCenter,
+      children: [
+        // Very weak blurred background behind the image (fills the screen)
+        BlurredContainer(
+          sigmaX: 4.0,
+          sigmaY: 4.0,
+          // Use a very low alpha so the blur is subtle
+          backgroundAlpha: 0,
+          child: const SizedBox.expand(),
+        ),
+        // Use a GestureDetector so we can track vertical drags and translate the
+        // PhotoView accordingly. When the photo is zoomed (not initial) we disable dragging.
+        GestureDetector(
+          behavior: HitTestBehavior.opaque,
+          onVerticalDragStart: (_) {
+            if (_resetController.isAnimating) _resetController.stop();
+            // Reset swipe direction for new drag
+            _swipeDirection = 1.0;
+          },
+          onVerticalDragUpdate:
+              photoViewScaleState == PhotoViewScaleState.initial
+              ? (details) => setState(() => _dragOffset += details.delta.dy)
+              : null,
+          onVerticalDragEnd: photoViewScaleState == PhotoViewScaleState.initial
+              ? (details) {
+                  final velocity = details.velocity.pixelsPerSecond.dy;
+                  final shouldDismiss =
+                      (_dragOffset.abs() > fadeDistance) ||
+                      velocity.abs() > 700;
+                  if (shouldDismiss) {
+                    // Determine swipe direction based on drag offset and velocity
+                    _swipeDirection = _dragOffset > 0 ? 1.0 : -1.0;
+                    if (_dragOffset.abs() < 10 && velocity != 0) {
+                      _swipeDirection = velocity > 0 ? 1.0 : -1.0;
+                    }
+                    // run exit animation: translate in swipe direction by 30% of screen and fade out
+                    _exitController
+                      ..value = 0.0
+                      ..forward().whenComplete(
+                        () => Navigator.of(context).pop(),
+                      );
+                    return;
+                  }
+
+                  // animate back to zero
+                  _resetAnimation = Tween<double>(
+                    begin: _dragOffset,
+                    end: 0.0,
+                  ).animate(_resetController);
+                  _resetController
+                    ..value = 0.0
+                    ..forward();
+                }
+              : null,
+          child: Transform.translate(
+            offset: Offset(
+              0,
+              _dragOffset +
+                  (_exitTranslateAnimation.value *
+                      screenHeight *
+                      0.25 *
+                      _swipeDirection),
+            ),
+            child: Opacity(
+              opacity: _imageOpacity,
+              child: PhotoView(
+                imageProvider: CachedNetworkImageProvider(
+                  _isFullResolution ? fullResUrl : widget.imageUrl,
+                  cacheKey: _currentCacheKey,
+                  cacheManager: CustomCacheManager.instance,
+                ),
+                scaleStateChangedCallback: (value) =>
+                    setState(() => photoViewScaleState = value),
+                backgroundDecoration: const BoxDecoration(
+                  color: Colors.transparent,
+                ),
+              ),
+            ),
+          ),
+        ),
+        // Close button that fades with drag
+        AnimatedOpacity(
+          opacity: buttonsOpacity,
+          duration: const Duration(milliseconds: 100),
+          child: IconButton(
+            icon: Icon(
+              Icons.close,
+              color: context.frostyColors.overlayOnSurface,
+            ),
+            onPressed: Navigator.of(context).pop,
+          ),
+        ),
+
+        if (supportsFullRes)
+          Positioned(
+            // Place the button roughly between the image area and the bottom of the screen.
+            // Assumption: the photo view occupies the top portion of the screen; using
+            // a fractional top offset (80%) places the button in the gap between image and bottom.
+            top: MediaQuery.of(context).size.height * 0.8,
+            left: 0,
+            right: 0,
+            child: SafeArea(
+              top: false,
+              child: Center(
+                child: AnimatedOpacity(
+                  opacity: buttonsOpacity,
+                  duration: const Duration(milliseconds: 100),
+                  child: FilledButton.tonal(
+                    onPressed: _toggleResolution,
+                    child: Text(
+                      _isFullResolution ? 'View thumbnail' : 'View original',
+                      style: TextStyle(
+                        color: context.frostyColors.overlayOnSurface,
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+
+  @override
+  void dispose() {
+    _resetController.dispose();
+    _exitController.dispose();
+    super.dispose();
+  }
+}
diff --git a/lib/widgets/frosty_scrollbar.dart b/lib/widgets/frosty_scrollbar.dart
new file mode 100644
index 00000000..049843f5
--- /dev/null
+++ b/lib/widgets/frosty_scrollbar.dart
@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+
+/// Custom scrollbar with consistent Frosty styling across the app.
+///
+/// This widget wraps [RawScrollbar] with optimized defaults for appearance
+/// and behavior. Use [padding] to offset the scrollbar from UI elements
+/// like app bars and bottom navigation.
+class FrostyScrollbar extends StatelessWidget {
+  /// The scroll controller for the scrollbar.
+  final ScrollController? controller;
+
+  /// The widget below this widget in the tree.
+  final Widget child;
+
+  /// Padding to offset the scrollbar from top/bottom UI elements.
+  ///
+  /// Unlike content padding, this only affects the scrollbar thumb position.
+  /// Use this to prevent the scrollbar from going under app bars or nav bars.
+  final EdgeInsets? padding;
+
+  const FrostyScrollbar({
+    super.key,
+    this.controller,
+    required this.child,
+    this.padding,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return RawScrollbar(
+      controller: controller,
+      thickness: 5,
+      radius: const Radius.circular(2.5),
+      thumbColor: Theme.of(
+        context,
+      ).colorScheme.onSurface.withValues(alpha: 0.3),
+      interactive: true,
+      minThumbLength: 48,
+      padding: padding,
+      child: child,
+    );
+  }
+}
diff --git a/lib/widgets/integrity_webview_dialog.dart b/lib/widgets/integrity_webview_dialog.dart
new file mode 100644
index 00000000..9d9d9054
--- /dev/null
+++ b/lib/widgets/integrity_webview_dialog.dart
@@ -0,0 +1,232 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:frosty/apis/twitch_integrity.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+/// Captures a browser-valid `Client-Integrity` header by loading Twitch in a
+/// WebView (Dio `/integrity` tokens are almost always `is_bad_bot`).
+///
+/// Returns credentials, or null if the user cancels / capture times out.
+Future<GqlIntegrityCredentials?> showIntegrityWebViewDialog({
+  required BuildContext context,
+  required String gqlToken,
+}) {
+  return showDialog<GqlIntegrityCredentials>(
+    context: context,
+    barrierDismissible: false,
+    builder: (dialogContext) => IntegrityWebViewDialog(gqlToken: gqlToken),
+  );
+}
+
+class IntegrityWebViewDialog extends StatefulWidget {
+  final String gqlToken;
+
+  const IntegrityWebViewDialog({super.key, required this.gqlToken});
+
+  @override
+  State<IntegrityWebViewDialog> createState() => _IntegrityWebViewDialogState();
+}
+
+class _IntegrityWebViewDialogState extends State<IntegrityWebViewDialog> {
+  static const _captureTimeout = Duration(seconds: 45);
+
+  late final WebViewController _controller;
+  Timer? _timeout;
+  var _captured = false;
+  var _status = 'Verifying with Twitch…';
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = WebViewController()
+      ..setJavaScriptMode(JavaScriptMode.unrestricted)
+      ..setUserAgent(
+        Platform.isIOS
+            ? 'Mozilla/5.0 (iPhone; CPU iPhone OS 18_6 like Mac OS X) '
+                'AppleWebKit/605.1.15 (KHTML, like Gecko) Version/26.0 '
+                'Mobile/15E148 Safari/604.1'
+            : 'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 '
+                '(KHTML, like Gecko) Chrome/135.0.0.0 Mobile Safari/537.36',
+      )
+      ..addJavaScriptChannel(
+        'FrostyIntegrity',
+        onMessageReceived: _onIntegrityMessage,
+      )
+      ..setNavigationDelegate(
+        NavigationDelegate(
+          onPageStarted: (_) => _injectHooks(),
+          onPageFinished: (_) => _injectHooks(),
+        ),
+      );
+
+    _prepareAndLoad();
+    _timeout = Timer(_captureTimeout, () {
+      if (!mounted || _captured) return;
+      setState(() => _status = 'Timed out waiting for Twitch. Try again.');
+    });
+  }
+
+  Future<void> _prepareAndLoad() async {
+    try {
+      final cookies = WebViewCookieManager();
+      await cookies.setCookie(
+        WebViewCookie(
+          name: 'auth-token',
+          value: widget.gqlToken,
+          domain: '.twitch.tv',
+        ),
+      );
+    } catch (e) {
+      debugPrint('IntegrityWebView: cookie set failed: $e');
+    }
+
+    // Same entry as Xtra: with auth-token set, Twitch redirects and emits GQL
+    // requests that carry a browser-valid Client-Integrity header.
+    await _controller.loadRequest(Uri.parse('https://www.twitch.tv/login'));
+  }
+
+  Future<void> _injectHooks() async {
+    // Hook fetch + XHR so we see Client-Integrity on Twitch's own GQL traffic.
+    const script = r'''
+(function () {
+  if (window.__frostyIntegrityHooked) return;
+  window.__frostyIntegrityHooked = true;
+
+  function report(headers) {
+    if (!headers || !window.FrostyIntegrity) return;
+    var integrity = headers['Client-Integrity'] || headers['client-integrity'];
+    if (!integrity) return;
+    var deviceId = headers['X-Device-Id'] || headers['x-device-id'] || '';
+    var clientId = headers['Client-ID'] || headers['Client-Id'] || headers['client-id'] || '';
+    window.FrostyIntegrity.postMessage(JSON.stringify({
+      integrity: integrity,
+      deviceId: deviceId,
+      clientId: clientId
+    }));
+  }
+
+  function headersToObject(headers) {
+    var out = {};
+    if (!headers) return out;
+    if (typeof Headers !== 'undefined' && headers instanceof Headers) {
+      headers.forEach(function (value, key) { out[key] = value; });
+      return out;
+    }
+    if (typeof headers === 'object') {
+      Object.keys(headers).forEach(function (key) { out[key] = headers[key]; });
+    }
+    return out;
+  }
+
+  var originalFetch = window.fetch;
+  window.fetch = function (input, init) {
+    try {
+      report(headersToObject(init && init.headers));
+    } catch (e) {}
+    return originalFetch.apply(this, arguments);
+  };
+
+  var originalOpen = XMLHttpRequest.prototype.open;
+  var originalSetHeader = XMLHttpRequest.prototype.setRequestHeader;
+  var originalSend = XMLHttpRequest.prototype.send;
+  XMLHttpRequest.prototype.open = function () {
+    this.__frostyHeaders = {};
+    return originalOpen.apply(this, arguments);
+  };
+  XMLHttpRequest.prototype.setRequestHeader = function (key, value) {
+    try { this.__frostyHeaders[key] = value; } catch (e) {}
+    return originalSetHeader.apply(this, arguments);
+  };
+  XMLHttpRequest.prototype.send = function () {
+    try { report(this.__frostyHeaders || {}); } catch (e) {}
+    return originalSend.apply(this, arguments);
+  };
+})();
+''';
+
+    try {
+      await _controller.runJavaScript(script);
+    } catch (e) {
+      debugPrint('IntegrityWebView: hook inject failed: $e');
+    }
+  }
+
+  void _onIntegrityMessage(JavaScriptMessage message) {
+    if (_captured || !mounted) return;
+
+    try {
+      final map = jsonDecode(message.message) as Map<String, dynamic>;
+      final integrity = map['integrity'] as String?;
+      if (integrity == null || integrity.isEmpty) return;
+      if (TwitchIntegrity.isBadBot(integrity)) {
+        debugPrint('IntegrityWebView: ignoring bad_bot token');
+        return;
+      }
+
+      final fromHeader = map['deviceId'] as String?;
+      final fromToken = TwitchIntegrity.deviceId(integrity);
+      final deviceId = (fromHeader != null && fromHeader.isNotEmpty)
+          ? fromHeader
+          : (fromToken ?? '');
+      if (deviceId.isEmpty) {
+        debugPrint('IntegrityWebView: missing device id');
+        return;
+      }
+
+      final expiration = TwitchIntegrity.expirationMs(integrity) ??
+          DateTime.now().millisecondsSinceEpoch + const Duration(hours: 16).inMilliseconds;
+
+      _captured = true;
+      _timeout?.cancel();
+      Navigator.of(context).pop(
+        GqlIntegrityCredentials(
+          integrityToken: integrity,
+          deviceId: deviceId,
+          expirationMs: expiration,
+        ),
+      );
+    } catch (e) {
+      debugPrint('IntegrityWebView: parse failed: $e');
+    }
+  }
+
+  @override
+  void dispose() {
+    _timeout?.cancel();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final height = MediaQuery.sizeOf(context).height * 0.55;
+    return AlertDialog(
+      title: const Text('Confirm with Twitch'),
+      content: SizedBox(
+        width: double.maxFinite,
+        height: height.clamp(280.0, 520.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            Text(_status),
+            const SizedBox(height: 12),
+            Expanded(
+              child: ClipRRect(
+                borderRadius: BorderRadius.circular(8),
+                child: WebViewWidget(controller: _controller),
+              ),
+            ),
+          ],
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: const Text('Cancel'),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/list_tile.dart b/lib/widgets/list_tile.dart
deleted file mode 100644
index e553352e..00000000
--- a/lib/widgets/list_tile.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-import 'package:flutter/material.dart';
-
-class FrostyListTile extends StatelessWidget {
-  final bool? isThreeLine;
-  final Widget? leading;
-  final String title;
-  final Widget? subtitle;
-  final Widget? trailing;
-  final GestureTapCallback? onTap;
-
-  const FrostyListTile({
-    Key? key,
-    this.isThreeLine,
-    this.leading,
-    required this.title,
-    this.trailing,
-    this.onTap,
-    this.subtitle,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      isThreeLine: isThreeLine ?? subtitle != null,
-      leading: leading,
-      title: Text(title, style: const TextStyle(fontWeight: FontWeight.w600)),
-      subtitle: subtitle,
-      trailing: trailing,
-      onTap: onTap,
-    );
-  }
-}
diff --git a/lib/widgets/live_indicator.dart b/lib/widgets/live_indicator.dart
new file mode 100644
index 00000000..3ef42f18
--- /dev/null
+++ b/lib/widgets/live_indicator.dart
@@ -0,0 +1,198 @@
+import 'package:flutter/material.dart';
+
+/// A live indicator widget that displays a red dot with a ping animation.
+/// Used to indicate when a channel or stream is currently live.
+class LiveIndicator extends StatefulWidget {
+  /// The size of the indicator dot.
+  final double size;
+
+  /// The color of the indicator. Defaults to red.
+  final Color color;
+
+  const LiveIndicator({
+    super.key,
+    this.size = _LiveIndicatorState._defaultSize,
+    this.color = Colors.red,
+  });
+
+  @override
+  State<LiveIndicator> createState() => _LiveIndicatorState();
+}
+
+class _LiveIndicatorState extends State<LiveIndicator>
+    with TickerProviderStateMixin, WidgetsBindingObserver {
+  // ===========================================================================
+  // CONFIGURABLE ANIMATION PARAMETERS
+  // ===========================================================================
+
+  // Animation timing
+  static const Duration _animationDuration = Duration(milliseconds: 1000);
+
+  // Size scaling
+  static const double _defaultSize = 8.0;
+  static const double _pingScaleStart = 1.0;
+  static const double _pingScaleEnd = 2.5;
+
+  // Opacity settings
+  static const double _pingOpacityStart = 1.0;
+  static const double _pingOpacityEnd = 0.0;
+
+  // Visual appearance
+  static const double _borderWidth = 2.5;
+  static const double _borderOpacity = 0.8;
+
+  // ===========================================================================
+  // STATE VARIABLES
+  // ===========================================================================
+
+  AnimationController? _pingController;
+  Animation<double>? _pingScale;
+  Animation<double>? _pingOpacity;
+
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addObserver(this);
+    _initAnimations();
+  }
+
+  @override
+  void didUpdateWidget(LiveIndicator oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    // Reinitialize animations if widget properties changed during hot reload
+    if (oldWidget.size != widget.size || oldWidget.color != widget.color) {
+      _disposeAnimations();
+      _initAnimations();
+    }
+  }
+
+  void _initAnimations() {
+    _pingController = AnimationController(
+      duration: _animationDuration,
+      vsync: this,
+    )..repeat();
+
+    _pingScale = Tween<double>(
+      begin: _pingScaleStart,
+      end: _pingScaleEnd,
+    ).animate(CurvedAnimation(parent: _pingController!, curve: Curves.easeOut));
+
+    _pingOpacity = Tween<double>(
+      begin: _pingOpacityStart,
+      end: _pingOpacityEnd,
+    ).animate(CurvedAnimation(parent: _pingController!, curve: Curves.easeOut));
+  }
+
+  void _disposeAnimations() {
+    _pingController?.dispose();
+    _pingController = null;
+    _pingScale = null;
+    _pingOpacity = null;
+  }
+
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    _disposeAnimations();
+    super.dispose();
+  }
+
+  // Ensure animations refresh properly during hot reload/hot restart in debug.
+  @override
+  void reassemble() {
+    super.reassemble();
+    _disposeAnimations();
+    _initAnimations();
+  }
+
+  // Handle app lifecycle (e.g., returning from background) to keep animation running.
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (_pingController == null) return;
+    switch (state) {
+      case AppLifecycleState.resumed:
+        if (!_pingController!.isAnimating) {
+          _pingController!.repeat();
+        }
+        break;
+      case AppLifecycleState.inactive:
+      case AppLifecycleState.paused:
+      case AppLifecycleState.detached:
+        _pingController!.stop();
+        break;
+      case AppLifecycleState.hidden:
+        _pingController!.stop();
+        break;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Handle case where animations aren't initialized (hot reload issue)
+    if (_pingController == null || _pingScale == null || _pingOpacity == null) {
+      _initAnimations();
+      return Container(
+        width: widget.size,
+        height: widget.size,
+        decoration: BoxDecoration(color: widget.color, shape: BoxShape.circle),
+      );
+    }
+
+    return SizedBox(
+      width: widget.size,
+      height: widget.size,
+      child: Stack(
+        alignment: Alignment.center,
+        clipBehavior: Clip.none,
+        children: [
+          // Ping ring in its own RepaintBoundary so its 60fps animation
+          // doesn't dirty the overlay's compositing layer (expensive with
+          // Impeller + PlatformView).
+          Positioned.fill(
+            child: RepaintBoundary(
+              child: AnimatedBuilder(
+                animation: _pingController!,
+                builder: (context, child) {
+                  final pingSize = widget.size * _pingScale!.value;
+                  return IgnorePointer(
+                    child: OverflowBox(
+                      maxWidth: pingSize,
+                      maxHeight: pingSize,
+                      child: Center(
+                        child: Opacity(
+                          opacity: _pingOpacity!.value,
+                          child: Container(
+                            width: pingSize,
+                            height: pingSize,
+                            decoration: BoxDecoration(
+                              shape: BoxShape.circle,
+                              border: Border.all(
+                                color: widget.color.withValues(
+                                  alpha: _borderOpacity,
+                                ),
+                                width: _borderWidth,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  );
+                },
+              ),
+            ),
+          ),
+          // Static center dot
+          Container(
+            width: widget.size,
+            height: widget.size,
+            decoration: BoxDecoration(
+              color: widget.color,
+              shape: BoxShape.circle,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/loading_indicator.dart b/lib/widgets/loading_indicator.dart
index 6e76a330..41bdbf07 100644
--- a/lib/widgets/loading_indicator.dart
+++ b/lib/widgets/loading_indicator.dart
@@ -4,8 +4,7 @@ class LoadingIndicator extends StatelessWidget {
   final String? subtitle;
   final double spacing;
 
-  const LoadingIndicator({Key? key, this.subtitle, this.spacing = 10.0})
-      : super(key: key);
+  const LoadingIndicator({super.key, this.subtitle, this.spacing = 8});
 
   @override
   Widget build(BuildContext context) {
@@ -19,9 +18,8 @@ class LoadingIndicator extends StatelessWidget {
         SizedBox(height: spacing),
         Text(
           subtitle!,
-          style: const TextStyle(
-            fontWeight: FontWeight.w500,
-            color: Colors.grey,
+          style: TextStyle(
+            color: Theme.of(context).colorScheme.onSurfaceVariant,
           ),
         ),
       ],
diff --git a/lib/widgets/measure_size.dart b/lib/widgets/measure_size.dart
new file mode 100644
index 00000000..b7cba10d
--- /dev/null
+++ b/lib/widgets/measure_size.dart
@@ -0,0 +1,46 @@
+import 'package:flutter/rendering.dart';
+import 'package:flutter/widgets.dart';
+
+/// Reports the rendered size of [child] via [onChange] whenever it changes.
+///
+/// Unlike `LayoutBuilder` (which exposes incoming constraints, not intrinsic
+/// size), this measures the child's actual laid-out size. The callback is
+/// deferred to a post-frame callback so listeners can safely mutate state
+/// (e.g. a store observable) without triggering a build-phase mutation.
+class MeasureSize extends SingleChildRenderObjectWidget {
+  const MeasureSize({
+    super.key,
+    required this.onChange,
+    required Widget super.child,
+  });
+
+  final ValueChanged<Size> onChange;
+
+  @override
+  RenderObject createRenderObject(BuildContext context) =>
+      _MeasureSizeRenderObject(onChange);
+
+  @override
+  void updateRenderObject(BuildContext context, RenderObject renderObject) {
+    (renderObject as _MeasureSizeRenderObject).onChange = onChange;
+  }
+}
+
+class _MeasureSizeRenderObject extends RenderProxyBox {
+  _MeasureSizeRenderObject(this.onChange);
+
+  ValueChanged<Size> onChange;
+  Size? _oldSize;
+
+  @override
+  void performLayout() {
+    super.performLayout();
+
+    final newSize = child?.size ?? Size.zero;
+    if (_oldSize == newSize) return;
+    _oldSize = newSize;
+
+    // Defer out of the layout phase so the callback can mutate observed state.
+    WidgetsBinding.instance.addPostFrameCallback((_) => onChange(newSize));
+  }
+}
diff --git a/lib/widgets/notification.dart b/lib/widgets/notification.dart
deleted file mode 100644
index 2c292bc2..00000000
--- a/lib/widgets/notification.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:frosty/main.dart';
-import 'package:frosty/widgets/button.dart';
-
-class FrostyNotification extends StatelessWidget {
-  final String message;
-  final bool showPasteButton;
-  final Function() onButtonPressed;
-
-  const FrostyNotification({
-    Key? key,
-    required this.message,
-    required this.showPasteButton,
-    required this.onButtonPressed,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(
-        color: lightGray,
-        borderRadius: BorderRadius.circular(10.0),
-      ),
-      margin: const EdgeInsets.all(10),
-      child: Row(
-        children: [
-          Expanded(
-            child: Padding(
-              padding: const EdgeInsets.all(10),
-              child: Row(
-                children: [
-                  const Icon(
-                    Icons.info_outline_rounded,
-                    color: Colors.white,
-                  ),
-                  const SizedBox(width: 10),
-                  Expanded(
-                    child: Text(
-                      message,
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontWeight: FontWeight.w500,
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-          if (showPasteButton)
-            Button(
-              onPressed: onButtonPressed,
-              color: purple,
-              child: const Text('Paste'),
-            ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/page_view.dart b/lib/widgets/page_view.dart
deleted file mode 100644
index 04031bdf..00000000
--- a/lib/widgets/page_view.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-import 'package:collection/collection.dart';
-import 'package:flutter/material.dart';
-import 'package:frosty/widgets/button.dart';
-
-class FrostyPageView extends StatefulWidget {
-  final List<String> headers;
-  final List<Widget> children;
-
-  const FrostyPageView({
-    Key? key,
-    required this.headers,
-    required this.children,
-  })  : assert(headers.length == children.length),
-        super(key: key);
-
-  @override
-  State<FrostyPageView> createState() => _FrostyPageViewState();
-}
-
-class _FrostyPageViewState extends State<FrostyPageView> {
-  var currentIndex = 0;
-
-  late final PageController _pageContoller =
-      PageController(initialPage: currentIndex);
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const Divider(
-          height: 5.0,
-          thickness: 1.0,
-        ),
-        SingleChildScrollView(
-          scrollDirection: Axis.horizontal,
-          child: Row(
-            children: [
-              ...widget.headers.mapIndexed(
-                (index, section) => SizedBox(
-                  height: 40,
-                  child: Button(
-                    padding: const EdgeInsets.symmetric(
-                        horizontal: 10.0, vertical: 5.0),
-                    onPressed: () => _pageContoller.animateToPage(
-                      index,
-                      duration: const Duration(milliseconds: 200),
-                      curve: Curves.easeOut,
-                    ),
-                    color: index == currentIndex
-                        ? Theme.of(context).colorScheme.secondary
-                        : Colors.grey,
-                    child: Text(
-                      section,
-                      style: const TextStyle(fontWeight: FontWeight.w600),
-                    ),
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-        Expanded(
-          child: PageView.builder(
-            onPageChanged: (index) => setState(() => currentIndex = index),
-            controller: _pageContoller,
-            itemBuilder: (context, index) => widget.children[index],
-            itemCount: widget.children.length,
-          ),
-        ),
-      ],
-    );
-  }
-
-  @override
-  void dispose() {
-    _pageContoller.dispose();
-    super.dispose();
-  }
-}
diff --git a/lib/widgets/profile_picture.dart b/lib/widgets/profile_picture.dart
index 51863630..8580d66a 100644
--- a/lib/widgets/profile_picture.dart
+++ b/lib/widgets/profile_picture.dart
@@ -1,49 +1,85 @@
 import 'package:flutter/material.dart';
 import 'package:frosty/apis/twitch_api.dart';
-import 'package:frosty/main.dart';
-import 'package:frosty/models/user.dart';
-import 'package:frosty/screens/settings/stores/auth_store.dart';
-import 'package:frosty/widgets/cached_image.dart';
+import 'package:frosty/widgets/frosty_cached_network_image.dart';
 import 'package:provider/provider.dart';
 
-class ProfilePicture extends StatelessWidget {
+class ProfilePicture extends StatefulWidget {
   final String userLogin;
   final double radius;
 
   const ProfilePicture({
-    Key? key,
+    super.key,
     required this.userLogin,
     this.radius = 20,
-  }) : super(key: key);
+  });
+
+  @override
+  State<ProfilePicture> createState() => _ProfilePictureState();
+}
+
+class _ProfilePictureState extends State<ProfilePicture> {
+  // Cache profile image URLs to avoid repeated API calls
+  static final Map<String, String> _urlCache = {};
+  static final Map<String, Future<String>> _pendingRequests = {};
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  Future<String> _getProfileImageUrl() async {
+    final userLogin = widget.userLogin;
+
+    // Return cached URL if available
+    if (_urlCache.containsKey(userLogin)) {
+      return _urlCache[userLogin]!;
+    }
+
+    // Return existing pending request if one is already in progress
+    if (_pendingRequests.containsKey(userLogin)) {
+      return _pendingRequests[userLogin]!;
+    }
+
+    // Make new request and cache it
+    final future = context
+        .read<TwitchApi>()
+        .getUser(userLogin: userLogin)
+        .then((user) => user.profileImageUrl);
+    _pendingRequests[userLogin] = future;
+
+    try {
+      final url = await future;
+      _urlCache[userLogin] = url;
+      _pendingRequests.remove(userLogin);
+      return url;
+    } catch (e) {
+      _pendingRequests.remove(userLogin);
+      rethrow;
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
-    final diameter = radius * 2;
+    final diameter = widget.radius * 2;
+    final placeholderColor = Theme.of(context).colorScheme.surfaceContainer;
 
     return ClipOval(
-      child: FutureBuilder(
-        future: context.read<TwitchApi>().getUser(
-            userLogin: userLogin,
-            headers: context.read<AuthStore>().headersTwitch),
-        builder: (context, AsyncSnapshot<UserTwitch> snapshot) {
-          return AnimatedSwitcher(
-            duration: const Duration(milliseconds: 200),
-            switchInCurve: Curves.easeOut,
-            switchOutCurve: Curves.easeIn,
-            child: snapshot.hasData
-                ? FrostyCachedNetworkImage(
-                    width: diameter,
-                    height: diameter,
-                    imageUrl: snapshot.data!.profileImageUrl,
-                    placeholder: (context, url) =>
-                        const ColoredBox(color: lightGray),
-                  )
-                : Container(
-                    color: lightGray,
-                    width: diameter,
-                    height: diameter,
-                  ),
-          );
+      child: FutureBuilder<String>(
+        future: _getProfileImageUrl(),
+        builder: (context, snapshot) {
+          return snapshot.hasData
+              ? FrostyCachedNetworkImage(
+                  width: diameter,
+                  height: diameter,
+                  imageUrl: snapshot.data!,
+                  placeholder: (context, url) =>
+                      ColoredBox(color: placeholderColor),
+                )
+              : Container(
+                  color: placeholderColor,
+                  width: diameter,
+                  height: diameter,
+                );
         },
       ),
     );
diff --git a/lib/widgets/scroll_to_top_button.dart b/lib/widgets/scroll_to_top_button.dart
index 3cee8c5b..6a37ae6b 100644
--- a/lib/widgets/scroll_to_top_button.dart
+++ b/lib/widgets/scroll_to_top_button.dart
@@ -1,27 +1,30 @@
 import 'package:flutter/material.dart';
-import 'package:frosty/widgets/button.dart';
 
 class ScrollToTopButton extends StatelessWidget {
   final ScrollController scrollController;
 
-  const ScrollToTopButton({Key? key, required this.scrollController})
-      : super(key: key);
+  const ScrollToTopButton({super.key, required this.scrollController});
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 5.0),
-      child: Tooltip(
-        message: 'Scroll to top',
-        preferBelow: false,
-        child: Button(
-          onPressed: () => scrollController.animateTo(
-            0.0,
-            curve: Curves.easeOut,
-            duration: const Duration(milliseconds: 500),
+    return SafeArea(
+      child: Padding(
+        padding: const EdgeInsets.only(bottom: 8),
+        child: Tooltip(
+          message: 'Scroll to top',
+          preferBelow: false,
+          child: FilledButton(
+            onPressed: () => scrollController.animateTo(
+              0.0,
+              curve: Curves.easeOut,
+              duration: const Duration(milliseconds: 500),
+            ),
+            style: FilledButton.styleFrom(
+              shape: const CircleBorder(),
+              padding: const EdgeInsets.all(12),
+            ),
+            child: const Icon(Icons.arrow_upward_rounded),
           ),
-          padding: const EdgeInsets.symmetric(horizontal: 25.0, vertical: 10.0),
-          child: const Icon(Icons.keyboard_double_arrow_up_rounded),
         ),
       ),
     );
diff --git a/lib/widgets/section_header.dart b/lib/widgets/section_header.dart
index 0683c6b9..40d4855a 100644
--- a/lib/widgets/section_header.dart
+++ b/lib/widgets/section_header.dart
@@ -1,29 +1,50 @@
 import 'package:flutter/material.dart';
-import 'package:frosty/main.dart';
+import 'package:frosty/utils/context_extensions.dart';
 
 class SectionHeader extends StatelessWidget {
   final String text;
   final EdgeInsets? padding;
   final double? fontSize;
+  final bool isFirst;
+  final double? topPadding;
 
   const SectionHeader(
     this.text, {
-    Key? key,
+    super.key,
     this.padding,
     this.fontSize,
-  }) : super(key: key);
+    this.isFirst = false,
+    this.topPadding,
+  });
 
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: padding ?? const EdgeInsets.fromLTRB(16, 30, 16, 5),
-      child: Text(
-        text,
-        style: TextStyle(
-          color: purple,
-          fontSize: fontSize ?? 16,
-          fontWeight: FontWeight.w600,
-        ),
+      padding:
+          padding ??
+          EdgeInsets.fromLTRB(
+            16 + MediaQuery.of(context).padding.left,
+            0,
+            16 + MediaQuery.of(context).padding.right,
+            8,
+          ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          if (!isFirst) ...[SizedBox(height: topPadding ?? 32)],
+          Text(
+            text.toUpperCase(),
+            style: TextStyle(
+              fontSize: fontSize ?? 12,
+              fontWeight: FontWeight.w500,
+              letterSpacing: 0.8,
+              color: context.colorScheme.onSurfaceVariant.withValues(
+                alpha: 0.6,
+              ),
+            ),
+          ),
+        ],
       ),
     );
   }
diff --git a/lib/widgets/settings_page_layout.dart b/lib/widgets/settings_page_layout.dart
new file mode 100644
index 00000000..67041760
--- /dev/null
+++ b/lib/widgets/settings_page_layout.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:frosty/utils/context_extensions.dart';
+import 'package:frosty/widgets/frosty_scrollbar.dart';
+
+/// A reusable layout for settings pages that handles common functionality:
+/// - Orientation detection
+/// - Responsive padding calculations
+/// - ScrollController management
+class SettingsPageLayout extends StatefulWidget {
+  final List<Widget> children;
+  final bool hasBottomPadding;
+  final EdgeInsetsGeometry? additionalPadding;
+  final RefreshCallback? onRefresh;
+
+  const SettingsPageLayout({
+    super.key,
+    required this.children,
+    this.hasBottomPadding = true,
+    this.additionalPadding,
+    this.onRefresh,
+  });
+
+  @override
+  State<SettingsPageLayout> createState() => _SettingsPageLayoutState();
+}
+
+class _SettingsPageLayoutState extends State<SettingsPageLayout> {
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isPortrait = context.isPortrait;
+
+    // Responsive values based on orientation
+    final listPadding = EdgeInsets.only(
+      top: isPortrait ? 124 : 100,
+      bottom: widget.hasBottomPadding ? context.safePaddingBottom + 8 : 0,
+    );
+
+    final borderTop = isPortrait ? 108 : 84;
+
+    final content = Stack(
+      children: [
+        FrostyScrollbar(
+          controller: _scrollController,
+          padding: EdgeInsets.only(top: borderTop.toDouble()),
+          child: ListView(
+            controller: _scrollController,
+            padding: widget.additionalPadding != null
+                ? widget.additionalPadding!.add(listPadding)
+                : listPadding,
+            children: widget.children,
+          ),
+        ),
+      ],
+    );
+
+    // Conditionally wrap with RefreshIndicator if onRefresh is provided
+    if (widget.onRefresh != null) {
+      return RefreshIndicator.adaptive(
+        onRefresh: widget.onRefresh!,
+        child: content,
+      );
+    }
+
+    return content;
+  }
+}
diff --git a/lib/widgets/skeleton_loader.dart b/lib/widgets/skeleton_loader.dart
new file mode 100644
index 00000000..75415d4e
--- /dev/null
+++ b/lib/widgets/skeleton_loader.dart
@@ -0,0 +1,453 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:frosty/constants.dart';
+
+/// A skeleton loading widget that displays a pulsing placeholder
+class SkeletonLoader extends StatefulWidget {
+  final double? width;
+  final double? height;
+  final BorderRadius? borderRadius;
+
+  const SkeletonLoader({super.key, this.width, this.height, this.borderRadius});
+
+  @override
+  State<SkeletonLoader> createState() => _SkeletonLoaderState();
+}
+
+class _SkeletonLoaderState extends State<SkeletonLoader>
+    with SingleTickerProviderStateMixin {
+  late AnimationController _animationController;
+  late Animation<double> _animation;
+
+  @override
+  void initState() {
+    super.initState();
+    _animationController = AnimationController(
+      duration: const Duration(milliseconds: 1200),
+      vsync: this,
+    );
+    _animation = Tween<double>(begin: 0.3, end: 0.9).animate(
+      CurvedAnimation(parent: _animationController, curve: Curves.easeInOut),
+    );
+    _animationController.repeat(reverse: true);
+  }
+
+  @override
+  void dispose() {
+    _animationController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final brightness = Theme.of(context).brightness;
+
+    // Make skeleton more visible in dark mode
+    final baseColor = brightness == Brightness.dark
+        ? colorScheme.surfaceContainerHighest
+        : colorScheme.surfaceContainer;
+
+    return AnimatedBuilder(
+      animation: _animation,
+      builder: (context, child) {
+        return Container(
+          width: widget.width,
+          height: widget.height,
+          decoration: BoxDecoration(
+            color: baseColor.withValues(alpha: _animation.value),
+            borderRadius: widget.borderRadius ?? BorderRadius.circular(8),
+          ),
+        );
+      },
+    );
+  }
+}
+
+/// A skeleton loader with random width for text placeholders
+class SkeletonText extends StatelessWidget {
+  final double height;
+  final double? minWidth;
+  final double? maxWidth;
+  final BorderRadius? borderRadius;
+
+  const SkeletonText({
+    super.key,
+    required this.height,
+    this.minWidth,
+    this.maxWidth,
+    this.borderRadius,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final random = Random();
+    final screenWidth = MediaQuery.of(context).size.width;
+
+    // Calculate random width based on provided constraints or reasonable defaults
+    final min = minWidth ?? screenWidth * 0.3;
+    final max = maxWidth ?? screenWidth * 0.8;
+    final randomWidth = min + random.nextDouble() * (max - min);
+
+    return SkeletonLoader(
+      width: randomWidth,
+      height: height,
+      borderRadius: borderRadius ?? const BorderRadius.all(Radius.circular(4)),
+    );
+  }
+}
+
+/// A skeleton loader for channel list items
+class ChannelSkeletonLoader extends StatelessWidget {
+  final bool showSubtitle;
+  final int index;
+
+  const ChannelSkeletonLoader({
+    super.key,
+    this.showSubtitle = true,
+    this.index = 0,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // Show subtitle for first 3-4 items (simulating live channels at top)
+    // then single line for the rest
+    final shouldShowSubtitle = showSubtitle && index < 4;
+
+    return ListTile(
+      dense: true,
+      contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+      leading: const SkeletonLoader(
+        width: 32,
+        height: 32,
+        borderRadius: BorderRadius.all(Radius.circular(16)),
+      ),
+      title: SkeletonText(height: 16, minWidth: 60, maxWidth: 140),
+      subtitle: shouldShowSubtitle
+          ? SkeletonText(height: 14, minWidth: 30, maxWidth: 80)
+          : null,
+    );
+  }
+}
+
+/// A skeleton loader for category list items
+class CategorySkeletonLoader extends StatelessWidget {
+  const CategorySkeletonLoader({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.only(
+        top: 8,
+        bottom: 8,
+        left: 16 + MediaQuery.of(context).padding.left,
+        right: 16 + MediaQuery.of(context).padding.right,
+      ),
+      child: Row(
+        spacing: 16,
+        children: [
+          // Category box art skeleton (3:4 aspect ratio, 80px wide)
+          SizedBox(
+            width: 80,
+            child: AspectRatio(
+              aspectRatio: 3 / 4,
+              child: const SkeletonLoader(
+                borderRadius: kCardBorderRadius,
+              ),
+            ),
+          ),
+          // Category name skeleton with random width (matches bodyLarge text)
+          Flexible(
+            child: SkeletonText(height: 18, minWidth: 80, maxWidth: 180),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// A skeleton loader for stream cards with thumbnail
+class StreamCardSkeletonLoader extends StatelessWidget {
+  final bool showThumbnail;
+  final bool showCategory;
+
+  const StreamCardSkeletonLoader({
+    super.key,
+    this.showThumbnail = true,
+    this.showCategory = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.only(
+        top: 8,
+        bottom: 8,
+        left: showThumbnail
+            ? 16 + MediaQuery.of(context).padding.left
+            : 4 + MediaQuery.of(context).padding.left,
+        right: showThumbnail
+            ? 16 + MediaQuery.of(context).padding.right
+            : 4 + MediaQuery.of(context).padding.right,
+      ),
+      child: Row(
+        children: [
+          if (showThumbnail) ...[
+            // Thumbnail skeleton (16:9 aspect ratio)
+            Flexible(
+              child: AspectRatio(
+                aspectRatio: 16 / 9,
+                child: const SkeletonLoader(
+                  borderRadius: kCardBorderRadius,
+                ),
+              ),
+            ),
+          ],
+          // Stream info skeleton
+          Flexible(
+            flex: 2,
+            child: Padding(
+              padding: const EdgeInsets.only(left: 12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                spacing: 8,
+                children: [
+                  // Streamer name row
+                  Row(
+                    spacing: 4,
+                    children: [
+                      const SkeletonLoader(
+                        width: 20,
+                        height: 20,
+                        borderRadius: BorderRadius.all(Radius.circular(10)),
+                      ),
+                      Expanded(
+                        child: SkeletonText(
+                          height: 16,
+                          minWidth: 60,
+                          maxWidth: 120,
+                        ),
+                      ),
+                    ],
+                  ),
+                  // Stream title skeleton with random width
+                  SkeletonText(height: 14, minWidth: 100, maxWidth: 200),
+                  if (showCategory) ...[
+                    // Category skeleton with random width
+                    SkeletonText(height: 14, minWidth: 60, maxWidth: 120),
+                  ],
+                  // Viewer count skeleton with random width
+                  SkeletonText(height: 14, minWidth: 50, maxWidth: 90),
+                ],
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// A skeleton loader for StreamInfoBar component
+class StreamInfoBarSkeletonLoader extends StatelessWidget {
+  final bool showCategory;
+  final bool showUptime;
+  final bool showViewerCount;
+  final EdgeInsets padding;
+
+  const StreamInfoBarSkeletonLoader({
+    super.key,
+    this.showCategory = true,
+    this.showUptime = true,
+    this.showViewerCount = true,
+    this.padding = EdgeInsets.zero,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    // Show bottom row if any of the conditional elements should be displayed
+    final showBottomRow = showUptime || showViewerCount || showCategory;
+
+    return Padding(
+      padding: padding,
+      child: Row(
+        spacing: 12,
+        children: [
+          // ProfilePicture skeleton (radius 16)
+          const SkeletonLoader(
+            width: 32,
+            height: 32,
+            borderRadius: BorderRadius.all(Radius.circular(16)),
+          ),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              spacing: 2,
+              children: [
+                // Top row: Streamer name + stream title
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.baseline,
+                  textBaseline: TextBaseline.alphabetic,
+                  spacing: 8,
+                  children: [
+                    // Streamer name skeleton
+                    SkeletonText(height: 14, minWidth: 60, maxWidth: 120),
+                    // Stream title skeleton (flexible)
+                    Flexible(
+                      child: SkeletonText(
+                        height: 14,
+                        minWidth: 80,
+                        maxWidth: 200,
+                      ),
+                    ),
+                  ],
+                ),
+                // Bottom row: Live indicator, uptime, viewer count, game name
+                if (showBottomRow) ...[
+                  Row(
+                    children: [
+                      if (showUptime || showViewerCount) ...[
+                        // Live indicator skeleton (matches LiveIndicator default size)
+                        const SkeletonLoader(
+                          width: 8.0,
+                          height: 8.0,
+                          borderRadius: BorderRadius.all(Radius.circular(4)),
+                        ),
+                        const SizedBox(width: 6),
+                      ],
+                      if (showUptime) ...[
+                        // Uptime skeleton
+                        SkeletonText(height: 14, minWidth: 40, maxWidth: 70),
+                        if (showViewerCount) const SizedBox(width: 8),
+                      ],
+                      if (showViewerCount) ...[
+                        // Viewer count icon skeleton
+                        const SkeletonLoader(
+                          width: 14,
+                          height: 14,
+                          borderRadius: BorderRadius.all(Radius.circular(2)),
+                        ),
+                        const SizedBox(width: 4),
+                        // Viewer count text skeleton
+                        SkeletonText(height: 14, minWidth: 30, maxWidth: 80),
+                      ],
+                      if (showCategory && (showUptime || showViewerCount)) ...[
+                        const SizedBox(width: 8),
+                      ],
+                      if (showCategory) ...[
+                        // Category icon skeleton (gamepad)
+                        const SkeletonLoader(
+                          width: 14,
+                          height: 14,
+                          borderRadius: BorderRadius.all(Radius.circular(2)),
+                        ),
+                        const SizedBox(width: 4),
+                        // Category text skeleton (flexible)
+                        Flexible(
+                          child: SkeletonText(
+                            height: 14,
+                            minWidth: 60,
+                            maxWidth: 140,
+                          ),
+                        ),
+                      ],
+                    ],
+                  ),
+                ],
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// A skeleton loader for large stream cards (grid layout)
+class LargeStreamCardSkeletonLoader extends StatelessWidget {
+  final bool showThumbnail;
+  final bool showCategory;
+
+  const LargeStreamCardSkeletonLoader({
+    super.key,
+    this.showThumbnail = true,
+    this.showCategory = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.only(
+        top: showThumbnail ? 12 : 4,
+        bottom: showThumbnail ? 12 : 4,
+        left: 16 + MediaQuery.of(context).padding.left,
+        right: 16 + MediaQuery.of(context).padding.right,
+      ),
+      child: Column(
+        children: [
+          if (showThumbnail) ...[
+            // Thumbnail skeleton (16:9 aspect ratio)
+            SizedBox(
+              width: double.infinity,
+              child: ClipRRect(
+                borderRadius: kCardBorderRadius,
+                child: AspectRatio(
+                  aspectRatio: 16 / 9,
+                  child: const SkeletonLoader(
+                    borderRadius: kCardBorderRadius,
+                  ),
+                ),
+              ),
+            ),
+          ],
+          // Stream info bar skeleton - matches the actual StreamInfoBar usage
+          StreamInfoBarSkeletonLoader(
+            showCategory: showCategory,
+            padding: const EdgeInsets.symmetric(vertical: 12),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// A skeleton loader for offline channel cards
+class OfflineChannelCardSkeletonLoader extends StatelessWidget {
+  const OfflineChannelCardSkeletonLoader({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.symmetric(
+        horizontal: 16 + MediaQuery.of(context).padding.left,
+        vertical: 8,
+      ),
+      child: Row(
+        spacing: 12,
+        children: [
+          // Profile picture skeleton (radius 24 = 48px diameter)
+          const SkeletonLoader(
+            width: 48,
+            height: 48,
+            borderRadius: BorderRadius.all(Radius.circular(24)),
+          ),
+          // Channel info skeleton
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              spacing: 8,
+              children: [
+                // Channel name skeleton
+                SkeletonText(height: 16, minWidth: 80, maxWidth: 160),
+                // Following duration skeleton
+                SkeletonText(height: 14, minWidth: 100, maxWidth: 140),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/stream_sort_button.dart b/lib/widgets/stream_sort_button.dart
new file mode 100644
index 00000000..883fc363
--- /dev/null
+++ b/lib/widgets/stream_sort_button.dart
@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+
+/// Toggles viewer-count sort between descending (default) and ascending.
+class StreamSortButton extends StatelessWidget {
+  final StreamViewerSort sortOrder;
+  final ValueChanged<StreamViewerSort> onChanged;
+
+  const StreamSortButton({
+    super.key,
+    required this.sortOrder,
+    required this.onChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final isAsc = sortOrder == StreamViewerSort.viewersAsc;
+
+    return PopupMenuButton<StreamViewerSort>(
+      tooltip: 'Sort by viewers',
+      icon: Icon(
+        isAsc ? Icons.arrow_upward_rounded : Icons.arrow_downward_rounded,
+      ),
+      initialValue: sortOrder,
+      onSelected: onChanged,
+      itemBuilder: (context) => [
+        const PopupMenuItem(
+          value: StreamViewerSort.viewersDesc,
+          child: Text('Most viewers'),
+        ),
+        const PopupMenuItem(
+          value: StreamViewerSort.viewersAsc,
+          child: Text('Fewest viewers'),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/widgets/theme_selection_setting.dart b/lib/widgets/theme_selection_setting.dart
new file mode 100644
index 00000000..9602f606
--- /dev/null
+++ b/lib/widgets/theme_selection_setting.dart
@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/screens/settings/widgets/settings_list_select.dart';
+
+class ThemeSelectionSetting extends StatelessWidget {
+  final SettingsStore settingsStore;
+
+  const ThemeSelectionSetting({super.key, required this.settingsStore});
+
+  @override
+  Widget build(BuildContext context) {
+    return Observer(
+      builder: (context) => SettingsListSelect(
+        selectedOption: themeNames[settingsStore.themeType.index],
+        options: themeNames,
+        onChanged: (newTheme) => settingsStore.themeType =
+            ThemeType.values[themeNames.indexOf(newTheme)],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/uptime.dart b/lib/widgets/uptime.dart
index 0d77e877..8bb9132f 100644
--- a/lib/widgets/uptime.dart
+++ b/lib/widgets/uptime.dart
@@ -1,49 +1,50 @@
-import 'dart:async';
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
+import 'package:frosty/services/shared_timer_service.dart';
 
 /// A widget that displays a timer representing the time since the given start time.
-/// The timer is updated every second.
+/// Uses a shared timer service to keep all uptime displays synchronized.
 class Uptime extends StatefulWidget {
   final String startTime;
   final TextStyle? style;
 
-  const Uptime({
-    Key? key,
-    required this.startTime,
-    this.style,
-  }) : super(key: key);
+  const Uptime({super.key, required this.startTime, this.style});
 
   @override
   State<Uptime> createState() => _UptimeState();
 }
 
 class _UptimeState extends State<Uptime> {
-  Timer? _timer;
+  late final SharedTimerService _timerService;
 
   @override
   void initState() {
     super.initState();
-    _timer =
-        Timer.periodic(const Duration(seconds: 1), (timer) => setState(() {}));
+    _timerService = SharedTimerService.instance;
+    _timerService.addListener(_onTick);
+  }
+
+  void _onTick() {
+    if (mounted) {
+      setState(() {});
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return Text(
-      DateTime.now()
+      _timerService.currentTime
           .difference(DateTime.parse(widget.startTime))
           .toString()
           .split('.')[0],
-      style: widget.style
-          ?.copyWith(fontFeatures: [const FontFeature.tabularFigures()]),
+      style: widget.style?.copyWith(
+        fontFeatures: [const FontFeature.tabularFigures()],
+      ),
     );
   }
 
   @override
   void dispose() {
-    _timer?.cancel();
+    _timerService.removeListener(_onTick);
     super.dispose();
   }
 }
diff --git a/lib/widgets/user_actions_modal.dart b/lib/widgets/user_actions_modal.dart
new file mode 100644
index 00000000..19bc1f90
--- /dev/null
+++ b/lib/widgets/user_actions_modal.dart
@@ -0,0 +1,347 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/screens/onboarding/login_webview.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:frosty/widgets/alert_message.dart';
+import 'package:frosty/widgets/blurred_container.dart';
+import 'package:frosty/widgets/follow_channel_controller.dart';
+import 'package:frosty/widgets/frosty_dialog.dart';
+import 'package:frosty/widgets/integrity_webview_dialog.dart';
+import 'package:provider/provider.dart';
+import 'package:webview_flutter/webview_flutter.dart';
+
+class UserActionsModal extends StatefulWidget {
+  final AuthStore authStore;
+  final String name;
+  final String userLogin;
+  final String userId;
+  final bool showPinOption;
+  final bool? isPinned;
+
+  /// When set (e.g. Following tab), skip the Helix lookup and show this state.
+  final bool? initialIsFollowing;
+
+  /// Called after a successful follow (`true`) or unfollow (`false`).
+  final ValueChanged<bool>? onFollowChanged;
+
+  /// Optional moderation actions (shown at the top) for chat contexts. Kept as
+  /// an injected widget so this generic modal stays chat-agnostic.
+  final Widget? moderationActions;
+
+  const UserActionsModal({
+    super.key,
+    required this.authStore,
+    required this.name,
+    required this.userLogin,
+    required this.userId,
+    this.showPinOption = false,
+    this.isPinned,
+    this.initialIsFollowing,
+    this.onFollowChanged,
+    this.moderationActions,
+  });
+
+  @override
+  State<UserActionsModal> createState() => _UserActionsModalState();
+}
+
+class _UserActionsModalState extends State<UserActionsModal> {
+  late final FollowChannelController _follow = FollowChannelController(
+    authStore: widget.authStore,
+    userId: widget.userId,
+    initialIsFollowing: widget.initialIsFollowing,
+    onChanged: () {
+      if (mounted) setState(() {});
+    },
+  );
+
+  @override
+  void initState() {
+    super.initState();
+    _follow.init();
+  }
+
+  Future<void> _toggleFollow() async {
+    if (!_follow.canFollow ||
+        _follow.isFollowing == null ||
+        _follow.actionInProgress) {
+      return;
+    }
+
+    final wasFollowing = _follow.isFollowing!;
+
+    try {
+      final nowFollowing = await _follow.toggle();
+      if (!mounted) return;
+      widget.onFollowChanged?.call(nowFollowing);
+      _popWithSnack(
+        nowFollowing
+            ? 'Followed ${widget.name}'
+            : 'Unfollowed ${widget.name}',
+      );
+    } on FollowNeedsWebSessionException {
+      if (!mounted) return;
+      await _promptLinkWebSession();
+    } on IntegrityCheckException {
+      if (!mounted) return;
+      await _handleIntegrity(wasFollowing: wasFollowing);
+    } on ApiException catch (e) {
+      if (!mounted) return;
+      _showErrorSnack(e.message);
+    } catch (_) {
+      if (!mounted) return;
+      _showErrorSnack(
+        wasFollowing
+            ? 'Could not unfollow ${widget.name}'
+            : 'Could not follow ${widget.name}',
+      );
+    }
+  }
+
+  Future<void> _handleIntegrity({required bool wasFollowing}) async {
+    final gqlToken = widget.authStore.gqlToken;
+    if (gqlToken == null) {
+      _follow.clearActionInProgress();
+      await _promptLinkWebSession();
+      return;
+    }
+
+    final credentials = await showIntegrityWebViewDialog(
+      context: context,
+      gqlToken: gqlToken,
+    );
+    if (!mounted) return;
+
+    if (credentials == null) {
+      _follow.clearActionInProgress();
+      _showErrorSnack('Follow cancelled — Twitch verification required');
+      return;
+    }
+
+    try {
+      final nowFollowing = await _follow.retryAfterIntegrity(
+        wasFollowing: wasFollowing,
+        credentials: credentials,
+      );
+      if (!mounted) return;
+      widget.onFollowChanged?.call(nowFollowing);
+      _popWithSnack(
+        nowFollowing
+            ? 'Followed ${widget.name}'
+            : 'Unfollowed ${widget.name}',
+      );
+    } on ApiException catch (e) {
+      if (!mounted) return;
+      _showErrorSnack(e.message);
+    } catch (_) {
+      if (!mounted) return;
+      _showErrorSnack(
+        wasFollowing
+            ? 'Could not unfollow ${widget.name}'
+            : 'Could not follow ${widget.name}',
+      );
+    }
+  }
+
+  void _popWithSnack(String message) {
+    final messenger = ScaffoldMessenger.maybeOf(context);
+    Navigator.pop(context);
+    messenger?.showSnackBar(
+      SnackBar(
+        content: AlertMessage(message: message, centered: false),
+      ),
+    );
+  }
+
+  void _showErrorSnack(String message) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: AlertMessage(message: message, centered: false),
+      ),
+    );
+  }
+
+  Future<void> _promptLinkWebSession() {
+    return showDialog<void>(
+      context: context,
+      builder: (dialogContext) => FrostyDialog(
+        title: 'Web session required',
+        message:
+            'Following channels needs your Twitch web session linked. Log in again to link it, then try follow/unfollow.',
+        actions: [
+          TextButton(
+            onPressed: Navigator.of(dialogContext).pop,
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () {
+              Navigator.of(dialogContext).pop();
+              Navigator.of(context).push(
+                MaterialPageRoute(builder: (context) => LoginWebView()),
+              );
+            },
+            child: const Text('Log in'),
+          ),
+        ],
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final showFollowTile = _follow.shouldShow;
+
+    return ListView(
+      primary: false,
+      shrinkWrap: true,
+      children: [
+        ?widget.moderationActions,
+        if (widget.showPinOption)
+          ListTile(
+            leading: const Icon(Icons.push_pin_outlined),
+            title: Text(
+              '${widget.isPinned == true ? 'Unpin' : 'Pin'} ${widget.name}',
+            ),
+            onTap: () {
+              if (widget.isPinned == true) {
+                context.read<SettingsStore>().pinnedChannelIds = [
+                  ...context.read<SettingsStore>().pinnedChannelIds
+                    ..remove(widget.userId),
+                ];
+              } else {
+                context.read<SettingsStore>().pinnedChannelIds = [
+                  ...context.read<SettingsStore>().pinnedChannelIds,
+                  widget.userId,
+                ];
+              }
+
+              Navigator.pop(context);
+            },
+          ),
+        if (showFollowTile)
+          ListTile(
+            leading: _follow.loading || _follow.actionInProgress
+                ? const SizedBox(
+                    width: 24,
+                    height: 24,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                : Icon(
+                    _follow.isFollowing == true
+                        ? Icons.heart_broken_rounded
+                        : Icons.favorite_rounded,
+                  ),
+            title: Text(
+              _follow.isFollowing == true
+                  ? 'Unfollow ${widget.name}'
+                  : 'Follow ${widget.name}',
+            ),
+            enabled: !_follow.loading && !_follow.actionInProgress,
+            onTap: _toggleFollow,
+          ),
+        if (widget.authStore.isLoggedIn)
+          ListTile(
+            leading: const Icon(Icons.block_rounded),
+            onTap: () => widget.authStore
+                .showBlockDialog(
+                  context,
+                  targetUser: widget.name,
+                  targetUserId: widget.userId,
+                )
+                .then((_) {
+                  if (context.mounted) {
+                    Navigator.pop(context);
+                  }
+                }),
+            title: Text('Block ${widget.name}'),
+          ),
+        ListTile(
+          leading: const Icon(Icons.outlined_flag_rounded),
+          onTap: () => Navigator.push(
+            context,
+            MaterialPageRoute(
+              builder: (context) {
+                final theme = Theme.of(context);
+
+                return Scaffold(
+                  backgroundColor: theme.scaffoldBackgroundColor,
+                  extendBody: true,
+                  extendBodyBehindAppBar: true,
+                  appBar: AppBar(
+                    centerTitle: false,
+                    elevation: 0,
+                    backgroundColor: Colors.transparent,
+                    surfaceTintColor: Colors.transparent,
+                    systemOverlayStyle: SystemUiOverlayStyle(
+                      statusBarColor: Colors.transparent,
+                      statusBarIconBrightness:
+                          theme.brightness == Brightness.dark
+                          ? Brightness.light
+                          : Brightness.dark,
+                    ),
+                    leading: IconButton(
+                      tooltip: 'Back',
+                      icon: Icon(Icons.adaptive.arrow_back_rounded),
+                      onPressed: Navigator.of(context).pop,
+                    ),
+                    title: Text('Report ${widget.name}'),
+                  ),
+                  body: Stack(
+                    children: [
+                      // WebView content
+                      Positioned.fill(
+                        child: Padding(
+                          padding: EdgeInsets.only(
+                            top:
+                                MediaQuery.of(context).padding.top +
+                                kToolbarHeight,
+                          ),
+                          child: WebViewWidget(
+                            controller: WebViewController()
+                              ..setJavaScriptMode(JavaScriptMode.unrestricted)
+                              ..loadRequest(
+                                Uri.parse(
+                                  'https://www.twitch.tv/${widget.userLogin}/report',
+                                ),
+                              )
+                              ..setNavigationDelegate(
+                                NavigationDelegate(
+                                  onWebResourceError: (error) {
+                                    debugPrint(
+                                      'WebView error: ${error.description}',
+                                    );
+                                  },
+                                ),
+                              ),
+                          ),
+                        ),
+                      ),
+                      // Blurred app bar overlay
+                      Positioned(
+                        top: 0,
+                        left: 0,
+                        right: 0,
+                        child: BlurredContainer(
+                          gradientDirection: GradientDirection.up,
+                          padding: EdgeInsets.only(
+                            top: MediaQuery.of(context).padding.top,
+                            left: MediaQuery.of(context).padding.left,
+                            right: MediaQuery.of(context).padding.right,
+                          ),
+                          child: const SizedBox(height: kToolbarHeight),
+                        ),
+                      ),
+                    ],
+                  ),
+                );
+              },
+            ),
+          ),
+          title: Text('Report ${widget.name}'),
+        ),
+      ],
+    );
+  }
+}
diff --git a/pubspec.lock b/pubspec.lock
index 21f1ab82..b6205618 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,106 +5,147 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201"
+      sha256: a49d6cf99e8d8e7a8e93668d09ced0bbdb954d0b4fccc2f5f9241c6b87fad95c
       url: "https://pub.dev"
     source: hosted
-    version: "52.0.0"
+    version: "99.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "6a0ad72b2bcdb461749e40c01c478212a78db848dfcb2f10f2a461988bc5fb29"
+      sha256: "6727cf2ced9b104abca9daa278380be2eca2b98ce33d4b46f11708e387dc6b4d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.76"
+  advanced_in_app_review:
+    dependency: "direct main"
+    description:
+      name: advanced_in_app_review
+      sha256: b1d34aa42a7045458364c4f114e956ed6b08efcd92cddf8bf76c51cc1e58ddd1
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4
+      sha256: "663efa951fb8a45e06f491223a604c93820598f20e6a99c25617a1576065e8b7"
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "12.1.0"
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
+  app_links:
+    dependency: "direct main"
+    description:
+      name: app_links
+      sha256: f8db46d2ea9ff6f3a37191a7fd5b7813da1253ace8c32c1b9eadace41d1188ea
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.2.1"
+  app_links_linux:
+    dependency: transitive
+    description:
+      name: app_links_linux
+      sha256: f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
+  app_links_platform_interface:
+    dependency: transitive
+    description:
+      name: app_links_platform_interface
+      sha256: "7546f09a6e93f4a2df2fe2bd40a5c6c64310ac461b036d82b43033be7a59f809"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  app_links_web:
+    dependency: transitive
+    description:
+      name: app_links_web
+      sha256: af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: ed7cc591a948744994714375caf9a2ce89e1d82e8243997c8a2994d57181c212
+      sha256: a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.5"
+    version: "4.0.9"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.7.0"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.13.1"
+  better_native_video_player:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: frosty-patches
+      resolved-ref: "19c627547c227f1fc9895a5a62839e64fec689b3"
+      url: "https://github.com/tommyxchow/flutter-native-video-player.git"
+    source: git
+    version: "0.4.11"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   build:
     dependency: transitive
     description:
       name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      sha256: "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "4.0.7"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      sha256: "94eaf6708fe64408c632ef2689ca3777b112f9421306ccf4f8c84d7c5c9f83f8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.2"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "6bc5544ea6ce4428266e7ea680e945c68806c4aae2da0eb5e9ccf38df8d6acbf"
+      sha256: "79e05eaf15a48d7230b053a4363b8eaac0cc234bbd0134c3229455481f55cbc6"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      sha256: "7c35a3a7868626257d8aee47b51c26b9dba11eaddf3431117ed2744951416aab"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
+    version: "4.1.5"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727
+      sha256: "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.2.7"
+    version: "2.15.1"
   built_collection:
     dependency: transitive
     description:
@@ -117,388 +158,432 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "169565c8ad06adb760c3645bf71f00bff161b00002cace266cad42c5d22a7725"
+      sha256: "31b24be6615ec7fcf70b3aa5a7469fe35826485e639a16dd7eb83ba30e4cc6a8"
       url: "https://pub.dev"
     source: hosted
-    version: "8.4.3"
+    version: "8.12.7"
   cached_network_image:
     dependency: "direct main"
     description:
       name: cached_network_image
-      sha256: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15
+      sha256: "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.3"
+    version: "3.4.1"
   cached_network_image_platform_interface:
     dependency: transitive
     description:
       name: cached_network_image_platform_interface
-      sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7
+      sha256: "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "4.1.1"
   cached_network_image_web:
     dependency: transitive
     description:
       name: cached_network_image_web
-      sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0
+      sha256: "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.3.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.4.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.4"
   cli_util:
     dependency: transitive
     description:
       name: cli_util
-      sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.5"
+    version: "0.4.2"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
-  code_builder:
+    version: "1.1.2"
+  code_assets:
     dependency: transitive
     description:
-      name: code_builder
-      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      name: code_assets
+      sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "1.2.1"
   collection:
     dependency: "direct main"
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.19.1"
   convert:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.7"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.2"
+    version: "1.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.9"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
+      sha256: a4c1ccfee44c7e75ed80484071a5c142a385345e658fd8bd7c4b5c97e7198f98
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4"
-  device_frame:
+    version: "3.1.8"
+  dbus:
     dependency: transitive
     description:
-      name: device_frame
-      sha256: afe76182aec178d171953d9b4a50a43c57c7cf3c77d8b09a48bf30c8fa04dd9d
+      name: dbus
+      sha256: "792974a4007974fbc5c1b5433eb2330a9db3e368c3f906253af4c007d0f49a91"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "0.7.13"
   device_info_plus:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "7ff671ed0a6356fa8f2e1ae7d3558d3fb7b6a41e24455e4f8df75b811fb8e4ab"
+      sha256: b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "12.4.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
+      sha256: e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
-  device_preview:
+    version: "7.0.3"
+  dio:
     dependency: "direct main"
     description:
-      name: device_preview
-      sha256: "2f097bf31b929e15e6756dbe0ec1bcb63952ab9ed51c25dc5a2c722d2b21fdaf"
+      name: dio
+      sha256: "0df44ebba85e503958eb75d07eedd3c86275a58c1d3eda2f2ce8f0a2c3abbb3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "5.11.0"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "0786d0b7295a373de356fc0af4f6f1d0ab2844ed31b19dfc5e7556b70e24212c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  dismissible_page:
+    dependency: transitive
+    description:
+      name: dismissible_page
+      sha256: "5b2316f770fe83583f770df1f6505cb19102081c5971979806e77f2e507a9958"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  extended_text_field:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: "76305e9b115f0b41dc0d23e7a4f651df454fea89"
+      resolved-ref: "76305e9b115f0b41dc0d23e7a4f651df454fea89"
+      url: "https://github.com/tommyxchow/extended_text_field.git"
+    source: git
+    version: "16.0.2"
+  extended_text_library:
+    dependency: transitive
+    description:
+      name: extended_text_library
+      sha256: "13d99f8a10ead472d5e2cf4770d3d047203fe5054b152e9eb5dc692a71befbba"
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.0.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.2.0"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.1"
   firebase_analytics:
     dependency: "direct main"
     description:
       name: firebase_analytics
-      sha256: "2d8f475f79658a8e1865ee8a9e2e8eea70de5e487e3a646d9073dc3d1520d3e8"
+      sha256: a139dd0ada1c6e0ffd77bfdb877ac9061ffdec7c415e3e06113bdf8844db771f
       url: "https://pub.dev"
     source: hosted
-    version: "10.2.1"
+    version: "12.4.6"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_analytics_platform_interface
-      sha256: a667807edbcd3f5a6336275a21c8802de8f98f0a91b8c97abb76119b142aa91d
+      sha256: "448c319ea895da002e43892c7d3f15dccbc3c4c3b81d3e307e37da885ea52bdf"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.1"
+    version: "6.0.6"
   firebase_analytics_web:
     dependency: transitive
     description:
       name: firebase_analytics_web
-      sha256: "907285030d59570d7c1a8d721912db990957ab9b87736e50a9457491c16bcffe"
+      sha256: "67f287a0df75f27eafdd4a66a41e44f232c3aba713ea4794a1159893665a8bf5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.2+1"
+    version: "0.6.1+12"
   firebase_core:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "239e4ac688674a7e7b5476fd16b0d8e2b5a453d464f32091af3ce1df4ebb7316"
+      sha256: "9478ca6700c02d315c6aba37e206e612317f98bb4f335bb1cbd6e0ce67dcf764"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "4.13.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: "0df0a064ab0cad7f8836291ca6f3272edd7b83ad5b3540478ee46a0849d8022b"
+      sha256: e28f9afdcb5b0f0a8ea74ea3b322f5a7592c81cb45dd9d189913bdae08a2089a
       url: "https://pub.dev"
     source: hosted
-    version: "4.6.0"
+    version: "8.1.0"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: "347351a8f0518f3343d79a9a0690fa67ad232fc32e2ea270677791949eac792b"
+      sha256: f471a288b0101a45567548322ac4a5ad31e3ecbf87a576dcc0e424e6a11e04ea
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "3.10.0"
   firebase_crashlytics:
     dependency: "direct main"
     description:
       name: firebase_crashlytics
-      sha256: "02ce958507138d938b4611e3a4910667a44b969b0c20a810bbc97bbf967ba0d7"
+      sha256: "96c1d85de9eddc07061d3f7e2fb75596e75a45c9cec9c2e3a7cc9f97e6f3a748"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "5.2.7"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
-      sha256: b9c7b8498c877a2901ad323fc92c10f672be1597bc82d08f121f6228f321a7e0
+      sha256: "47d83b71fd39c580297c696a507a7c2652680ea2045e40c6c4e3c371b0ee7bc6"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.1"
+    version: "3.8.27"
   firebase_performance:
     dependency: "direct main"
     description:
       name: firebase_performance
-      sha256: "14f4d1e89e757f0aa1dec83c13ca390bbd728aca1ccc3ad19e6a23e2710f45b7"
+      sha256: "570895b372791fca22080b369125fe13f3b6e1682ab0cbc204e2b46acd19b314"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.1+1"
+    version: "0.11.4+6"
   firebase_performance_platform_interface:
     dependency: transitive
     description:
       name: firebase_performance_platform_interface
-      sha256: "0914a49c4ca2cc74ac4c7fde719f280896b4c1d1bbe5fa72e059da0803cbc493"
+      sha256: "2979eac652173512ac07c45b8ce2ea2e37f16a7f8e4a003a3331405917886d72"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2+1"
+    version: "0.2.0+6"
   firebase_performance_web:
     dependency: transitive
     description:
       name: firebase_performance_web
-      sha256: "8192e4e112e9e09d2c9bbc8ab51d7c4e34ea618d15452d0ecfa6141e8babbd40"
+      sha256: afb3b87ab2428fa86e4fb092c8069f1d860eb5be12ca5a57795648986093f23d
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2+1"
+    version: "0.1.8+12"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec"
+      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.1"
+  floating:
+    dependency: transitive
+    description:
+      name: floating
+      sha256: e51ce1dbcab3ea83da0ad1b07f2091b99c0e8680184c780a000567f41234d454
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_blurhash:
-    dependency: transitive
-    description:
-      name: flutter_blurhash
-      sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.0"
   flutter_cache_manager:
     dependency: "direct main"
     description:
       name: flutter_cache_manager
-      sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3"
+      sha256: "1de7849213b4c73c85aca7e0ac687a9a5d82ccdb594366b9dcc26cb6a2189cd2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.4.2"
+  flutter_colorpicker:
+    dependency: "direct main"
+    description:
+      name: flutter_colorpicker
+      sha256: "969de5f6f9e2a570ac660fb7b501551451ea2a1ab9e2097e89475f60e07816ea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      sha256: ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c
+      sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.0"
+    version: "0.14.4"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
+      sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
-  flutter_localizations:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
+    version: "6.0.0"
+  flutter_markdown_plus:
+    dependency: "direct main"
+    description:
+      name: flutter_markdown_plus
+      sha256: fce641d6c2106cc495de1cd603f97a4f9d615a97a64011928ded380dbdade935
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.12"
   flutter_mobx:
     dependency: "direct main"
     description:
       name: flutter_mobx
-      sha256: "0da4add0016387a7bf309a0d0c41d36c6b3ae25ed7a176409267f166509e723e"
+      sha256: ba5e93467866a2991259dc51cffd41ef45f695c667c2b8e7b087bf24118b50fe
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6+5"
+    version: "2.3.0"
   flutter_native_splash:
     dependency: "direct dev"
     description:
       name: flutter_native_splash
-      sha256: "6777a3abb974021a39b5fdd2d46a03ca390e03903b6351f21d10e7ecc969f12d"
+      sha256: "9db4b80b044e9af17cc4b1272137fc7ace0054d879ef8210a76adc34aaf4cdff"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.16"
+    version: "2.4.8"
   flutter_secure_storage:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: f2afec1f1762c040a349ea2a588e32f442da5d0db3494a52a929a97c9e550bc5
+      sha256: "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.1"
+    version: "9.2.4"
   flutter_secure_storage_linux:
     dependency: transitive
     description:
       name: flutter_secure_storage_linux
-      sha256: "736436adaf91552433823f51ce22e098c2f0551db06b6596f58597a25b8ea797"
+      sha256: be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.2.3"
   flutter_secure_storage_macos:
     dependency: transitive
     description:
       name: flutter_secure_storage_macos
-      sha256: ff0768a6700ea1d9620e03518e2e25eac86a8bd07ca3556e9617bfa5ace4bd00
+      sha256: "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.1.3"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
       name: flutter_secure_storage_platform_interface
-      sha256: b3773190e385a3c8a382007893d678ae95462b3c2279e987b55d140d3b0cb81b
+      sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.2"
   flutter_secure_storage_web:
     dependency: transitive
     description:
       name: flutter_secure_storage_web
-      sha256: "42938e70d4b872e856e678c423cc0e9065d7d294f45bc41fc1981a4eb4beaffe"
+      sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.1"
   flutter_secure_storage_windows:
     dependency: transitive
     description:
       name: flutter_secure_storage_windows
-      sha256: ca89c8059cf439985aa83c59619b3674c7ef6cc2e86943d169a7369d6a69cab5
+      sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.3"
+    version: "3.1.2"
   flutter_svg:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: "6ff9fa12892ae074092de2fa6a9938fb21dbabfdaa2ff57dc697ff912fc8d4b2"
+      sha256: "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.6"
+    version: "2.3.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -509,179 +594,283 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  freezed_annotation:
-    dependency: transitive
-    description:
-      name: freezed_annotation
-      sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.0"
   glob:
     dependency: transitive
     description:
       name: glob
-      sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
+      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.3"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  gtk:
+    dependency: transitive
+    description:
+      name: gtk
+      sha256: "4ff85b2a16724029dd9e5bbb5a94b6918f9973f74ba571c949d2002801879cf5"
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
+  hooks:
+    dependency: transitive
+    description:
+      name: hooks
+      sha256: "03a564c3704524ee0f7fc56fc621e8796cc2eb8c24d1f1a33b34979815b285c4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   html:
     dependency: transitive
     description:
       name: html
-      sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.1"
+    version: "0.15.6"
   http:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: http
-      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.5"
+    version: "1.6.0"
+  http_mock_adapter:
+    dependency: "direct dev"
+    description:
+      name: http_mock_adapter
+      sha256: "46399c78bd4a0af071978edd8c502d7aeeed73b5fb9860bca86b5ed647a63c1b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.1"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.2"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.2"
   image:
     dependency: transitive
     description:
       name: image
-      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
+      sha256: "6300175e00616bbc832e2fc91bfa4d776af5402c81c7151bee6905bb08473c52"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "4.9.1"
+  in_app_review:
+    dependency: transitive
+    description:
+      name: in_app_review
+      sha256: "364db0c160b37fe7fad9cdaa18f968473924b17368869010af902760421b6bf8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.12"
+  in_app_review_platform_interface:
+    dependency: transitive
+    description:
+      name: in_app_review_platform_interface
+      sha256: fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.5"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867"
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.20.3"
   io:
     dependency: transitive
     description:
       name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
+  jni:
+    dependency: transitive
+    description:
+      name: jni
+      sha256: f038e58b4dc2c9037f50e233175086337e0b305e356d28211bf55f21c504cbd3
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
+  jni_flutter:
+    dependency: transitive
+    description:
+      name: jni_flutter
+      sha256: "7b717011ea40d04fd47c2731d3d1d36eb99eba3435c2753d62489e8c3c9991d5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  jni_util:
+    dependency: transitive
+    description:
+      name: jni_util
+      sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
+      sha256: "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.0"
+    version: "4.12.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: "040088d9eb2337f3a51ddabe35261e2fea1c351e3dd29d755ed1290b6b700a75"
+      sha256: e45aefa0324f08c683caafbb94b72837aa6193c61822799c916e45f4a263113d
       url: "https://pub.dev"
     source: hosted
-    version: "6.6.0"
+    version: "6.14.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
+      url: "https://pub.dev"
+    source: hosted
+    version: "11.0.2"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.10"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "6.1.0"
+  logger:
+    dependency: transitive
+    description:
+      name: logger
+      sha256: "25aee487596a6257655a1e091ec2ae66bc30e7af663592cc3a27e6591e05035c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
   logging:
     dependency: transitive
     description:
       name: logging
-      sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.3.0"
+  markdown:
+    dependency: transitive
+    description:
+      name: markdown
+      sha256: ee85086ad7698b42522c6ad42fe195f1b9898e4d974a1af4576c1a3a176cada9
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.3.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.20"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.13.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.19.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   mobx:
     dependency: "direct main"
     description:
       name: mobx
-      sha256: "41f814e90db4d5fe1303efc570db837a56507832c08c4f0842320fa3d40c14cd"
+      sha256: "25ea9a3ee69243d578fb6288721d8eeb18550d0391c32f896d377d994154bff2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.6.0"
   mobx_codegen:
     dependency: "direct dev"
     description:
       name: mobx_codegen
-      sha256: "86122e410d8ea24dda0c69adb5c2a6ccadd5ce02ad46e144764e0d0184a06181"
+      sha256: "6529bcae074838004b58ad01fbe4966be182a176aacfb723686985986ebac19f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.7"
+  mocktail:
+    dependency: "direct dev"
+    description:
+      name: mocktail
+      sha256: "5e1bf53cc7baa8062a33b84424deb61513858ea05c601b8509e683815b5914aa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
+  native_device_orientation:
+    dependency: "direct main"
+    description:
+      name: native_device_orientation
+      sha256: "4751bd8648a1e4a22c2cf3e8035eb0d667f8f6d82f9544b2f7b1bc12de42f0a4"
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
@@ -693,620 +882,660 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  objective_c:
+    dependency: transitive
+    description:
+      name: objective_c
+      sha256: b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.5.0"
   octo_image:
     dependency: transitive
     description:
       name: octo_image
-      sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143"
+      sha256: "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "2.1.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   package_info_plus:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: f619162573096d428ccde2e33f92e05b5a179cd6f0e3120c1005f181bee8ed16
+      sha256: "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "9.0.1"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      sha256: "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.2.1"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      sha256: bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
+    version: "1.9.1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
-      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
+      sha256: "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   path_provider:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path_provider
-      sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95
+      sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.12"
+    version: "2.1.6"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e
+      sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.22"
+    version: "2.3.1"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74"
+      sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.6.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
+      sha256: "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.2.2"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76
+      sha256: "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.3"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.1"
+    version: "2.3.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
+      sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.0"
+    version: "7.0.2"
+  photo_view:
+    dependency: "direct main"
+    description:
+      name: photo_view
+      sha256: "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.6"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
-  pointycastle:
-    dependency: transitive
-    description:
-      name: pointycastle
-      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.2"
+    version: "2.1.8"
   pool:
     dependency: transitive
     description:
       name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.1"
-  process:
+    version: "1.5.2"
+  posix:
     dependency: transitive
     description:
-      name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
+      name: posix
+      sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.4"
+    version: "6.5.2"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
+      sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.5"
+    version: "6.1.5+1"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.2.0"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a"
+      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.5.0"
+  record_use:
+    dependency: transitive
+    description:
+      name: record_use
+      sha256: "3b4ab682aff40175afca6ff090cc5aa7ce9dafe8dfbae1537a6c678e6678baee"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
-      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
       url: "https://pub.dev"
     source: hosted
-    version: "0.27.7"
+    version: "0.28.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "5949029e70abe87f75cfe59d17bf5c397619c4b74a099b10116baeb34786fad9"
+      sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.5.5"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "955e9736a12ba776bdd261cf030232b30eadfcd9c79b32a3250dd4a494e8c8f7"
+      sha256: "0634e64bd719f89c012f392938e173521f535d3ecaf66558fa94a056d22b5cc7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.4.27"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "1ffa239043ab8baf881ec3094a3c767af9d10399b2839020b9e4d44c0bb23951"
+      sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.5.6"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: f8ea038aa6da37090093974ebdcf4397010605fd2ff65c37a66f9d28394cb874
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.4.1"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: da9431745ede5ece47bc26d5d73a9d3c6936ef6945c101a5aca46f62e52c1cf3
+      sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.4.2"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958
+      sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.4.3"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "5eaf05ae77658d3521d0e993ede1af962d4b326cd2153d312df716dc250f00c9"
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.4.1"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.2"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
+      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "3.0.0"
   simple_icons:
     dependency: "direct main"
     description:
       name: simple_icons
-      sha256: "8aa6832dc7a263a3213e40ecbf1328a392308c809d534a3b860693625890483b"
+      sha256: "21246ffcaaf9f560695596093c2ecf9fa763fd112a15916fbe7d282932430bae"
       url: "https://pub.dev"
     source: hosted
-    version: "7.10.0"
+    version: "16.23.0"
   simple_pip_mode:
     dependency: "direct main"
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "1acaf4fc25cc87dbc5ce07f341ad4fd2ff086f4f"
+      resolved-ref: "0da5255545e10b18883c737c9eca3ec619ccc2f6"
       url: "https://github.com/tommyxchow/simple_pip_mode_flutter"
     source: git
-    version: "0.8.0"
+    version: "1.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
+      sha256: a603f1fb984a7391ae5978d1b92bfaaa08b350dca5c825256f925818f7943bf5
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.6"
+    version: "4.2.4"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
+      sha256: "5e6f216fdf6376c9f3852381ae037499797a3385377d388b011dac98d303c67c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.3"
+    version: "1.3.13"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.2"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
-      sha256: "78324387dc81df14f78df06019175a86a2ee0437624166c382e145d0a7fd9a4f"
+      sha256: "58a799e6ac17dd32fbab93813d39ed835a75ccc0f8f85b8955fe318c6712b082"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4+1"
+    version: "2.4.3"
+  sqflite_android:
+    dependency: transitive
+    description:
+      name: sqflite_android
+      sha256: d0548f9d7422a2dae99ec6f8b0a3074463b132d216fa5ba0d230eeefc901983b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: bfd6973aaeeb93475bc0d875ac9aefddf7965ef22ce09790eb963992ffc5183f
+      sha256: "5bf6a55c166e73bf651ba7ec3ed486e577620e3dc8f3a9c6a258a8031b624590"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2+2"
+    version: "2.5.11"
+  sqflite_darwin:
+    dependency: transitive
+    description:
+      name: sqflite_darwin
+      sha256: c86ca18b8f666bbf903924687fe21cc16fc385d086005067e26619ca530bef9f
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.3+1"
+  sqflite_platform_interface:
+    dependency: transitive
+    description:
+      name: sqflite_platform_interface
+      sha256: f84939f84350d92d04416f8bc4dc52d3896aec7716cc9e80cf0146342139dc50
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
+      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.4.1"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b"
+      sha256: "3a7b5d17422dd0f8d5c6c14feaa5a1c65638b9455f871a96f08437562c046931"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.4.1+2"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
-  timing:
-    dependency: transitive
-    description:
-      name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  tuple:
-    dependency: "direct main"
-    description:
-      name: tuple
-      sha256: "0ea99cd2f9352b2586583ab2ce6489d1f95a5f6de6fb9492faaf97ae2060f0aa"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
+    version: "0.7.12"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
   universal_io:
     dependency: transitive
     description:
       name: universal_io
-      sha256: "79f78ddad839ee3aae3ec7c01eb4575faf0d5c860f8e5223bc9f9c17f7f03cef"
+      sha256: f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.3.1"
   url_launcher:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "698fa0b4392effdc73e9e184403b627362eb5fbf904483ac9defbb1c2191d809"
+      sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.8"
+    version: "6.3.2"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "3e2f6dfd2c7d9cd123296cab8ef66cfc2c1a13f5845f42c7a0f365690a8a7dd1"
+      sha256: b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.23"
+    version: "6.3.32"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: bb328b24d3bccc20bdf1024a0990ac4f869d57663660de9c936fb8c043edefe3
+      sha256: "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.18"
+    version: "6.4.1"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "318c42cba924e18180c029be69caf0a1a710191b9ec49bb42b5998fdcccee3cc"
+      sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.2.2"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "41988b55570df53b3dd2a7fc90c76756a963de6a8c5f8e113330cb35992e2094"
+      sha256: "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.2.5"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6"
+      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.3.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "44d79408ce9f07052095ef1f9a693c258d6373dc3944249374e30eff7219ccb0"
+      sha256: "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.14"
+    version: "2.4.3"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: b6217370f8eb1fd85c8890c539f5a639a01ab209a36db82c921ebeacefc7a615
+      sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.1.5"
   uuid:
     dependency: transitive
     description:
       name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      sha256: "9b129329f58692f6e6578329498a8fe9fbe98f090beb764ffbb8ee2eadd01dcd"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "4.6.0"
+  vector_graphics:
+    dependency: transitive
+    description:
+      name: vector_graphics
+      sha256: "9d0e3b9cb16542ad660daee871e726a10d13a93b7b5391677c3160e8f5e83935"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.3"
+  vector_graphics_codec:
+    dependency: transitive
+    description:
+      name: vector_graphics_codec
+      sha256: "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.13"
+  vector_graphics_compiler:
+    dependency: transitive
+    description:
+      name: vector_graphics_compiler
+      sha256: "4dca4feb77dc3ec7f6e27e49c53241eb8217f55e4f9b12599a27f8903bca5682"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      sha256: f36f9f3be64c6198714492bb455c11056e33e2f85d9a0b676a48301e44fdcf47
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
-  wakelock:
+    version: "2.4.2"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360"
+      url: "https://pub.dev"
+    source: hosted
+    version: "15.2.0"
+  wakelock_plus:
     dependency: "direct main"
     description:
-      name: wakelock
-      sha256: "769ecf42eb2d07128407b50cb93d7c10bd2ee48f0276ef0119db1d25cc2f87db"
+      name: wakelock_plus
+      sha256: ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.2"
-  wakelock_macos:
+    version: "1.5.2"
+  wakelock_plus_platform_interface:
     dependency: transitive
     description:
-      name: wakelock_macos
-      sha256: "047c6be2f88cb6b76d02553bca5a3a3b95323b15d30867eca53a19a0a319d4cd"
+      name: wakelock_plus_platform_interface
+      sha256: "0618d1799f0b28bcf98255b4ee8313e6fc4d38589dc4ee5fe5840d57d1aff6da"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.0"
-  wakelock_platform_interface:
-    dependency: transitive
-    description:
-      name: wakelock_platform_interface
-      sha256: "1f4aeb81fb592b863da83d2d0f7b8196067451e4df91046c26b54a403f9de621"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0"
-  wakelock_web:
-    dependency: transitive
-    description:
-      name: wakelock_web
-      sha256: "1b256b811ee3f0834888efddfe03da8d18d0819317f20f6193e2922b41a501b5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.4.0"
-  wakelock_windows:
-    dependency: transitive
-    description:
-      name: wakelock_windows
-      sha256: "857f77b3fe6ae82dd045455baa626bc4b93cb9bb6c86bf3f27c182167c3a5567"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1"
+    version: "1.6.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
+      sha256: "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.2.1"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   web_socket_channel:
     dependency: "direct main"
     description:
       name: web_socket_channel
-      sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "3.0.3"
   webview_flutter:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: "392c1d83b70fe2495de3ea2c84531268d5b8de2de3f01086a53334d8b6030a88"
+      sha256: d53e1ccf5516f25017e3c9d44c39034db352d20fa34fe200674270242c2c5111
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.4"
+    version: "4.14.1"
   webview_flutter_android:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: webview_flutter_android
-      sha256: "8b3b2450e98876c70bfcead876d9390573b34b9418c19e28168b74f6cb252dbd"
+      sha256: b98656fa4461f8cc05c48a778b4d4883e60ec63e1778348f363f9bb9a477745d
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.4"
+    version: "4.14.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "812165e4e34ca677bdfbfa58c01e33b27fd03ab5fa75b70832d4b7d4ca1fa8cf"
+      sha256: "1221c1b12f5278791042f2ec2841743784cf25c5a644e23d6680e5d718824f04"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.5"
+    version: "2.15.1"
   webview_flutter_wkwebview:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: webview_flutter_wkwebview
-      sha256: a5364369c758892aa487cbf59ea41d9edd10f9d9baf06a94e80f1bd1b4c7bbc0
+      sha256: c879dd64b87c452aa84381b244d5469da57ba7e8cca6884c7b1e0d406372c12d
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.5"
+    version: "3.26.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "5.15.0"
+  win32_registry:
+    dependency: transitive
+    description:
+      name: win32_registry
+      sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0+3"
+    version: "1.1.0"
   xml:
     dependency: transitive
     description:
       name: xml
-      sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
+      sha256: "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4"
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.2"
+    version: "7.0.1"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.3"
 sdks:
-  dart: ">=2.18.0 <3.0.0"
-  flutter: ">=3.3.0"
+  dart: ">=3.12.0 <4.0.0"
+  flutter: "3.47.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 966739b3..1899d872 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A Twitch client for iOS and Android.
 
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43
@@ -12,13 +12,18 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # build by specifying --build-name and --build-number, respectively.
 # In Android, build-name is used as versionName while build-number used as versionCode.
 # Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
+# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 3.1.1+37
+# In Windows, build-name is used as the major, minor, and patch parts
+# of the product and file versions while build-number is used as the build suffix.
+version: 5.3.1+81
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ^3.9.0
+  # Exact Flutter pin, enforced by `flutter pub get` locally and read by CI via
+  # `flutter-version-file: pubspec.yaml`. Single source of truth: bump here.
+  flutter: 3.47.0
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -27,204 +32,240 @@ environment:
 # the latest version available on pub.dev. To see which dependencies have newer
 # versions available, run `flutter pub outdated`.
 dependencies:
-  flutter:
-    sdk: flutter
-  json_annotation: ^4.6.0
+    flutter:
+        sdk: flutter
+    json_annotation: ^4.12.0
 
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
-  http: ^0.13.3
-  web_socket_channel: ^2.1.0
-  flutter_secure_storage: ^7.0.1
-  intl: ^0.17.0
-  cached_network_image: ^3.1.0
-  webview_flutter: ^3.0.0
-  provider: ^6.0.1
-  mobx: ^2.0.7+4
-  flutter_mobx: ^2.0.0
-  shared_preferences: ^2.0.8
-  tuple: ^2.0.0
-  flutter_svg: ^1.0.0
-  url_launcher: ^6.0.17
-  package_info_plus: ^3.0.2
-  collection: ^1.16.0
-  flutter_cache_manager: ^3.3.0
-  device_info_plus: ^8.0.0
-  wakelock: ^0.6.2
-  device_preview: ^1.1.0
-  simple_icons: ^7.10.0
-  simple_pip_mode:
-    git:
-      url: https://github.com/tommyxchow/simple_pip_mode_flutter
-  firebase_core: ^2.10.0
-  firebase_crashlytics: ^3.1.2
-  firebase_performance: ^0.9.1+1
-  firebase_analytics: ^10.2.1
+    # The following adds the Cupertino Icons font to your application.
+    # Use with the CupertinoIcons class for iOS style icons.
+    cupertino_icons: ^1.0.2
+    web_socket_channel: ^3.0.0
+    # Pinned to v9 deliberately. v10.0.0 was shipped in 5.0.0 and reverted in
+    # 5.0.1 (ba28e09) while chasing the #484 startup freeze on low-end Android
+    # 14; that commit also made deleteAll() non-blocking, so which change fixed
+    # it was never established. v10 rewrote the Android ciphers, and v11 drops
+    # the legacy ones entirely, so a 9 -> 11 jump would also strand existing
+    # tokens. Move to v10 on its own, with low-end Android testing.
+    flutter_secure_storage: ^9.2.2
+    intl: ^0.20.1
+    cached_network_image: ^3.1.0
+    webview_flutter: ^4.2.0
+    provider: ^6.0.1
+    mobx: ^2.0.7+4
+    flutter_mobx: ^2.0.0
+    shared_preferences: ^2.0.8
+    flutter_svg: ^2.0.5
+    url_launcher: ^6.0.17
+    # Held at v9/v12: the v10/v13 majors are just a win32 6.0.0 bump (Windows
+    # only), which conflicts with flutter_secure_storage v9's win32 ^5.
+    package_info_plus: ^9.0.0
+    collection: ^1.16.0
+    flutter_cache_manager: ^3.3.0
+    device_info_plus: ^12.3.0
+    wakelock_plus: ^1.1.2
+    simple_icons: ^16.23.0
+    simple_pip_mode:
+        git:
+            url: https://github.com/tommyxchow/simple_pip_mode_flutter
+    firebase_core: ^4.1.0
+    firebase_crashlytics: ^5.0.1
+    firebase_performance: ^0.11.0+1
+    firebase_analytics: ^12.0.1
+    advanced_in_app_review: ^1.1.3
+    webview_flutter_android: ^4.0.2
+    webview_flutter_wkwebview: ^3.4.3
+    photo_view: ^0.15.0
+    flutter_markdown_plus: ^1.0.7
+    flutter_colorpicker: ^1.1.0
+    path_provider: ^2.1.5
+    dio: ^5.9.0
+    app_links: ^7.0.0
+    # Fork pinned for Flutter 3.44 compatibility — upstream 16.0.2 is the latest
+    # pub release and references ExtendSelectionByPageIntent, removed in 3.44.
+    extended_text_field:
+        git:
+            url: https://github.com/tommyxchow/extended_text_field.git
+            ref: 76305e9b115f0b41dc0d23e7a4f651df454fea89
+    native_device_orientation: ^2.1.0
+    better_native_video_player:
+        git:
+            url: https://github.com/tommyxchow/flutter-native-video-player.git
+            ref: frosty-patches
 
 dev_dependencies:
-  flutter_test:
-    sdk: flutter
-  
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
-  flutter_lints: ^2.0.1
-  build_runner: ^2.1.1
-  json_serializable: ^6.0.0
-  mobx_codegen: ^2.0.6
-  flutter_native_splash: ^2.0.5
-  flutter_launcher_icons: ^0.11.0
+    flutter_test:
+        sdk: flutter
+
+    # The "flutter_lints" package below contains a set of recommended lints to
+    # encourage good coding practices. The lint set provided by the package is
+    # activated in the `analysis_options.yaml` file located at the root of your
+    # package. See that file for information about deactivating specific lint
+    # rules and activating additional ones.
+    flutter_lints: ^6.0.0
+    build_runner: ^2.1.1
+    json_serializable: ^6.0.0
+    mobx_codegen: ^2.0.6
+    flutter_native_splash: ^2.0.5
+    flutter_launcher_icons: ^0.14.1
+    mocktail: ^1.0.4
+    http_mock_adapter: ^0.6.1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
-# The following section is specific to Flutter.
+# The following section is specific to Flutter packages.
 flutter:
+    # The following line ensures that the Material Icons font is
+    # included with your application, so that you can use the icons in
+    # the material Icons class.
+    uses-material-design: true
 
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
+    fonts:
+        - family: Inter
+          fonts:
+              - asset: assets/fonts/Inter-Thin.ttf
+              - asset: assets/fonts/Inter-ExtraLight.ttf
+              - asset: assets/fonts/Inter-Light.ttf
+              - asset: assets/fonts/Inter-Regular.ttf
+              - asset: assets/fonts/Inter-Medium.ttf
+              - asset: assets/fonts/Inter-SemiBold.ttf
+              - asset: assets/fonts/Inter-Bold.ttf
+              - asset: assets/fonts/Inter-ExtraBold.ttf
+              - asset: assets/fonts/Inter-Black.ttf
+              - asset: assets/fonts/Inter-ThinItalic.ttf
+              - asset: assets/fonts/Inter-ExtraLightItalic.ttf
+              - asset: assets/fonts/Inter-LightItalic.ttf
+              - asset: assets/fonts/Inter-Italic.ttf
+              - asset: assets/fonts/Inter-MediumItalic.ttf
+              - asset: assets/fonts/Inter-SemiBoldItalic.ttf
+              - asset: assets/fonts/Inter-BoldItalic.ttf
+              - asset: assets/fonts/Inter-ExtraBoldItalic.ttf
+              - asset: assets/fonts/Inter-BlackItalic.ttf
 
-  fonts:
-    - family: Inter
-      fonts:
-        - asset: assets/fonts/Inter-Thin.ttf
-        - asset: assets/fonts/Inter-ExtraLight.ttf
-        - asset: assets/fonts/Inter-Light.ttf
-        - asset: assets/fonts/Inter-Regular.ttf
-        - asset: assets/fonts/Inter-Medium.ttf
-        - asset: assets/fonts/Inter-SemiBold.ttf
-        - asset: assets/fonts/Inter-Bold.ttf
-        - asset: assets/fonts/Inter-ExtraBold.ttf
-        - asset: assets/fonts/Inter-Black.ttf
+    # To add assets to your application, add an assets section, like this:
+    # assets:
+    #   - images/a_dot_burr.jpeg
+    #   - images/a_dot_ham.jpeg
 
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
+    assets:
+        - assets/icons/logo.svg
+        - assets/fonts/
+        - assets/release-notes.md
+        - assets/js/vaft.user.js
 
-  assets:
-    - assets/icons/logo.svg
+    # An image asset can refer to one or more resolution-specific "variants", see
+    # https://flutter.dev/to/resolution-aware-images
 
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
+    # For details regarding adding assets from package dependencies, see
+    # https://flutter.dev/to/asset-from-package
 
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
+    # To add custom fonts to your application, add a fonts section here,
+    # in this "flutter" section. Each entry in this list should have a
+    # "family" key with the font family name, and a "fonts" key with a
+    # list giving the asset and other descriptors for the font. For
+    # example:
+    # fonts:
+    #   - family: Schyler
+    #     fonts:
+    #       - asset: fonts/Schyler-Regular.ttf
+    #       - asset: fonts/Schyler-Italic.ttf
+    #         style: italic
+    #   - family: Trajan Pro
+    #     fonts:
+    #       - asset: fonts/TrajanPro.ttf
+    #       - asset: fonts/TrajanPro_Bold.ttf
+    #         weight: 700
+    #
+    # For details regarding fonts from package dependencies,
+    # see https://flutter.dev/to/font-from-package
 
 flutter_native_splash:
+    # This package generates native code to customize Flutter's default white native splash screen
+    # with background color and splash image.
+    # Customize the parameters below, and run the following command in the terminal:
+    # flutter pub run flutter_native_splash:create
+    # To restore Flutter's default white splash screen, run the following command in the terminal:
+    # flutter pub run flutter_native_splash:remove
 
-  # This package generates native code to customize Flutter's default white native splash screen
-  # with background color and splash image.
-  # Customize the parameters below, and run the following command in the terminal:
-  # flutter pub run flutter_native_splash:create
-  # To restore Flutter's default white splash screen, run the following command in the terminal:
-  # flutter pub run flutter_native_splash:remove
+    # color or background_image is the only required parameter.  Use color to set the background
+    # of your splash screen to a solid color.  Use background_image to set the background of your
+    # splash screen to a png image.  This is useful for gradients. The image will be stretch to the
+    # size of the app. Only one parameter can be used, color and background_image cannot both be set.
+    # color: "#000000"
+    background_image: "assets/icons/bg.png"
 
-  # color or background_image is the only required parameter.  Use color to set the background
-  # of your splash screen to a solid color.  Use background_image to set the background of your
-  # splash screen to a png image.  This is useful for gradients. The image will be stretch to the
-  # size of the app. Only one parameter can be used, color and background_image cannot both be set.
-  # color: "#000000"
-  background_image: "assets/icons/bg.png"
+    # Optional parameters are listed below.  To enable a parameter, uncomment the line by removing
+    # the leading # character.
 
-  # Optional parameters are listed below.  To enable a parameter, uncomment the line by removing
-  # the leading # character.
+    # The image parameter allows you to specify an image used in the splash screen.  It must be a
+    # png file and should be sized for 4x pixel density.
+    image: assets/icons/logo.png
 
-  # The image parameter allows you to specify an image used in the splash screen.  It must be a
-  # png file and should be sized for 4x pixel density.
-  image: assets/icons/logo.png
+    # This property allows you to specify an image used as branding in the splash screen. It must be
+    # a png file. Currently, it is only supported for Android and iOS.
+    # branding: assets/dart.png
 
-  # This property allows you to specify an image used as branding in the splash screen. It must be
-  # a png file. Currently, it is only supported for Android and iOS.
-  # branding: assets/dart.png
+    # Specify your branding image for dark mode.
+    #branding_dark: assets/dart_dark.png
 
-  # Specify your branding image for dark mode.
-  #branding_dark: assets/dart_dark.png
+    # To position the branding image at the bottom of the screen you can use bottom, bottomRight,
+    # and bottomLeft. The default values is bottom if not specified or specified something else.
+    #
+    # Make sure this content mode value should not be similar to android_gravity value and ios_content_mode
+    # value.
+    # branding_mode: bottom
 
-  # To position the branding image at the bottom of the screen you can use bottom, bottomRight,
-  # and bottomLeft. The default values is bottom if not specified or specified something else.
-  #
-  # Make sure this content mode value should not be similar to android_gravity value and ios_content_mode
-  # value.
-  # branding_mode: bottom
+    # The color_dark, background_image_dark, and image_dark are parameters that set the background
+    # and image when the device is in dark mode. If they are not specified, the app will use the
+    # parameters from above. If the image_dark parameter is specified, color_dark or
+    # background_image_dark must be specified.  color_dark and background_image_dark cannot both be
+    # set.
+    #color_dark: "#042a49"
+    #background_image_dark: "assets/dark-background.png"
+    #image_dark: assets/splash-invert.png
 
-  # The color_dark, background_image_dark, and image_dark are parameters that set the background
-  # and image when the device is in dark mode. If they are not specified, the app will use the
-  # parameters from above. If the image_dark parameter is specified, color_dark or
-  # background_image_dark must be specified.  color_dark and background_image_dark cannot both be
-  # set.
-  #color_dark: "#042a49"
-  #background_image_dark: "assets/dark-background.png"
-  #image_dark: assets/splash-invert.png
+    # The android, ios and web parameters can be used to disable generating a splash screen on a given
+    # platform.
+    #android: false
+    #ios: false
+    #web: false
 
-  # The android, ios and web parameters can be used to disable generating a splash screen on a given
-  # platform.
-  #android: false
-  #ios: false
-  #web: false
+    # The position of the splash image can be set with android_gravity, ios_content_mode, and
+    # web_image_mode parameters.  All default to center.
+    #
+    # android_gravity can be one of the following Android Gravity (see
+    # https://developer.android.com/reference/android/view/Gravity): bottom, center,
+    # center_horizontal, center_vertical, clip_horizontal, clip_vertical, end, fill, fill_horizontal,
+    # fill_vertical, left, right, start, or top.
+    #android_gravity: center
+    #
+    # ios_content_mode can be one of the following iOS UIView.ContentMode (see
+    # https://developer.apple.com/documentation/uikit/uiview/contentmode): scaleToFill,
+    # scaleAspectFit, scaleAspectFill, center, top, bottom, left, right, topLeft, topRight,
+    # bottomLeft, or bottomRight.
+    #ios_content_mode: center
+    #
+    # web_image_mode can be one of the following modes: center, contain, stretch, and cover.
+    #web_image_mode: center
 
-  # The position of the splash image can be set with android_gravity, ios_content_mode, and
-  # web_image_mode parameters.  All default to center.
-  #
-  # android_gravity can be one of the following Android Gravity (see
-  # https://developer.android.com/reference/android/view/Gravity): bottom, center,
-  # center_horizontal, center_vertical, clip_horizontal, clip_vertical, end, fill, fill_horizontal,
-  # fill_vertical, left, right, start, or top.
-  #android_gravity: center
-  #
-  # ios_content_mode can be one of the following iOS UIView.ContentMode (see
-  # https://developer.apple.com/documentation/uikit/uiview/contentmode): scaleToFill,
-  # scaleAspectFit, scaleAspectFill, center, top, bottom, left, right, topLeft, topRight,
-  # bottomLeft, or bottomRight.
-  #ios_content_mode: center
-  #
-  # web_image_mode can be one of the following modes: center, contain, stretch, and cover.
-  #web_image_mode: center
+    # To hide the notification bar, use the fullscreen parameter.  Has no affect in web since web
+    # has no notification bar.  Defaults to false.
+    # NOTE: Unlike Android, iOS will not automatically show the notification bar when the app loads.
+    #       To show the notification bar, add the following code to your Flutter app:
+    #       WidgetsFlutterBinding.ensureInitialized();
+    #       SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.bottom, SystemUiOverlay.top]);
+    #fullscreen: true
 
-  # To hide the notification bar, use the fullscreen parameter.  Has no affect in web since web
-  # has no notification bar.  Defaults to false.
-  # NOTE: Unlike Android, iOS will not automatically show the notification bar when the app loads.
-  #       To show the notification bar, add the following code to your Flutter app:
-  #       WidgetsFlutterBinding.ensureInitialized();
-  #       SystemChrome.setEnabledSystemUIOverlays([SystemUiOverlay.bottom, SystemUiOverlay.top]);
-  #fullscreen: true
-  
-  # If you have changed the name(s) of your info.plist file(s), you can specify the filename(s) 
-  # with the info_plist_files parameter.  Remove only the # characters in the three lines below,
-  # do not remove any spaces:
-  #info_plist_files:
-  #  - 'ios/Runner/Info-Debug.plist'
-  #  - 'ios/Runner/Info-Release.plist'
+    # If you have changed the name(s) of your info.plist file(s), you can specify the filename(s)
+    # with the info_plist_files parameter.  Remove only the # characters in the three lines below,
+    # do not remove any spaces:
+    #info_plist_files:
+    #  - 'ios/Runner/Info-Debug.plist'
+    #  - 'ios/Runner/Info-Release.plist'
 
-flutter_icons:
-  image_path_android: "assets/icons/icon_android.png"
-  image_path_ios: "assets/icons/icon_ios.png"
-  android: true
-  ios: true
-  remove_alpha_ios: true
+flutter_launcher_icons:
+    image_path_android: "assets/icons/icon_android.png"
+    image_path_ios: "assets/icons/icon_ios.png"
+    android: true
+    ios: true
+    remove_alpha_ios: true
diff --git a/scripts/get_twitch_token.dart b/scripts/get_twitch_token.dart
new file mode 100644
index 00000000..22630424
--- /dev/null
+++ b/scripts/get_twitch_token.dart
@@ -0,0 +1,126 @@
+// Gets a Twitch OAuth user token for emulator testing.
+//
+// Usage: dart run scripts/get_twitch_token.dart
+//
+// Reads CLIENT_ID from .env, env vars, or prompts interactively.
+// Opens the Twitch OAuth page in your browser — after you authorize,
+// paste the redirect URL back here and the token is printed.
+// Then long-press the Anonymous account tile in the app to log in.
+import 'dart:io';
+
+import 'package:frosty/utils/twitch_oauth_scopes.dart';
+
+const redirectUri = 'https://twitch.tv/login';
+
+void main() async {
+  final env = _loadEnvFile();
+
+  final clientId = _resolve('CLIENT_ID', env);
+
+  if (clientId == null) {
+    stderr.writeln('Error: CLIENT_ID is required.');
+    stderr.writeln('Add it to .env or export it in your shell.');
+    exit(1);
+  }
+
+  final authorizeUrl = Uri(
+    scheme: 'https',
+    host: 'id.twitch.tv',
+    path: '/oauth2/authorize',
+    queryParameters: {
+      'client_id': clientId,
+      'redirect_uri': redirectUri,
+      'response_type': 'token',
+      // Core scopes only — matches normal app login. Use the in-app
+      // "Enable moderator tools" flow when moderator scopes are needed.
+      'scope': twitchUserScopeQuery,
+    },
+  ).toString();
+
+  stdout.writeln('Opening Twitch authorization in your browser...');
+  await _openUrl(authorizeUrl);
+
+  stdout.writeln();
+  stdout.writeln(
+    'After authorizing, copy the full URL from the address bar and paste it here:',
+  );
+  stdout.writeln(
+    '(it will look like https://twitch.tv/login#access_token=...)',
+  );
+  stdout.writeln();
+  stdout.write('> ');
+
+  final redirectUrl = stdin.readLineSync()?.trim();
+  if (redirectUrl == null || redirectUrl.isEmpty) {
+    stderr.writeln('No URL provided.');
+    exit(1);
+  }
+
+  // The token is in the URL fragment (#access_token=...).
+  // Replace # with ? so Uri can parse it as query parameters.
+  final uri = Uri.tryParse(redirectUrl.replaceFirst('#', '?'));
+  final token = uri?.queryParameters['access_token'];
+
+  if (token == null || token.isEmpty) {
+    stderr.writeln();
+    stderr.writeln('Error: could not extract token from that URL.');
+    stderr.writeln(
+      'Make sure you pasted the full URL including the #access_token=... part.',
+    );
+    exit(1);
+  }
+
+  stdout.writeln();
+  stdout.writeln('Token: $token');
+  stdout.writeln();
+  stdout.writeln(
+    'Now in the emulator, long-press the Anonymous account tile to log in.',
+  );
+}
+
+/// Reads a value from env vars first, then .env file, then prompts.
+String? _resolve(String name, Map<String, String> envFile) {
+  final fromEnv = Platform.environment[name];
+  if (fromEnv != null && fromEnv.isNotEmpty) return fromEnv;
+
+  final fromFile = envFile[name];
+  if (fromFile != null && fromFile.isNotEmpty) return fromFile;
+
+  stdout.write('$name: ');
+  return stdin.readLineSync()?.trim();
+}
+
+/// Parses the .env file next to this script's project root.
+Map<String, String> _loadEnvFile() {
+  final scriptDir = File(Platform.script.toFilePath()).parent;
+  final projectDir = scriptDir.parent;
+  final envFile = File('${projectDir.path}/.env');
+
+  if (!envFile.existsSync()) return {};
+
+  final result = <String, String>{};
+  for (final line in envFile.readAsLinesSync()) {
+    final trimmed = line.trim();
+    if (trimmed.isEmpty || trimmed.startsWith('#')) continue;
+    final eq = trimmed.indexOf('=');
+    if (eq < 0) continue;
+    result[trimmed.substring(0, eq)] = trimmed.substring(eq + 1);
+  }
+  return result;
+}
+
+/// Opens a URL in the default browser across platforms.
+Future<void> _openUrl(String url) async {
+  final ProcessResult result;
+  if (Platform.isWindows) {
+    result = await Process.run('cmd', ['/c', 'start', '', url]);
+  } else if (Platform.isMacOS) {
+    result = await Process.run('open', [url]);
+  } else {
+    result = await Process.run('xdg-open', [url]);
+  }
+  if (result.exitCode != 0) {
+    stderr.writeln('Could not open browser. Visit this URL manually:');
+    stderr.writeln(url);
+  }
+}
diff --git a/scripts/setup-forgejo-release-secrets.sh b/scripts/setup-forgejo-release-secrets.sh
new file mode 100755
index 00000000..325bb5a1
--- /dev/null
+++ b/scripts/setup-forgejo-release-secrets.sh
@@ -0,0 +1,235 @@
+#!/usr/bin/env bash
+# Generate Android release signing material + upload Forgejo Actions secrets for
+# Obtainium APK builds — without printing secret values.
+#
+# Usage (from anywhere):
+#   bash /home/yuna/git/frosty/scripts/setup-forgejo-release-secrets.sh
+#
+# What it does:
+#   1. Writes secrets to ~/.config/frosty/forgejo-release-secrets.env (mode 600)
+#      — generates a new upload keystore + passwords if the file is missing
+#      — merges CLIENT_ID / SECRET from frosty/.env when present (never echoes them)
+#   2. PUTs each secret to Forgejo Actions on copilot/frosty
+#
+# Re-run safely: existing secrets file is reused (keystore not regenerated) unless
+#   FORCE_REGENERATE=1 bash …/setup-forgejo-release-secrets.sh
+#
+# Twitch Helix: if CLIENT_ID/SECRET are still empty after merge, the script stops
+# before upload and tells you to edit the secrets file (add the two lines) then re-run.
+set -euo pipefail
+
+REPO="${REPO:-copilot/frosty}"
+FORGEJO_URL="${FORGEJO_URL:-https://forgejo.fsociety00.cc}"
+TOKEN_FILE="${TOKEN_FILE:-${HOME}/.config/forgejo/token}"
+SECRETS_DIR="${SECRETS_DIR:-${HOME}/.config/frosty}"
+SECRETS_FILE="${SECRETS_FILE:-${SECRETS_DIR}/forgejo-release-secrets.env}"
+KEYSTORE_FILE="${KEYSTORE_FILE:-${SECRETS_DIR}/upload-keystore.jks}"
+FROSTY_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+ENV_FILE="${ENV_FILE:-${FROSTY_ROOT}/.env}"
+KEY_ALIAS_DEFAULT="${KEY_ALIAS_DEFAULT:-upload}"
+
+need_cmd() {
+  command -v "$1" >/dev/null 2>&1 || {
+    echo "ERROR: missing command: $1" >&2
+    exit 1
+  }
+}
+
+need_cmd curl
+need_cmd python3
+need_cmd openssl
+need_cmd keytool
+need_cmd base64
+
+if [[ ! -f "$TOKEN_FILE" ]]; then
+  echo "ERROR: Forgejo token not found: $TOKEN_FILE" >&2
+  exit 1
+fi
+TOKEN="$(tr -d '[:space:]' <"$TOKEN_FILE")"
+[[ -n "$TOKEN" ]] || {
+  echo "ERROR: empty token in $TOKEN_FILE" >&2
+  exit 1
+}
+
+mkdir -p "$SECRETS_DIR"
+chmod 700 "$SECRETS_DIR"
+
+rand_pw() {
+  # URL/shell-safe password, no quotes
+  openssl rand -base64 24 | tr -d '\n/+=\r' | head -c 32
+}
+
+write_secrets_file() {
+  local store_pw key_pw alias b64
+  store_pw="$1"
+  key_pw="$2"
+  alias="$3"
+  b64="$4"
+  # Atomic write; never echo values
+  local tmp
+  tmp="$(mktemp "${SECRETS_DIR}/.secrets.XXXXXX")"
+  umask 077
+  cat >"$tmp" <<EOF
+# Frosty Forgejo Actions release secrets — DO NOT COMMIT
+# Generated: $(date -u +%Y-%m-%dT%H:%M:%SZ)
+# Upload target: ${FORGEJO_URL}/${REPO}
+
+RELEASE_KEYSTORE_BASE64=${b64}
+STORE_PASSWORD=${store_pw}
+KEY_ALIAS=${alias}
+KEY_PASSWORD=${key_pw}
+CLIENT_ID=
+SECRET=
+EOF
+  mv -f "$tmp" "$SECRETS_FILE"
+  chmod 600 "$SECRETS_FILE"
+}
+
+merge_twitch_from_dotenv() {
+  # Pull CLIENT_ID / SECRET from frosty/.env into SECRETS_FILE if empty there.
+  # Uses python so values never hit the shell prompt or this script's stdout.
+  if [[ ! -f "$ENV_FILE" ]]; then
+    return 0
+  fi
+  python3 - "$ENV_FILE" "$SECRETS_FILE" <<'PY'
+import pathlib, re, sys
+
+env_path, secrets_path = map(pathlib.Path, sys.argv[1:3])
+env = {}
+for line in env_path.read_text().splitlines():
+    line = line.strip()
+    if not line or line.startswith("#") or "=" not in line:
+        continue
+    k, _, v = line.partition("=")
+    env[k.strip()] = v.strip().strip('"').strip("'")
+
+text = secrets_path.read_text()
+changed = False
+for key in ("CLIENT_ID", "SECRET"):
+    m = re.search(rf"^{key}=(.*)$", text, re.M)
+    current = m.group(1) if m else ""
+    incoming = env.get(key, "")
+    if not current and incoming:
+        if m:
+            text = re.sub(rf"^{key}=.*$", f"{key}={incoming}", text, count=1, flags=re.M)
+        else:
+            text += f"\n{key}={incoming}\n"
+        changed = True
+if changed:
+    secrets_path.write_text(text)
+    print(f"merged Twitch keys from {env_path.name} into secrets file (values not shown)", file=sys.stderr)
+PY
+}
+
+secrets_complete() {
+  python3 - "$SECRETS_FILE" <<'PY'
+import pathlib, re, sys
+text = pathlib.Path(sys.argv[1]).read_text()
+needed = [
+    "RELEASE_KEYSTORE_BASE64",
+    "STORE_PASSWORD",
+    "KEY_ALIAS",
+    "KEY_PASSWORD",
+    "CLIENT_ID",
+    "SECRET",
+]
+missing = []
+for key in needed:
+    m = re.search(rf"^{key}=(.*)$", text, re.M)
+    if not m or not m.group(1).strip():
+        missing.append(key)
+if missing:
+    print("MISSING:" + ",".join(missing))
+    sys.exit(2)
+print("OK")
+PY
+}
+
+put_secret() {
+  local name="$1"
+  # Read value from secrets file without printing it
+  local payload code
+  payload="$(
+    python3 - "$SECRETS_FILE" "$name" <<'PY'
+import json, pathlib, re, sys
+text = pathlib.Path(sys.argv[1]).read_text()
+name = sys.argv[2]
+m = re.search(rf"^{re.escape(name)}=(.*)$", text, re.M)
+if not m:
+    raise SystemExit(f"missing {name}")
+print(json.dumps({"data": m.group(1)}))
+PY
+  )"
+  code="$(
+    curl -sS -o /tmp/frosty-forgejo-secret-resp.json -w '%{http_code}' \
+      -X PUT "${FORGEJO_URL}/api/v1/repos/${REPO}/actions/secrets/${name}" \
+      -H "Authorization: token ${TOKEN}" \
+      -H "Content-Type: application/json" \
+      -d "$payload"
+  )"
+  if [[ "$code" != "201" && "$code" != "204" && "$code" != "200" ]]; then
+    echo "ERROR: PUT secret ${name} → HTTP ${code}" >&2
+    # Response may contain error text only — still avoid dumping request body
+    python3 -c 'import pathlib; p=pathlib.Path("/tmp/frosty-forgejo-secret-resp.json"); print(p.read_text()[:500] if p.exists() else "")' >&2 || true
+    exit 1
+  fi
+  echo "  set ${name} (HTTP ${code})"
+}
+
+# --- generate if needed ---
+if [[ ! -f "$SECRETS_FILE" || "${FORCE_REGENERATE:-0}" == "1" ]]; then
+  echo "→ Generating new upload keystore + passwords → ${SECRETS_FILE}"
+  STORE_PW="$(rand_pw)"
+  KEY_PW="$(rand_pw)"
+  ALIAS="$KEY_ALIAS_DEFAULT"
+  rm -f "$KEYSTORE_FILE"
+  keytool -genkeypair \
+    -keystore "$KEYSTORE_FILE" \
+    -storetype JKS \
+    -storepass "$STORE_PW" \
+    -keypass "$KEY_PW" \
+    -alias "$ALIAS" \
+    -keyalg RSA \
+    -keysize 2048 \
+    -validity 10000 \
+    -dname "CN=Frosty Forgejo Release, OU=Newas, O=fsociety00, L=Home, ST=NA, C=DE" \
+    >/dev/null 2>&1
+  chmod 600 "$KEYSTORE_FILE"
+  B64="$(base64 -w0 "$KEYSTORE_FILE" 2>/dev/null || base64 "$KEYSTORE_FILE" | tr -d '\n')"
+  write_secrets_file "$STORE_PW" "$KEY_PW" "$ALIAS" "$B64"
+  # Drop locals
+  unset STORE_PW KEY_PW B64
+  echo "  wrote keystore ${KEYSTORE_FILE}"
+  echo "  wrote secrets file (mode 600)"
+else
+  echo "→ Reusing existing secrets file: ${SECRETS_FILE}"
+  echo "  (set FORCE_REGENERATE=1 to mint a new keystore)"
+fi
+
+echo "→ Merging Twitch CLIENT_ID/SECRET from ${ENV_FILE} if present…"
+merge_twitch_from_dotenv || true
+
+if ! status="$(secrets_complete)"; then
+  echo >&2
+  echo "Twitch Helix secrets still missing in ${SECRETS_FILE}." >&2
+  echo "Edit that file and set CLIENT_ID=… and SECRET=… (from https://dev.twitch.tv/console)," >&2
+  echo "or put them in ${ENV_FILE}, then re-run this script." >&2
+  echo "Signing secrets are already generated; they will be uploaded together." >&2
+  exit 3
+fi
+echo "→ Secrets file complete (${status})"
+
+echo "→ Uploading Actions secrets to ${FORGEJO_URL}/${REPO} (values not printed)"
+for name in RELEASE_KEYSTORE_BASE64 STORE_PASSWORD KEY_ALIAS KEY_PASSWORD CLIENT_ID SECRET; do
+  put_secret "$name"
+done
+
+echo
+echo "Done. Secrets live only in:"
+echo "  ${SECRETS_FILE}"
+echo "  ${KEYSTORE_FILE}"
+echo "  Forgejo Actions → ${REPO}"
+echo
+echo "Next: Forgejo → Actions → Release APK → Run workflow"
+echo "Obtainium: https://forgejo.fsociety00.cc/api/v1/repos/copilot/frosty/releases"
+echo "APK filter: frosty-arm64-v8a-v.*\\.apk"
diff --git a/test/apis/base_api_client_test.dart b/test/apis/base_api_client_test.dart
new file mode 100644
index 00000000..f0170b7d
--- /dev/null
+++ b/test/apis/base_api_client_test.dart
@@ -0,0 +1,438 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:http_mock_adapter/http_mock_adapter.dart';
+
+/// Concrete test subclass to test BaseApiClient through its public interface.
+class TestApiClient extends BaseApiClient {
+  TestApiClient(Dio dio) : super(dio, 'https://api.test.com');
+
+  /// Test wrapper that exercises the error handling path through get().
+  Future<dynamic> testGet(String endpoint) => get(endpoint);
+}
+
+void main() {
+  late Dio dio;
+  late DioAdapter dioAdapter;
+  late TestApiClient client;
+
+  setUp(() {
+    dio = Dio(BaseOptions());
+    dioAdapter = DioAdapter(dio: dio);
+    client = TestApiClient(dio);
+  });
+
+  group('isSuccessResponse', () {
+    test('returns true for 200', () {
+      final response = Response(
+        requestOptions: RequestOptions(),
+        statusCode: 200,
+      );
+      expect(client.isSuccessResponse(response), isTrue);
+    });
+
+    test('returns true for 201', () {
+      final response = Response(
+        requestOptions: RequestOptions(),
+        statusCode: 201,
+      );
+      expect(client.isSuccessResponse(response), isTrue);
+    });
+
+    test('returns true for 204', () {
+      final response = Response(
+        requestOptions: RequestOptions(),
+        statusCode: 204,
+      );
+      expect(client.isSuccessResponse(response), isTrue);
+    });
+
+    test('returns false for 300', () {
+      final response = Response(
+        requestOptions: RequestOptions(),
+        statusCode: 300,
+      );
+      expect(client.isSuccessResponse(response), isFalse);
+    });
+
+    test('returns false for 400', () {
+      final response = Response(
+        requestOptions: RequestOptions(),
+        statusCode: 400,
+      );
+      expect(client.isSuccessResponse(response), isFalse);
+    });
+
+    test('returns false for 500', () {
+      final response = Response(
+        requestOptions: RequestOptions(),
+        statusCode: 500,
+      );
+      expect(client.isSuccessResponse(response), isFalse);
+    });
+
+    test('returns false for null statusCode', () {
+      final response = Response(requestOptions: RequestOptions());
+      expect(client.isSuccessResponse(response), isFalse);
+    });
+  });
+
+  group('error handling through get()', () {
+    test('400 throws ApiException', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/test',
+        (server) => server.reply(400, {'message': 'Bad field'}),
+      );
+
+      expect(
+        () => client.testGet('/test'),
+        throwsA(
+          isA<ApiException>().having((e) => e.message, 'message', 'Bad field'),
+        ),
+      );
+    });
+
+    test('401 throws UnauthorizedException', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/auth',
+        (server) => server.reply(401, {'message': 'Unauthorized'}),
+      );
+
+      expect(
+        () => client.testGet('/auth'),
+        throwsA(isA<UnauthorizedException>()),
+      );
+    });
+
+    test('404 throws NotFoundException', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/missing',
+        (server) => server.reply(404, {'message': 'User not found'}),
+      );
+
+      expect(
+        () => client.testGet('/missing'),
+        throwsA(
+          isA<NotFoundException>().having(
+            (e) => e.message,
+            'message',
+            'User not found',
+          ),
+        ),
+      );
+    });
+
+    test('404 with no server message uses default', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/empty404',
+        (server) => server.reply(404, 'not json'),
+      );
+
+      expect(
+        () => client.testGet('/empty404'),
+        throwsA(
+          isA<NotFoundException>().having(
+            (e) => e.message,
+            'message',
+            'Resource not found',
+          ),
+        ),
+      );
+    });
+
+    test('409 throws ApiException about conflict', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/conflict',
+        (server) => server.reply(409, null),
+      );
+
+      expect(
+        () => client.testGet('/conflict'),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            contains('Conflict'),
+          ),
+        ),
+      );
+    });
+
+    test('429 throws ApiException about rate limit', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/ratelimit',
+        (server) => server.reply(429, null),
+      );
+
+      expect(
+        () => client.testGet('/ratelimit'),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            contains('Rate limit'),
+          ),
+        ),
+      );
+    });
+
+    test('500 throws ServerException', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/server-error',
+        (server) => server.reply(500, null),
+      );
+
+      expect(
+        () => client.testGet('/server-error'),
+        throwsA(
+          isA<ServerException>().having(
+            (e) => e.statusCode,
+            'statusCode',
+            500,
+          ),
+        ),
+      );
+    });
+
+    test('502 throws ServerException', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/bad-gateway',
+        (server) => server.reply(502, null),
+      );
+
+      expect(
+        () => client.testGet('/bad-gateway'),
+        throwsA(
+          isA<ServerException>().having(
+            (e) => e.statusCode,
+            'statusCode',
+            502,
+          ),
+        ),
+      );
+    });
+
+    test('503 throws ServerException', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/maintenance',
+        (server) => server.reply(503, null),
+      );
+
+      expect(
+        () => client.testGet('/maintenance'),
+        throwsA(isA<ServerException>()),
+      );
+    });
+
+    test('504 throws ServerException', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/timeout',
+        (server) => server.reply(504, null),
+      );
+
+      expect(
+        () => client.testGet('/timeout'),
+        throwsA(isA<ServerException>()),
+      );
+    });
+
+    test('422 uses server message from error field', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/unprocessable',
+        (server) => server.reply(422, {'error': 'Invalid email'}),
+      );
+
+      expect(
+        () => client.testGet('/unprocessable'),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            'Invalid email',
+          ),
+        ),
+      );
+    });
+
+    test('400 uses error_description field', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/oauth-error',
+        (server) => server.reply(
+          400,
+          {'error_description': 'OAuth error description'},
+        ),
+      );
+
+      expect(
+        () => client.testGet('/oauth-error'),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            'OAuth error description',
+          ),
+        ),
+      );
+    });
+
+    test('400 prefers message field over error field', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/priority',
+        (server) => server.reply(400, {
+          'message': 'From message',
+          'error': 'From error',
+        }),
+      );
+
+      expect(
+        () => client.testGet('/priority'),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            'From message',
+          ),
+        ),
+      );
+    });
+
+    test('403 returns permission error', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/forbidden',
+        (server) => server.reply(403, null),
+      );
+
+      expect(
+        () => client.testGet('/forbidden'),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            contains('permissions'),
+          ),
+        ),
+      );
+    });
+
+    test('unknown status code throws ServerException', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/teapot',
+        (server) => server.reply(418, null),
+      );
+
+      expect(
+        () => client.testGet('/teapot'),
+        throwsA(
+          isA<ServerException>().having(
+            (e) => e.statusCode,
+            'statusCode',
+            418,
+          ),
+        ),
+      );
+    });
+
+    const timeoutCases = {
+      DioExceptionType.connectionTimeout: 'Connection timeout',
+      DioExceptionType.sendTimeout: 'Upload timeout',
+      DioExceptionType.receiveTimeout: 'Server response timeout',
+      DioExceptionType.transformTimeout: 'Response processing timeout',
+    };
+
+    timeoutCases.forEach((type, expectedMessage) {
+      test('${type.name} throws TimeoutException', () async {
+        final path = '/${type.name}';
+
+        dioAdapter.onGet(
+          'https://api.test.com$path',
+          (server) => server.throws(
+            0,
+            DioException(
+              requestOptions: RequestOptions(path: path),
+              type: type,
+            ),
+          ),
+        );
+
+        expect(
+          () => client.testGet(path),
+          throwsA(
+            isA<TimeoutException>().having(
+              (e) => e.message,
+              'message',
+              contains(expectedMessage),
+            ),
+          ),
+        );
+      });
+    });
+  });
+
+  group('successful get()', () {
+    test('returns data on success', () async {
+      dioAdapter.onGet(
+        'https://api.test.com/users',
+        (server) => server.reply(200, {'data': 'test'}),
+      );
+
+      final result = await client.testGet('/users');
+      expect(result, {'data': 'test'});
+    });
+
+    test('handles absolute URL', () async {
+      dioAdapter.onGet(
+        'https://other.com/endpoint',
+        (server) => server.reply(200, {'result': 'ok'}),
+      );
+
+      final result = await client.testGet('https://other.com/endpoint');
+      expect(result, {'result': 'ok'});
+    });
+  });
+
+  group('ApiException', () {
+    test('toString includes message', () {
+      const exception = ApiException('Test error');
+      expect(exception.toString(), 'ApiException: Test error');
+    });
+
+    test('stores status code and type', () {
+      const exception = ApiException(
+        'Error',
+        404,
+        DioExceptionType.badResponse,
+      );
+      expect(exception.statusCode, 404);
+      expect(exception.type, DioExceptionType.badResponse);
+    });
+  });
+
+  group('Exception subtypes', () {
+    test('NetworkException has connectionError type', () {
+      const exception = NetworkException('No network');
+      expect(exception.type, DioExceptionType.connectionError);
+      expect(exception.statusCode, isNull);
+    });
+
+    test('TimeoutException has connectionTimeout type', () {
+      const exception = TimeoutException('Timed out');
+      expect(exception.type, DioExceptionType.connectionTimeout);
+    });
+
+    test('ServerException has badResponse type and status code', () {
+      const exception = ServerException('Server error', 500);
+      expect(exception.type, DioExceptionType.badResponse);
+      expect(exception.statusCode, 500);
+    });
+
+    test('NotFoundException has 404 status code', () {
+      const exception = NotFoundException('Not found');
+      expect(exception.statusCode, 404);
+    });
+
+    test('UnauthorizedException has 401 status code', () {
+      const exception = UnauthorizedException('Unauthorized');
+      expect(exception.statusCode, 401);
+    });
+  });
+}
diff --git a/test/apis/bttv_api_test.dart b/test/apis/bttv_api_test.dart
new file mode 100644
index 00000000..e78004be
--- /dev/null
+++ b/test/apis/bttv_api_test.dart
@@ -0,0 +1,106 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/bttv_api.dart';
+import 'package:frosty/models/emotes.dart';
+import 'package:http_mock_adapter/http_mock_adapter.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  late Dio dio;
+  late DioAdapter dioAdapter;
+  late BTTVApi api;
+
+  setUp(() {
+    dio = Dio(BaseOptions());
+    dioAdapter = DioAdapter(dio: dio);
+    api = BTTVApi(dio);
+  });
+
+  group('getEmotesGlobal', () {
+    test('returns list of global BTTV emotes', () async {
+      dioAdapter.onGet(
+        'https://api.betterttv.net/3/cached/emotes/global',
+        (server) => server.reply(200, bttvEmotesGlobalResponse),
+      );
+
+      final emotes = await api.getEmotesGlobal();
+
+      expect(emotes, hasLength(2));
+      expect(emotes[0].name, 'SourPls');
+      expect(emotes[0].type, EmoteType.bttvGlobal);
+      expect(emotes[0].url, contains('bttv1'));
+      expect(emotes[1].name, 'catJAM');
+    });
+
+    test('returns empty list for empty response', () async {
+      dioAdapter.onGet(
+        'https://api.betterttv.net/3/cached/emotes/global',
+        (server) => server.reply(200, <dynamic>[]),
+      );
+
+      final emotes = await api.getEmotesGlobal();
+
+      expect(emotes, isEmpty);
+    });
+  });
+
+  group('getEmotesChannel', () {
+    test('combines channel and shared emotes', () async {
+      dioAdapter.onGet(
+        'https://api.betterttv.net/3/cached/users/twitch/12345',
+        (server) => server.reply(200, bttvEmotesChannelResponse),
+      );
+
+      final emotes = await api.getEmotesChannel(id: '12345');
+
+      expect(emotes, hasLength(3));
+      expect(emotes[0].name, 'ChannelEmote');
+      expect(emotes[0].type, EmoteType.bttvChannel);
+      expect(emotes[1].name, 'SharedEmote');
+      expect(emotes[1].type, EmoteType.bttvShared);
+      expect(emotes[2].name, 'SharedEmote2');
+      expect(emotes[2].type, EmoteType.bttvShared);
+    });
+
+    test('throws on 404 for unknown channel', () {
+      dioAdapter.onGet(
+        'https://api.betterttv.net/3/cached/users/twitch/99999',
+        (server) => server.reply(404, {'message': 'user not found'}),
+      );
+
+      expect(
+        () => api.getEmotesChannel(id: '99999'),
+        throwsA(isA<NotFoundException>()),
+      );
+    });
+  });
+
+  group('getBadges', () {
+    test('returns map of userId to ChatBadge', () async {
+      dioAdapter.onGet(
+        'https://api.betterttv.net/3/cached/badges',
+        (server) => server.reply(200, bttvBadgesResponse),
+      );
+
+      final badges = await api.getBadges();
+
+      expect(badges, hasLength(2));
+      expect(badges['user123']!.name, 'BTTV Developer');
+      expect(badges['user123']!.url, contains('dev.svg'));
+      expect(badges['user456']!.name, 'BTTV Supporter');
+    });
+
+    test('returns empty map for empty response', () async {
+      dioAdapter.onGet(
+        'https://api.betterttv.net/3/cached/badges',
+        (server) => server.reply(200, <dynamic>[]),
+      );
+
+      final badges = await api.getBadges();
+
+      expect(badges, isEmpty);
+    });
+  });
+}
diff --git a/test/apis/ffz_api_test.dart b/test/apis/ffz_api_test.dart
new file mode 100644
index 00000000..c33ca470
--- /dev/null
+++ b/test/apis/ffz_api_test.dart
@@ -0,0 +1,192 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/ffz_api.dart';
+import 'package:frosty/models/badges.dart';
+import 'package:frosty/models/emotes.dart';
+import 'package:http_mock_adapter/http_mock_adapter.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  late Dio dio;
+  late DioAdapter dioAdapter;
+  late FFZApi api;
+
+  setUp(() {
+    dio = Dio(BaseOptions());
+    dioAdapter = DioAdapter(dio: dio);
+    api = FFZApi(dio);
+  });
+
+  group('getEmotesGlobal', () {
+    test('returns global FFZ emotes from default sets', () async {
+      dioAdapter.onGet(
+        'https://api.frankerfacez.com/v1/set/global',
+        (server) => server.reply(200, ffzEmotesGlobalResponse),
+      );
+
+      final emotes = await api.getEmotesGlobal();
+
+      expect(emotes, hasLength(1));
+      expect(emotes.first.name, 'LULW');
+      expect(emotes.first.type, EmoteType.ffzGlobal);
+      expect(emotes.first.ownerDisplayName, 'FFZOwner');
+      expect(emotes.first.ownerUsername, 'ffzowner');
+    });
+
+    test('returns emotes from multiple default sets', () async {
+      dioAdapter.onGet(
+        'https://api.frankerfacez.com/v1/set/global',
+        (server) => server.reply(200, {
+          'default_sets': [1, 2],
+          'sets': {
+            '1': {
+              'emoticons': [
+                {
+                  'name': 'LULW',
+                  'height': 28,
+                  'width': 28,
+                  'owner': {'display_name': 'A', 'name': 'a'},
+                  'urls': {'1': 'https://cdn/1x.png'},
+                  'animated': null,
+                },
+              ],
+            },
+            '2': {
+              'emoticons': [
+                {
+                  'name': 'KEKW',
+                  'height': 32,
+                  'width': 32,
+                  'owner': {'display_name': 'B', 'name': 'b'},
+                  'urls': {'1': 'https://cdn/kekw.png'},
+                  'animated': null,
+                },
+              ],
+            },
+          },
+        }),
+      );
+
+      final emotes = await api.getEmotesGlobal();
+
+      expect(emotes, hasLength(2));
+      expect(emotes[0].name, 'LULW');
+      expect(emotes[1].name, 'KEKW');
+    });
+  });
+
+  group('getRoomInfo', () {
+    test('returns room info and channel emotes', () async {
+      dioAdapter.onGet(
+        'https://api.frankerfacez.com/v1/room/id/12345',
+        (server) => server.reply(200, ffzRoomInfoResponse),
+      );
+
+      final (roomInfo, emotes) = await api.getRoomInfo(id: '12345');
+
+      expect(roomInfo.set, 123);
+      expect(roomInfo.vipBadge, isNull);
+      expect(roomInfo.modUrls, isNull);
+      expect(emotes, hasLength(1));
+      expect(emotes.first.name, 'ChannelFFZ');
+      expect(emotes.first.type, EmoteType.ffzChannel);
+    });
+
+    test('returns room info with VIP badge', () async {
+      dioAdapter.onGet(
+        'https://api.frankerfacez.com/v1/room/id/54321',
+        (server) => server.reply(200, {
+          'room': {
+            'set': 456,
+            'vip_badge': {
+              '1': 'https://cdn/vip/1x.png',
+              '2': 'https://cdn/vip/2x.png',
+              '4': 'https://cdn/vip/4x.png',
+            },
+            'mod_urls': null,
+          },
+          'sets': {
+            '456': {
+              'emoticons': <dynamic>[],
+            },
+          },
+        }),
+      );
+
+      final (roomInfo, emotes) = await api.getRoomInfo(id: '54321');
+
+      expect(roomInfo.vipBadge, isNotNull);
+      expect(roomInfo.vipBadge!.url1x, 'https://cdn/vip/1x.png');
+      expect(emotes, isEmpty);
+    });
+
+    test('throws NotFoundException for unknown channel', () {
+      dioAdapter.onGet(
+        'https://api.frankerfacez.com/v1/room/id/99999',
+        (server) => server.reply(404, {'error': 'No such room'}),
+      );
+
+      expect(
+        () => api.getRoomInfo(id: '99999'),
+        throwsA(isA<NotFoundException>()),
+      );
+    });
+  });
+
+  group('getBadges', () {
+    test('builds user-to-badge map with reversed badge order', () async {
+      dioAdapter.onGet(
+        'https://api.frankerfacez.com/v1/badges/ids',
+        (server) => server.reply(200, ffzBadgesResponse),
+      );
+
+      final badges = await api.getBadges();
+
+      // User 22222 appears in both badge lists, so should have 2 badges.
+      // Reversed iteration means badge 2 (Supporter) is processed first,
+      // then badge 1 (Developer).
+      expect(badges['22222'], hasLength(2));
+      expect(badges['22222']![0].name, 'FFZ Supporter');
+      expect(badges['22222']![1].name, 'FFZ Developer');
+
+      // User 11111 only appears in badge 1
+      expect(badges['11111'], hasLength(1));
+      expect(badges['11111']![0].name, 'FFZ Developer');
+
+      // User 33333 only appears in badge 2
+      expect(badges['33333'], hasLength(1));
+      expect(badges['33333']![0].name, 'FFZ Supporter');
+    });
+
+    test('badge entries have correct type', () async {
+      dioAdapter.onGet(
+        'https://api.frankerfacez.com/v1/badges/ids',
+        (server) => server.reply(200, ffzBadgesResponse),
+      );
+
+      final badges = await api.getBadges();
+
+      for (final badgeList in badges.values) {
+        for (final badge in badgeList) {
+          expect(badge.type, BadgeType.ffz);
+        }
+      }
+    });
+
+    test('returns empty map when no badges exist', () async {
+      dioAdapter.onGet(
+        'https://api.frankerfacez.com/v1/badges/ids',
+        (server) => server.reply(200, {
+          'badges': <dynamic>[],
+          'users': <String, dynamic>{},
+        }),
+      );
+
+      final badges = await api.getBadges();
+
+      expect(badges, isEmpty);
+    });
+  });
+}
diff --git a/test/apis/seventv_api_test.dart b/test/apis/seventv_api_test.dart
new file mode 100644
index 00000000..a9d90057
--- /dev/null
+++ b/test/apis/seventv_api_test.dart
@@ -0,0 +1,142 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/seventv_api.dart';
+import 'package:frosty/models/emotes.dart';
+import 'package:http_mock_adapter/http_mock_adapter.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  late Dio dio;
+  late DioAdapter dioAdapter;
+  late SevenTVApi api;
+
+  setUp(() {
+    dio = Dio(BaseOptions());
+    dioAdapter = DioAdapter(dio: dio);
+    api = SevenTVApi(dio);
+  });
+
+  group('getEmotesGlobal', () {
+    test('returns list of global 7TV emotes', () async {
+      dioAdapter.onGet(
+        'https://7tv.io/v3/emote-sets/global',
+        (server) => server.reply(200, sevenTVEmotesGlobalResponse),
+      );
+
+      final emotes = await api.getEmotesGlobal();
+
+      expect(emotes, hasLength(1));
+      expect(emotes.first.name, 'EZ');
+      expect(emotes.first.type, EmoteType.sevenTVGlobal);
+      expect(emotes.first.url, contains('7tv.app'));
+      expect(emotes.first.url, contains('4x.webp'));
+      expect(emotes.first.ownerDisplayName, 'Creator');
+      expect(emotes.first.ownerUsername, 'creator');
+    });
+
+    test('returns empty list for empty emotes', () async {
+      dioAdapter.onGet(
+        'https://7tv.io/v3/emote-sets/global',
+        (server) => server.reply(200, {
+          'emotes': <dynamic>[],
+        }),
+      );
+
+      final emotes = await api.getEmotesGlobal();
+
+      expect(emotes, isEmpty);
+    });
+  });
+
+  group('getEmotesChannel', () {
+    test('returns emote set ID and channel emotes', () async {
+      dioAdapter.onGet(
+        'https://7tv.io/v3/users/twitch/12345',
+        (server) => server.reply(200, sevenTVEmotesChannelResponse),
+      );
+
+      final (emoteSetId, emotes) = await api.getEmotesChannel(id: '12345');
+
+      expect(emoteSetId, 'set_abc123');
+      expect(emotes, hasLength(1));
+      expect(emotes.first.name, 'Clap');
+      expect(emotes.first.type, EmoteType.sevenTVChannel);
+    });
+
+    test('filters out emotes with empty URLs', () async {
+      dioAdapter.onGet(
+        'https://7tv.io/v3/users/twitch/12345',
+        (server) => server.reply(200, {
+          'emote_set': {
+            'id': 'set_filter',
+            'emotes': [
+              {
+                'id': 'valid',
+                'name': 'ValidEmote',
+                'data': {
+                  'id': 'valid',
+                  'name': 'ValidEmote',
+                  'flags': 0,
+                  'owner': null,
+                  'host': {
+                    'url': '//cdn.7tv.app/emote/valid',
+                    'files': [
+                      {
+                        'name': '1x.webp',
+                        'width': 32,
+                        'height': 32,
+                        'format': 'WEBP',
+                      },
+                    ],
+                  },
+                },
+              },
+              {
+                'id': 'empty_url',
+                'name': 'NoUrlEmote',
+                'data': {
+                  'id': 'empty_url',
+                  'name': 'NoUrlEmote',
+                  'flags': 0,
+                  'owner': null,
+                  'host': {
+                    'url': '//cdn.7tv.app/emote/empty_url',
+                    // Only AVIF files — these get filtered by lastWhereOrNull,
+                    // resulting in empty URL
+                    'files': [
+                      {
+                        'name': '1x.avif',
+                        'width': 32,
+                        'height': 32,
+                        'format': 'AVIF',
+                      },
+                    ],
+                  },
+                },
+              },
+            ],
+          },
+        }),
+      );
+
+      final (_, emotes) = await api.getEmotesChannel(id: '12345');
+
+      expect(emotes, hasLength(1));
+      expect(emotes.first.name, 'ValidEmote');
+    });
+
+    test('throws on 404 for unknown user', () {
+      dioAdapter.onGet(
+        'https://7tv.io/v3/users/twitch/99999',
+        (server) => server.reply(404, {'message': 'Unknown User'}),
+      );
+
+      expect(
+        () => api.getEmotesChannel(id: '99999'),
+        throwsA(isA<NotFoundException>()),
+      );
+    });
+  });
+}
diff --git a/test/apis/twitch_ad_solutions_test.dart b/test/apis/twitch_ad_solutions_test.dart
new file mode 100644
index 00000000..44103bc6
--- /dev/null
+++ b/test/apis/twitch_ad_solutions_test.dart
@@ -0,0 +1,84 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/twitch_ad_solutions.dart';
+
+void main() {
+  group('TwitchAdSolutions', () {
+    test('playlistContainsAds detects stitched signifier', () {
+      expect(
+        TwitchAdSolutions.playlistContainsAds(
+          '#EXTM3U\n#EXT-X-DATERANGE:ID="stitched-ad-1"\n',
+        ),
+        isTrue,
+      );
+      expect(
+        TwitchAdSolutions.playlistContainsAds('#EXTM3U\n#EXTINF:2.0,\nlive.ts\n'),
+        isFalse,
+      );
+    });
+
+    test('playlistIsMidroll detects midroll markers', () {
+      expect(
+        TwitchAdSolutions.playlistIsMidroll('X-TV-TWITCH-AD-POD-TYPE="MIDROLL"'),
+        isTrue,
+      );
+      expect(TwitchAdSolutions.playlistIsMidroll('live only'), isFalse);
+    });
+
+    test('platformForPlayerType matches vaft', () {
+      expect(TwitchAdSolutions.platformForPlayerType('autoplay'), 'android');
+      expect(TwitchAdSolutions.platformForPlayerType('popout'), 'web');
+      expect(TwitchAdSolutions.platformForPlayerType('embed'), 'web');
+    });
+
+    test('force / backup player types match vaft defaults', () {
+      expect(TwitchAdSolutions.forceAccessTokenPlayerType, 'popout');
+      expect(TwitchAdSolutions.backupPlayerTypes, [
+        'embed',
+        'popout',
+        'autoplay',
+      ]);
+      expect(TwitchAdSolutions.fallbackPlayerType, 'embed');
+    });
+  });
+
+  group('TwitchAdFreePlayback.firstMediaPlaylistUrl', () {
+    test('resolves relative media playlist against base', () {
+      const master = '''
+#EXTM3U
+#EXT-X-STREAM-INF:BANDWIDTH=1000,RESOLUTION=640x360
+360p.m3u8
+''';
+      final url = TwitchAdFreePlayback.firstMediaPlaylistUrl(
+        master,
+        baseUrl: 'https://usher.ttvnw.net/api/v2/channel/hls/foo.m3u8?x=1',
+      );
+      expect(
+        url,
+        'https://usher.ttvnw.net/api/v2/channel/hls/360p.m3u8',
+      );
+    });
+
+    test('keeps absolute media playlist URLs', () {
+      const master = '''
+#EXTM3U
+#EXT-X-STREAM-INF:BANDWIDTH=1000
+https://video-weaver.example/v1/playlist/abc.m3u8
+''';
+      final url = TwitchAdFreePlayback.firstMediaPlaylistUrl(
+        master,
+        baseUrl: 'https://usher.ttvnw.net/foo.m3u8',
+      );
+      expect(url, 'https://video-weaver.example/v1/playlist/abc.m3u8');
+    });
+
+    test('returns null when no media URI present', () {
+      expect(
+        TwitchAdFreePlayback.firstMediaPlaylistUrl(
+          '#EXTM3U\n',
+          baseUrl: 'https://example.com/x.m3u8',
+        ),
+        isNull,
+      );
+    });
+  });
+}
diff --git a/test/apis/twitch_api_test.dart b/test/apis/twitch_api_test.dart
new file mode 100644
index 00000000..4180a464
--- /dev/null
+++ b/test/apis/twitch_api_test.dart
@@ -0,0 +1,641 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/models/emotes.dart';
+import 'package:http_mock_adapter/http_mock_adapter.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  late Dio dio;
+  late DioAdapter dioAdapter;
+  late TwitchApi api;
+
+  setUp(() {
+    dio = Dio(BaseOptions());
+    dioAdapter = DioAdapter(dio: dio);
+    api = TwitchApi(dio);
+  });
+
+  group('getEmotesGlobal', () {
+    test('returns list of global Twitch emotes', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/chat/emotes/global',
+        (server) => server.reply(200, twitchEmotesGlobalResponse),
+      );
+
+      final emotes = await api.getEmotesGlobal();
+
+      expect(emotes, hasLength(2));
+      expect(emotes[0].name, 'Kappa');
+      expect(emotes[0].type, EmoteType.twitchGlobal);
+      expect(emotes[0].url, contains('25'));
+      expect(emotes[1].name, 'Keepo');
+    });
+  });
+
+  group('getBadgesGlobal', () {
+    test('returns map of badge set/version to ChatBadge', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/chat/badges/global',
+        (server) => server.reply(200, twitchBadgesGlobalResponse),
+      );
+
+      final badges = await api.getBadgesGlobal();
+
+      expect(badges, hasLength(1));
+      expect(badges['subscriber/0'], isNotNull);
+      expect(badges['subscriber/0']!.name, 'Subscriber');
+      expect(badges['subscriber/0']!.url, contains('4x.png'));
+    });
+
+    test('handles multiple versions per badge set', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/chat/badges/global',
+        (server) => server.reply(200, {
+          'data': [
+            {
+              'set_id': 'subscriber',
+              'versions': [
+                {
+                  'id': '0',
+                  'image_url_1x': 'https://cdn/1x.png',
+                  'image_url_2x': 'https://cdn/2x.png',
+                  'image_url_4x': 'https://cdn/4x.png',
+                  'title': 'Subscriber',
+                  'description': '0 months',
+                },
+                {
+                  'id': '3',
+                  'image_url_1x': 'https://cdn/3mo/1x.png',
+                  'image_url_2x': 'https://cdn/3mo/2x.png',
+                  'image_url_4x': 'https://cdn/3mo/4x.png',
+                  'title': '3-Month Subscriber',
+                  'description': '3 months',
+                },
+              ],
+            },
+          ],
+        }),
+      );
+
+      final badges = await api.getBadgesGlobal();
+
+      expect(badges, hasLength(2));
+      expect(badges['subscriber/0']!.name, 'Subscriber');
+      expect(badges['subscriber/3']!.name, '3-Month Subscriber');
+    });
+  });
+
+  group('getUser', () {
+    test('returns user by login', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/users',
+        (server) => server.reply(200, twitchUserResponse),
+        queryParameters: {'login': 'testuser'},
+      );
+
+      final user = await api.getUser(userLogin: 'testuser');
+
+      expect(user.id, '12345');
+      expect(user.login, 'testuser');
+      expect(user.displayName, 'TestUser');
+      expect(user.profileImageUrl, 'https://cdn/profile.png');
+    });
+
+    test('returns user by id', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/users',
+        (server) => server.reply(200, twitchUserResponse),
+        queryParameters: {'id': '12345'},
+      );
+
+      final user = await api.getUser(id: '12345');
+
+      expect(user.id, '12345');
+    });
+
+    test('throws NotFoundException for unknown user', () {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/users',
+        (server) => server.reply(200, {
+          'data': <dynamic>[],
+        }),
+        queryParameters: {'login': 'doesnotexist'},
+      );
+
+      expect(
+        () => api.getUser(userLogin: 'doesnotexist'),
+        throwsA(isA<NotFoundException>()),
+      );
+    });
+  });
+
+  group('getStream', () {
+    test('returns stream for online user', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/streams',
+        (server) => server.reply(200, twitchStreamResponse),
+        queryParameters: {'user_login': 'testuser'},
+      );
+
+      final stream = await api.getStream(userLogin: 'testuser');
+
+      expect(stream.userName, 'TestUser');
+      expect(stream.gameName, 'Just Chatting');
+      expect(stream.viewerCount, 1000);
+    });
+
+    test('throws ApiException for offline user', () {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/streams',
+        (server) => server.reply(200, {
+          'data': <dynamic>[],
+          'pagination': <String, String>{},
+        }),
+        queryParameters: {'user_login': 'offlineuser'},
+      );
+
+      expect(
+        () => api.getStream(userLogin: 'offlineuser'),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            contains('offlineuser'),
+          ),
+        ),
+      );
+    });
+  });
+
+  group('getStreamsByIds', () {
+    test('builds query string for multiple user IDs', () async {
+      // getStreamsByIds manually builds URL: /streams?user_id=1&user_id=2&first=100
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/streams?user_id=111&user_id=222&first=100',
+        (server) => server.reply(200, {
+          'data': [
+            {
+              'user_id': '111',
+              'user_login': 'user1',
+              'user_name': 'User1',
+              'game_id': '1',
+              'game_name': 'Game',
+              'title': 'Stream 1',
+              'viewer_count': 100,
+              'started_at': '2024-01-01T00:00:00Z',
+              'thumbnail_url': 'https://cdn/1.jpg',
+            },
+            {
+              'user_id': '222',
+              'user_login': 'user2',
+              'user_name': 'User2',
+              'game_id': '2',
+              'game_name': 'Game 2',
+              'title': 'Stream 2',
+              'viewer_count': 200,
+              'started_at': '2024-01-01T00:00:00Z',
+              'thumbnail_url': 'https://cdn/2.jpg',
+            },
+          ],
+          'pagination': <String, String>{},
+        }),
+      );
+
+      final result = await api.getStreamsByIds(
+        userIds: ['111', '222'],
+      );
+
+      expect(result.data, hasLength(2));
+      expect(result.data[0].userName, 'User1');
+      expect(result.data[1].userName, 'User2');
+    });
+  });
+
+  group('validateToken', () {
+    test('returns scopes and user id for valid token', () async {
+      dioAdapter.onGet(
+        'https://id.twitch.tv/oauth2/validate',
+        (server) => server.reply(200, twitchValidateTokenResponse),
+      );
+
+      final info = await api.validateToken(token: 'valid_token');
+
+      expect(info?.scopes, ['chat:read', 'chat:edit']);
+      expect(info?.userId, '12345');
+    });
+
+    test('returns null for expired token (401)', () async {
+      dioAdapter.onGet(
+        'https://id.twitch.tv/oauth2/validate',
+        (server) => server.reply(401, {'message': 'invalid access token'}),
+      );
+
+      final info = await api.validateToken(token: 'expired_token');
+
+      expect(info, isNull);
+    });
+
+    test('rethrows on server error', () {
+      dioAdapter.onGet(
+        'https://id.twitch.tv/oauth2/validate',
+        (server) => server.reply(500, null),
+      );
+
+      expect(
+        () => api.validateToken(token: 'some_token'),
+        throwsA(isA<ServerException>()),
+      );
+    });
+  });
+
+  group('getUserBlockedList', () {
+    test('returns blocked users from single page', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/users/blocks',
+        (server) => server.reply(200, {
+          'data': [
+            {
+              'user_id': '99999',
+              'user_login': 'blockeduser',
+              'display_name': 'BlockedUser',
+            },
+          ],
+          'pagination': {'cursor': null},
+        }),
+        queryParameters: {'first': '100', 'broadcaster_id': '12345'},
+      );
+
+      final blocked = await api.getUserBlockedList(id: '12345');
+
+      expect(blocked, hasLength(1));
+      expect(blocked.first.userId, '99999');
+      expect(blocked.first.userLogin, 'blockeduser');
+    });
+
+    test('returns empty list when no users blocked', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/users/blocks',
+        (server) => server.reply(200, {
+          'data': <dynamic>[],
+          'pagination': {'cursor': null},
+        }),
+        queryParameters: {'first': '100', 'broadcaster_id': '12345'},
+      );
+
+      final blocked = await api.getUserBlockedList(id: '12345');
+
+      expect(blocked, isEmpty);
+    });
+  });
+
+  group('getModeratedChannels', () {
+    test('returns broadcaster IDs from a single page', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/moderation/channels',
+        (server) => server.reply(200, {
+          'data': [
+            {'broadcaster_id': '111', 'broadcaster_login': 'a'},
+            {'broadcaster_id': '222', 'broadcaster_login': 'b'},
+          ],
+          'pagination': {'cursor': null},
+        }),
+        queryParameters: {'user_id': '12345', 'first': '100'},
+      );
+
+      final channels = await api.getModeratedChannels(id: '12345');
+
+      expect(channels, ['111', '222']);
+    });
+
+    test('follows the pagination cursor across pages', () async {
+      dioAdapter
+        ..onGet(
+          'https://api.twitch.tv/helix/moderation/channels',
+          (server) => server.reply(200, {
+            'data': [
+              {'broadcaster_id': '111'},
+            ],
+            'pagination': {'cursor': 'page2'},
+          }),
+          queryParameters: {'user_id': '12345', 'first': '100'},
+        )
+        ..onGet(
+          'https://api.twitch.tv/helix/moderation/channels',
+          (server) => server.reply(200, {
+            'data': [
+              {'broadcaster_id': '222'},
+            ],
+            'pagination': {'cursor': null},
+          }),
+          queryParameters: {
+            'user_id': '12345',
+            'first': '100',
+            'after': 'page2',
+          },
+        );
+
+      final channels = await api.getModeratedChannels(id: '12345');
+
+      expect(channels, ['111', '222']);
+    });
+
+    test('returns an empty list when the scope is missing', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/moderation/channels',
+        (server) => server.reply(401, {'message': 'Missing scope'}),
+        queryParameters: {'user_id': '12345', 'first': '100'},
+      );
+
+      final channels = await api.getModeratedChannels(id: '12345');
+
+      expect(channels, isEmpty);
+    });
+  });
+
+  group('getTopStreams', () {
+    test('returns streams with pagination', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/streams',
+        (server) => server.reply(200, twitchStreamResponse),
+      );
+
+      final streams = await api.getTopStreams();
+
+      expect(streams.data, hasLength(1));
+      expect(streams.data.first.userName, 'TestUser');
+      expect(streams.pagination['cursor'], 'next_cursor');
+    });
+
+    test('passes cursor for pagination', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/streams',
+        (server) => server.reply(200, {
+          'data': <dynamic>[],
+          'pagination': <String, String>{},
+        }),
+        queryParameters: {'after': 'page2_cursor'},
+      );
+
+      final streams = await api.getTopStreams(cursor: 'page2_cursor');
+
+      expect(streams.data, isEmpty);
+    });
+  });
+
+  group('getChannel', () {
+    test('returns channel info', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/channels',
+        (server) => server.reply(200, twitchChannelResponse),
+        queryParameters: {'broadcaster_id': '12345'},
+      );
+
+      final channel = await api.getChannel(userId: '12345');
+
+      expect(channel.broadcasterId, '12345');
+      expect(channel.broadcasterName, 'TestUser');
+      expect(channel.title, 'Test Stream');
+      expect(channel.gameName, 'Just Chatting');
+    });
+
+    test('throws ApiException for nonexistent channel', () {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/channels',
+        (server) => server.reply(200, {
+          'data': <dynamic>[],
+        }),
+        queryParameters: {'broadcaster_id': '99999'},
+      );
+
+      expect(
+        () => api.getChannel(userId: '99999'),
+        throwsA(isA<ApiException>()),
+      );
+    });
+  });
+
+  group('getEmotesChannel', () {
+    test('maps emote types correctly', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/chat/emotes',
+        (server) => server.reply(200, {
+          'data': [
+            {
+              'id': '1',
+              'name': 'BitsEmote',
+              'emote_type': 'bitstier',
+              'owner_id': null,
+            },
+            {
+              'id': '2',
+              'name': 'FollowerEmote',
+              'emote_type': 'follower',
+              'owner_id': null,
+            },
+            {
+              'id': '3',
+              'name': 'SubEmote',
+              'emote_type': 'subscriptions',
+              'owner_id': '12345',
+            },
+          ],
+        }),
+        queryParameters: {'broadcaster_id': '12345'},
+      );
+
+      final emotes = await api.getEmotesChannel(id: '12345');
+
+      expect(emotes, hasLength(3));
+      expect(emotes[0].type, EmoteType.twitchBits);
+      expect(emotes[1].type, EmoteType.twitchFollower);
+      expect(emotes[2].type, EmoteType.twitchChannel);
+    });
+  });
+
+  group('banUser', () {
+    test('returns true on success', () async {
+      dioAdapter.onPost(
+        'https://api.twitch.tv/helix/moderation/bans',
+        (server) => server.reply(200, {
+          'data': [
+            {'user_id': '3'},
+          ],
+        }),
+        data: {
+          'data': {'user_id': '3'},
+        },
+        queryParameters: {'broadcaster_id': '1', 'moderator_id': '2'},
+      );
+
+      final result = await api.banUser(
+        broadcasterId: '1',
+        moderatorId: '2',
+        userIdToBan: '3',
+      );
+
+      expect(result, isTrue);
+    });
+
+    test('propagates the Twitch message when the target cannot be banned '
+        '(e.g. another moderator)', () async {
+      dioAdapter.onPost(
+        'https://api.twitch.tv/helix/moderation/bans',
+        (server) => server.reply(400, {
+          'message': 'The user specified in the user_id field is a moderator.',
+        }),
+        data: {
+          'data': {'user_id': '3'},
+        },
+        queryParameters: {'broadcaster_id': '1', 'moderator_id': '2'},
+      );
+
+      expect(
+        () => api.banUser(
+          broadcasterId: '1',
+          moderatorId: '2',
+          userIdToBan: '3',
+        ),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            'The user specified in the user_id field is a moderator.',
+          ),
+        ),
+      );
+    });
+  });
+
+  group('deleteChatMessage', () {
+    test('propagates the Twitch message when the message cannot be deleted '
+        "(e.g. another moderator's or the broadcaster's)", () async {
+      dioAdapter.onDelete(
+        'https://api.twitch.tv/helix/moderation/chat',
+        (server) => server.reply(400, {
+          'message': "You cannot delete the broadcaster's messages.",
+        }),
+        queryParameters: {
+          'broadcaster_id': '1',
+          'moderator_id': '2',
+          'message_id': 'm',
+        },
+      );
+
+      expect(
+        () => api.deleteChatMessage(
+          broadcasterId: '1',
+          moderatorId: '2',
+          messageId: 'm',
+        ),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            "You cannot delete the broadcaster's messages.",
+          ),
+        ),
+      );
+    });
+  });
+
+  group('unbanUser', () {
+    test('returns true on success (removes a ban or timeout)', () async {
+      dioAdapter.onDelete(
+        'https://api.twitch.tv/helix/moderation/bans',
+        (server) => server.reply(204, null),
+        queryParameters: {
+          'broadcaster_id': '1',
+          'moderator_id': '2',
+          'user_id': '3',
+        },
+      );
+
+      final result = await api.unbanUser(
+        broadcasterId: '1',
+        moderatorId: '2',
+        userId: '3',
+      );
+
+      expect(result, isTrue);
+    });
+
+    test('propagates the Twitch message when the user is not banned', () async {
+      dioAdapter.onDelete(
+        'https://api.twitch.tv/helix/moderation/bans',
+        (server) => server.reply(400, {
+          'message': 'The user in the user_id query parameter is not banned.',
+        }),
+        queryParameters: {
+          'broadcaster_id': '1',
+          'moderator_id': '2',
+          'user_id': '3',
+        },
+      );
+
+      expect(
+        () => api.unbanUser(broadcasterId: '1', moderatorId: '2', userId: '3'),
+        throwsA(
+          isA<ApiException>().having(
+            (e) => e.message,
+            'message',
+            'The user in the user_id query parameter is not banned.',
+          ),
+        ),
+      );
+    });
+  });
+
+  group('isFollowingChannel', () {
+    test('returns true when Helix lists the broadcaster', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/channels/followed',
+        (server) => server.reply(200, {
+          'total': 1,
+          'data': [
+            {
+              'broadcaster_id': '999',
+              'broadcaster_login': 'streamer',
+              'broadcaster_name': 'Streamer',
+              'followed_at': '2024-01-01T00:00:00Z',
+            },
+          ],
+          'pagination': <String, dynamic>{},
+        }),
+        queryParameters: {
+          'user_id': '12345',
+          'broadcaster_id': '999',
+          'first': '1',
+        },
+      );
+
+      expect(
+        await api.isFollowingChannel(userId: '12345', broadcasterId: '999'),
+        isTrue,
+      );
+    });
+
+    test('returns false when not following', () async {
+      dioAdapter.onGet(
+        'https://api.twitch.tv/helix/channels/followed',
+        (server) => server.reply(200, {
+          'total': 0,
+          'data': <dynamic>[],
+          'pagination': <String, dynamic>{},
+        }),
+        queryParameters: {
+          'user_id': '12345',
+          'broadcaster_id': '999',
+          'first': '1',
+        },
+      );
+
+      expect(
+        await api.isFollowingChannel(userId: '12345', broadcasterId: '999'),
+        isFalse,
+      );
+    });
+  });
+}
diff --git a/test/apis/twitch_auth_interceptor_test.dart b/test/apis/twitch_auth_interceptor_test.dart
new file mode 100644
index 00000000..fa4316a0
--- /dev/null
+++ b/test/apis/twitch_auth_interceptor_test.dart
@@ -0,0 +1,95 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/twitch_auth_interceptor.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockAuthStore extends Mock implements AuthStore {}
+
+void main() {
+  late MockAuthStore mockAuthStore;
+  late TwitchAuthInterceptor interceptor;
+
+  setUp(() {
+    mockAuthStore = MockAuthStore();
+    interceptor = TwitchAuthInterceptor(mockAuthStore);
+
+    when(() => mockAuthStore.headersTwitch).thenReturn({
+      'Authorization': 'Bearer test_token',
+      'Client-Id': 'test_client_id',
+    });
+  });
+
+  group('TwitchAuthInterceptor', () {
+    test('adds headers for Twitch Helix API requests', () {
+      final options = RequestOptions(
+        path: 'https://api.twitch.tv/helix/users',
+      );
+
+      final handler = RequestInterceptorHandler();
+
+      // We test by calling onRequest and checking that headers were added
+      interceptor.onRequest(options, handler);
+
+      expect(options.headers['Authorization'], 'Bearer test_token');
+      expect(options.headers['Client-Id'], 'test_client_id');
+    });
+
+    test('adds headers for Twitch OAuth requests', () {
+      final options = RequestOptions(
+        path: 'https://id.twitch.tv/oauth2/validate',
+      );
+
+      final handler = RequestInterceptorHandler();
+      interceptor.onRequest(options, handler);
+
+      expect(options.headers['Authorization'], 'Bearer test_token');
+      expect(options.headers['Client-Id'], 'test_client_id');
+    });
+
+    test('does not add headers for BTTV API requests', () {
+      final options = RequestOptions(
+        path: 'https://api.betterttv.net/3/cached/emotes/global',
+      );
+
+      final handler = RequestInterceptorHandler();
+      interceptor.onRequest(options, handler);
+
+      expect(options.headers.containsKey('Authorization'), isFalse);
+      expect(options.headers.containsKey('Client-Id'), isFalse);
+    });
+
+    test('does not add headers for FFZ API requests', () {
+      final options = RequestOptions(
+        path: 'https://api.frankerfacez.com/v1/set/global',
+      );
+
+      final handler = RequestInterceptorHandler();
+      interceptor.onRequest(options, handler);
+
+      expect(options.headers.containsKey('Authorization'), isFalse);
+    });
+
+    test('does not add headers for 7TV API requests', () {
+      final options = RequestOptions(
+        path: 'https://7tv.io/v3/emote-sets/global',
+      );
+
+      final handler = RequestInterceptorHandler();
+      interceptor.onRequest(options, handler);
+
+      expect(options.headers.containsKey('Authorization'), isFalse);
+    });
+
+    test('does not add headers for other URLs', () {
+      final options = RequestOptions(
+        path: 'https://example.com/api/data',
+      );
+
+      final handler = RequestInterceptorHandler();
+      interceptor.onRequest(options, handler);
+
+      expect(options.headers.containsKey('Authorization'), isFalse);
+    });
+  });
+}
diff --git a/test/apis/twitch_gql_follow_test.dart b/test/apis/twitch_gql_follow_test.dart
new file mode 100644
index 00000000..00efa120
--- /dev/null
+++ b/test/apis/twitch_gql_follow_test.dart
@@ -0,0 +1,102 @@
+import 'dart:convert';
+
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:http_mock_adapter/http_mock_adapter.dart';
+
+void main() {
+  late Dio dio;
+  late DioAdapter dioAdapter;
+  late TwitchGqlApi api;
+
+  setUp(() {
+    dio = Dio(BaseOptions());
+    dioAdapter = DioAdapter(dio: dio);
+    api = TwitchGqlApi(dio);
+  });
+
+  group('followUser', () {
+    test('posts FollowButton_FollowUser persisted mutation', () async {
+      dioAdapter.onPost(
+        'https://gql.twitch.tv/gql',
+        (server) => server.reply(200, {
+          'data': {
+            'followUser': {
+              'follow': {
+                'user': {'id': '999', 'displayName': 'Streamer'},
+              },
+            },
+          },
+        }),
+        data: Matchers.any,
+      );
+
+      await api.followUser(targetId: '999', authToken: 'web-token');
+    });
+
+    test('throws IntegrityCheckException on integrity errors', () async {
+      dioAdapter.onPost(
+        'https://gql.twitch.tv/gql',
+        (server) => server.reply(200, {
+          'errors': [
+            {'message': 'failed integrity check'},
+          ],
+        }),
+        data: Matchers.any,
+      );
+
+      await expectLater(
+        api.followUser(targetId: '999', authToken: 'web-token'),
+        throwsA(isA<IntegrityCheckException>()),
+      );
+    });
+  });
+
+  group('unfollowUser', () {
+    test('posts FollowButton_UnfollowUser persisted mutation', () async {
+      dioAdapter.onPost(
+        'https://gql.twitch.tv/gql',
+        (server) => server.reply(200, {
+          'data': {
+            'unfollowUser': {
+              'follow': null,
+            },
+          },
+        }),
+        data: Matchers.any,
+      );
+
+      await api.unfollowUser(targetId: '999', authToken: 'web-token');
+    });
+  });
+
+  group('fetchIntegrityToken', () {
+    test('rejects bad_bot tokens', () async {
+      final payload = base64Url.encode(
+        utf8.encode(
+          jsonEncode({
+            'is_bad_bot': 'true',
+            'device_id': 'dev',
+            'client_id': 'kimne78kx3ncx6brgo4mv6wki5h1ko',
+          }),
+        ),
+      );
+
+      dioAdapter.onPost(
+        'https://gql.twitch.tv/integrity',
+        (server) => server.reply(200, {
+          'token': 'v4.public.$payload.sig',
+          'expiration': DateTime.now().millisecondsSinceEpoch + 600000,
+        }),
+        data: Matchers.any,
+      );
+
+      await expectLater(
+        api.fetchIntegrityToken(authToken: 'web', deviceId: 'dev'),
+        throwsA(isA<IntegrityCheckException>()),
+      );
+    });
+  });
+}
diff --git a/test/apis/twitch_gql_streams_test.dart b/test/apis/twitch_gql_streams_test.dart
new file mode 100644
index 00000000..00888e9f
--- /dev/null
+++ b/test/apis/twitch_gql_streams_test.dart
@@ -0,0 +1,129 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:http_mock_adapter/http_mock_adapter.dart';
+
+void main() {
+  late Dio dio;
+  late DioAdapter dioAdapter;
+  late TwitchGqlApi api;
+
+  setUp(() {
+    dio = Dio(BaseOptions());
+    dioAdapter = DioAdapter(dio: dio);
+    api = TwitchGqlApi(dio);
+  });
+
+  Map<String, Object?> streamEdge({
+    required String id,
+    required String login,
+    required int viewers,
+    String? cursor,
+  }) {
+    return {
+      'cursor': cursor ?? 'cursor-$id',
+      'node': {
+        'id': id,
+        'title': '$login live',
+        'viewersCount': viewers,
+        'createdAt': '2026-01-01T00:00:00Z',
+        'language': 'en',
+        'game': {'id': '1', 'name': 'Game'},
+        'broadcaster': {
+          'id': id,
+          'login': login,
+          'displayName': login,
+        },
+      },
+    };
+  }
+
+  group('getStreams', () {
+    test('parses freeform tag page and cursor', () async {
+      dioAdapter.onPost(
+        'https://gql.twitch.tv/gql',
+        (server) => server.reply(200, {
+          'data': {
+            'streams': {
+              'edges': [
+                streamEdge(id: '1', login: 'a', viewers: 10),
+                streamEdge(id: '2', login: 'b', viewers: 5),
+              ],
+              'pageInfo': {'hasNextPage': true},
+            },
+          },
+        }),
+        data: Matchers.any,
+      );
+
+      final page = await api.getStreams(
+        freeformTags: ['Deutsch'],
+        sort: StreamViewerSort.viewersAsc,
+      );
+
+      expect(page.data.map((s) => s.userLogin), ['a', 'b']);
+      expect(page.data.map((s) => s.viewerCount), [10, 5]);
+      expect(page.pagination['cursor'], 'cursor-2');
+    });
+
+    test('throws IntegrityCheckException on integrity errors', () async {
+      dioAdapter.onPost(
+        'https://gql.twitch.tv/gql',
+        (server) => server.reply(200, {
+          'errors': [
+            {'message': 'failed integrity check'},
+          ],
+          'data': {'streams': null},
+        }),
+        data: Matchers.any,
+      );
+
+      await expectLater(
+        api.getStreams(
+          freeformTags: ['Deutsch'],
+          cursor: 'page-2',
+          authToken: 'web',
+          integrityToken: 'stale',
+          deviceId: 'device',
+        ),
+        throwsA(isA<IntegrityCheckException>()),
+      );
+    });
+
+    test('sends Client-Integrity and X-Device-Id when provided', () async {
+      dioAdapter.onPost(
+        'https://gql.twitch.tv/gql',
+        (server) => server.reply(200, {
+          'data': {
+            'streams': {
+              'edges': [streamEdge(id: '1', login: 'a', viewers: 1)],
+              'pageInfo': {'hasNextPage': false},
+            },
+          },
+        }),
+        data: Matchers.any,
+        headers: {
+          'Client-ID': Matchers.any,
+          'Content-Type': Matchers.any,
+          'User-Agent': Matchers.any,
+          'Authorization': 'OAuth web-token',
+          'X-Device-Id': 'dev-123',
+          'Client-Integrity': 'integrity-token',
+        },
+      );
+
+      final page = await api.getStreams(
+        freeformTags: ['English'],
+        sort: StreamViewerSort.viewersDesc,
+        cursor: 'after-1',
+        authToken: 'web-token',
+        integrityToken: 'integrity-token',
+        deviceId: 'dev-123',
+      );
+
+      expect(page.data, hasLength(1));
+      expect(page.pagination, isEmpty);
+    });
+  });
+}
diff --git a/test/apis/twitch_integrity_test.dart b/test/apis/twitch_integrity_test.dart
new file mode 100644
index 00000000..a07ec031
--- /dev/null
+++ b/test/apis/twitch_integrity_test.dart
@@ -0,0 +1,42 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/twitch_integrity.dart';
+
+String _tokenFor(Map<String, Object?> payload) {
+  final encoded = base64Url.encode(utf8.encode(jsonEncode(payload)));
+  return 'v4.public.$encoded.fakesig';
+}
+
+void main() {
+  group('TwitchIntegrity', () {
+    test('detects is_bad_bot string flag', () {
+      final token = _tokenFor({
+        'client_id': 'kimne78kx3ncx6brgo4mv6wki5h1ko',
+        'device_id': 'abc123',
+        'is_bad_bot': 'true',
+        'exp': '2099-01-01T00:00:00Z',
+      });
+
+      expect(TwitchIntegrity.isBadBot(token), isTrue);
+      expect(TwitchIntegrity.deviceId(token), 'abc123');
+      expect(TwitchIntegrity.expirationMs(token), isNotNull);
+    });
+
+    test('detects is_bad_bot bool flag', () {
+      final token = _tokenFor({
+        'is_bad_bot': true,
+        'device_id': 'dev',
+      });
+      expect(TwitchIntegrity.isBadBot(token), isTrue);
+    });
+
+    test('returns false when not flagged', () {
+      final token = _tokenFor({
+        'is_bad_bot': 'false',
+        'device_id': 'dev',
+      });
+      expect(TwitchIntegrity.isBadBot(token), isFalse);
+    });
+  });
+}
diff --git a/test/apis/unauthorized_interceptor_paths_test.dart b/test/apis/unauthorized_interceptor_paths_test.dart
new file mode 100644
index 00000000..a4855c54
--- /dev/null
+++ b/test/apis/unauthorized_interceptor_paths_test.dart
@@ -0,0 +1,20 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/unauthorized_interceptor.dart';
+
+void main() {
+  group('moderation path helpers', () {
+    test('matches helix moderation paths', () {
+      expect(
+        isTwitchModeratedChannelsPath('/helix/moderation/channels'),
+        isTrue,
+      );
+      expect(isTwitchModeratorActionPath('/helix/moderation/chat'), isTrue);
+      expect(isTwitchModeratorActionPath('/helix/moderation/bans'), isTrue);
+      expect(
+        isTwitchModeratorActionPath('/helix/moderation/channels'),
+        isFalse,
+      );
+      expect(isTwitchModeratedChannelsPath('/helix/users'), isFalse);
+    });
+  });
+}
diff --git a/test/emote_test.dart b/test/emote_test.dart
deleted file mode 100644
index 7a16789c..00000000
--- a/test/emote_test.dart
+++ /dev/null
@@ -1,350 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter_test/flutter_test.dart';
-import 'package:frosty/models/emotes.dart';
-
-void main() {
-  group('Twitch', () {
-    test('emote should parse correctly', () {
-      const sampleJson = '''
-        {
-          "id": "304456832",
-          "name": "twitchdevPitchfork",
-          "images": {
-            "url_1x": "https://static-cdn.jtvnw.net/emoticons/v2/304456832/static/light/1.0",
-            "url_2x": "https://static-cdn.jtvnw.net/emoticons/v2/304456832/static/light/2.0",
-            "url_4x": "https://static-cdn.jtvnw.net/emoticons/v2/304456832/static/light/3.0"
-          },
-          "tier": "1000",
-          "emote_type": "subscriptions",
-          "emote_set_id": "301590448",
-          "format": [
-            "static"
-          ],
-          "scale": [
-            "1.0",
-            "2.0",
-            "3.0"
-          ],
-          "theme_mode": [
-            "light",
-            "dark"
-          ]
-        }
-      ''';
-
-      final decoded = jsonDecode(sampleJson);
-      final emote = EmoteTwitch.fromJson(decoded);
-
-      expect(emote.id, '304456832');
-      expect(emote.name, 'twitchdevPitchfork');
-      expect(emote.emoteType, 'subscriptions');
-    });
-  });
-
-  group('BTTV', () {
-    test('emote should parse correctly', () {
-      const emoteTrollFace = '''
-        {
-          "id":"54fa8f1401e468494b85b537",
-          "code":":tf:",
-          "imageType":"png",
-          "userId":"5561169bd6b9d206222a8c19"
-        }
-      ''';
-
-      final json = jsonDecode(emoteTrollFace);
-      final emote = EmoteBTTV.fromJson(json);
-
-      expect(emote.id, '54fa8f1401e468494b85b537');
-      expect(emote.code, ':tf:');
-    });
-
-    test('shared emote should parse correctly', () {
-      const emoteEZ = '''
-        {
-          "id": "5590b223b344e2c42a9e28e3",
-          "code": "EZ",
-          "imageType": "png",
-          "user": {
-            "id": "558f7862b344e2c42a9e2822",
-            "name": "helloboat",
-            "displayName": "helloboat",
-            "providerId": "39819556"
-          }
-        }
-      ''';
-
-      final decoded = jsonDecode(emoteEZ);
-      final emote = EmoteBTTV.fromJson(decoded);
-
-      expect(emote.id, '5590b223b344e2c42a9e28e3');
-      expect(emote.code, 'EZ');
-    });
-
-    test('global emotes should parse correctly', () {
-      const sampleJson = '''
-        [
-          {"id":"54fa903b01e468494b85b53f","code":"DatSauce","imageType":"png","userId":"5561169bd6b9d206222a8c19"},
-          {"id":"54fa909b01e468494b85b542","code":"ForeverAlone","imageType":"png","userId":"5561169bd6b9d206222a8c19"},
-          {"id":"54fa90ba01e468494b85b543","code":"GabeN","imageType":"png","userId":"5561169bd6b9d206222a8c19"},
-          {"id":"54fa90f201e468494b85b545","code":"HailHelix","imageType":"png","userId":"5561169bd6b9d206222a8c19"}
-        ]
-      ''';
-
-      final decoded = jsonDecode(sampleJson) as List;
-      final List<EmoteBTTV> emotes =
-          decoded.map((emote) => EmoteBTTV.fromJson(emote)).toList();
-      expect(emotes.length, 4);
-
-      final emoteIds = [
-        '54fa903b01e468494b85b53f',
-        '54fa909b01e468494b85b542',
-        '54fa90ba01e468494b85b543',
-        '54fa90f201e468494b85b545'
-      ];
-      final emoteCodes = ['DatSauce', 'ForeverAlone', 'GabeN', 'HailHelix'];
-
-      emotes.asMap().forEach((index, emote) {
-        expect(emote.id, emoteIds[index]);
-        expect(emote.code, emoteCodes[index]);
-      });
-    });
-
-    test('channel emotes should parse correctly', () {
-      const sampleJson = '''
-        {"id":"5509bd19a607044d1a3dd1bb",
-          "bots":[
-            "emotestats",
-            "hnlbot"
-          ],
-          "channelEmotes":[
-            {
-              "id":"5509bd3ba607044d1a3dd1bc",
-              "code":"sodaTP",
-              "imageType":"png",
-              "userId":"5509bd19a607044d1a3dd1bb"
-            }
-          ],
-          "sharedEmotes":[
-            {
-              "id": "5ed3bde8f54be95e2a838279",
-              "code": "pugPls",
-              "imageType": "gif",
-              "user": {
-                "id": "5c5510a1c0a5642a696190d9",
-                "name": "wolfabelle",
-                "displayName": "Wolfabelle",
-                "providerId": "190146087"
-              }
-            }
-          ]
-        }
-      ''';
-
-      final decoded = jsonDecode(sampleJson);
-
-      final channelEmote = EmoteBTTV.fromJson(decoded['channelEmotes'].first);
-
-      expect(channelEmote.id, '5509bd3ba607044d1a3dd1bc');
-      expect(channelEmote.code, 'sodaTP');
-
-      final sharedEmote = EmoteBTTV.fromJson(decoded['sharedEmotes'].first);
-
-      expect(sharedEmote.id, '5ed3bde8f54be95e2a838279');
-      expect(sharedEmote.code, 'pugPls');
-    });
-  });
-
-  group('FFZ', () {
-    test('emote should parse correctly', () {
-      const sampleJson = '''
-        {
-          "id": 27081,
-          "name": "ZreknarF",
-          "height": 30,
-          "width": 40,
-          "public": false,
-          "hidden": false,
-          "modifier": false,
-          "offset": null,
-          "margins": null,
-          "css": null,
-          "owner": {
-            "_id": 1,
-            "name": "sirstendec",
-            "display_name": "SirStendec"
-          },
-          "urls": {
-            "1": "//cdn.frankerfacez.com/emote/27081/1",
-            "2": "//cdn.frankerfacez.com/emote/27081/2",
-            "4": "//cdn.frankerfacez.com/emote/27081/4"
-          },
-          "status": 1,
-          "usage_count": 1,
-          "created_at": "2015-06-01T05:52:57.770Z",
-          "last_updated": "2015-06-01T05:53:03.744Z"
-        }
-      ''';
-
-      final json = jsonDecode(sampleJson);
-      final emote = EmoteFFZ.fromJson(json);
-
-      expect(emote.height, 30);
-      expect(emote.width, 40);
-      expect(emote.name, 'ZreknarF');
-      expect(emote.urls.url1x, '//cdn.frankerfacez.com/emote/27081/1');
-      expect(emote.urls.url2x, '//cdn.frankerfacez.com/emote/27081/2');
-      expect(emote.urls.url4x, '//cdn.frankerfacez.com/emote/27081/4');
-    });
-  });
-
-  group('7TV', () {
-    test('global emote should parse correctly', () {
-      const sampleGlobal7TVEmote = '''
-        {
-          "id": "603ca884faf3a00014dff0ab",
-          "name": "gachiBASS",
-          "owner": null,
-          "visibility": 2,
-          "visibility_simple": [
-            "GLOBAL"
-          ],
-          "mime": "image/gif",
-          "status": 3,
-          "tags": [
-            
-          ],
-          "width": [
-            32,
-            48,
-            76,
-            128
-          ],
-          "height": [
-            32,
-            48,
-            76,
-            128
-          ],
-          "urls": [
-            [
-              "1",
-              "https://cdn.7tv.app/emote/603ca884faf3a00014dff0ab/1x"
-            ],
-            [
-              "2",
-              "https://cdn.7tv.app/emote/603ca884faf3a00014dff0ab/2x"
-            ],
-            [
-              "3",
-              "https://cdn.7tv.app/emote/603ca884faf3a00014dff0ab/3x"
-            ],
-            [
-              "4",
-              "https://cdn.7tv.app/emote/603ca884faf3a00014dff0ab/4x"
-            ]
-          ]
-        }
-      ''';
-
-      final json = jsonDecode(sampleGlobal7TVEmote);
-      final emote = Emote7TV.fromJson(json);
-
-      expect(emote.name, 'gachiBASS');
-      expect(emote.visibilitySimple, ['GLOBAL']);
-      expect(emote.width, [32, 48, 76, 128]);
-      expect(emote.height, [32, 48, 76, 128]);
-
-      final urls = [
-        ['1', 'https://cdn.7tv.app/emote/603ca884faf3a00014dff0ab/1x'],
-        ['2', 'https://cdn.7tv.app/emote/603ca884faf3a00014dff0ab/2x'],
-        ['3', 'https://cdn.7tv.app/emote/603ca884faf3a00014dff0ab/3x'],
-        ['4', 'https://cdn.7tv.app/emote/603ca884faf3a00014dff0ab/4x'],
-      ];
-
-      expect(emote.urls, urls);
-    });
-
-    test('channel emote should parse correctly', () {
-      const sampleEmote = '''
-        {
-          "id": "603caea243b9e100141caf4f",
-          "name": "TrollDespair",
-          "owner": {
-            "id": "603cae2496832ffa78c758cd",
-            "twitch_id": "",
-            "login": "swyfty_",
-            "display_name": "swyfty_",
-            "role": {
-              "id": "000000000000000000000000",
-              "name": "",
-              "position": 0,
-              "color": 0,
-              "allowed": 523,
-              "denied": 0,
-              "default": true
-            }
-          },
-          "visibility": 0,
-          "visibility_simple": [
-            
-          ],
-          "mime": "image/png",
-          "status": 3,
-          "tags": [
-            
-          ],
-          "width": [
-            32,
-            48,
-            76,
-            128
-          ],
-          "height": [
-            32,
-            48,
-            76,
-            128
-          ],
-          "urls": [
-            [
-              "1",
-              "https://cdn.7tv.app/emote/603caea243b9e100141caf4f/1x"
-            ],
-            [
-              "2",
-              "https://cdn.7tv.app/emote/603caea243b9e100141caf4f/2x"
-            ],
-            [
-              "3",
-              "https://cdn.7tv.app/emote/603caea243b9e100141caf4f/3x"
-            ],
-            [
-              "4",
-              "https://cdn.7tv.app/emote/603caea243b9e100141caf4f/4x"
-            ]
-          ]
-        }
-      ''';
-
-      final json = jsonDecode(sampleEmote);
-      final emote = Emote7TV.fromJson(json);
-
-      expect(emote.name, 'TrollDespair');
-
-      expect(emote.visibilitySimple, []);
-      expect(emote.width, [32, 48, 76, 128]);
-      expect(emote.height, [32, 48, 76, 128]);
-
-      final urls = [
-        ['1', 'https://cdn.7tv.app/emote/603caea243b9e100141caf4f/1x'],
-        ['2', 'https://cdn.7tv.app/emote/603caea243b9e100141caf4f/2x'],
-        ['3', 'https://cdn.7tv.app/emote/603caea243b9e100141caf4f/3x'],
-        ['4', 'https://cdn.7tv.app/emote/603caea243b9e100141caf4f/4x'],
-      ];
-
-      expect(emote.urls, urls);
-    });
-  });
-}
diff --git a/test/fixtures/api_responses.dart b/test/fixtures/api_responses.dart
new file mode 100644
index 00000000..8aefa1e5
--- /dev/null
+++ b/test/fixtures/api_responses.dart
@@ -0,0 +1,350 @@
+/// Test fixtures containing sample API response data.
+/// Reused across model serialization and API service tests.
+library;
+
+// ── Twitch API Responses ──
+
+const twitchEmotesGlobalResponse = {
+  'data': [
+    {
+      'id': '25',
+      'name': 'Kappa',
+      'emote_type': 'bitstier',
+      'owner_id': null,
+    },
+    {
+      'id': '1902',
+      'name': 'Keepo',
+      'emote_type': 'globals',
+      'owner_id': null,
+    },
+  ],
+};
+
+const twitchBadgesGlobalResponse = {
+  'data': [
+    {
+      'set_id': 'subscriber',
+      'versions': [
+        {
+          'id': '0',
+          'image_url_1x': 'https://cdn/sub/1x.png',
+          'image_url_2x': 'https://cdn/sub/2x.png',
+          'image_url_4x': 'https://cdn/sub/4x.png',
+          'title': 'Subscriber',
+          'description': '0 months',
+        },
+      ],
+    },
+  ],
+};
+
+const twitchUserResponse = {
+  'data': [
+    {
+      'id': '12345',
+      'login': 'testuser',
+      'display_name': 'TestUser',
+      'profile_image_url': 'https://cdn/profile.png',
+    },
+  ],
+};
+
+const twitchStreamResponse = {
+  'data': [
+    {
+      'user_id': '12345',
+      'user_login': 'testuser',
+      'user_name': 'TestUser',
+      'game_id': '509658',
+      'game_name': 'Just Chatting',
+      'title': 'Test Stream',
+      'viewer_count': 1000,
+      'started_at': '2024-01-01T00:00:00Z',
+      'thumbnail_url': 'https://cdn/thumb.jpg',
+    },
+  ],
+  'pagination': {'cursor': 'next_cursor'},
+};
+
+const twitchCategoryResponse = {
+  'data': [
+    {
+      'box_art_url': 'https://cdn/boxart.jpg',
+      'id': '509658',
+      'name': 'Just Chatting',
+    },
+  ],
+  'pagination': {'cursor': 'cat_cursor'},
+};
+
+const twitchChannelResponse = {
+  'data': [
+    {
+      'broadcaster_id': '12345',
+      'broadcaster_login': 'testuser',
+      'broadcaster_name': 'TestUser',
+      'broadcaster_language': 'en',
+      'title': 'Test Stream',
+      'game_id': '509658',
+      'game_name': 'Just Chatting',
+    },
+  ],
+};
+
+const twitchChannelQueryResponse = {
+  'data': [
+    {
+      'broadcaster_login': 'testuser',
+      'display_name': 'TestUser',
+      'id': '12345',
+      'is_live': true,
+      'started_at': '2024-01-01T00:00:00Z',
+    },
+  ],
+};
+
+const twitchBlockedUsersResponse = {
+  'data': [
+    {
+      'user_id': '99999',
+      'user_login': 'blockeduser',
+      'display_name': 'BlockedUser',
+    },
+  ],
+  'pagination': {'cursor': null},
+};
+
+const twitchSharedChatSessionResponse = {
+  'data': [
+    {
+      'session_id': 'session_123',
+      'host_broadcaster_id': '12345',
+      'participants': [
+        {'broadcaster_id': '12345'},
+        {'broadcaster_id': '67890'},
+      ],
+      'created_at': '2024-01-01T00:00:00Z',
+      'updated_at': '2024-01-01T01:00:00Z',
+    },
+  ],
+};
+
+const twitchTokenResponse = {
+  'access_token': 'test_token_abc123',
+  'token_type': 'bearer',
+  'expires_in': 5000000,
+};
+
+const twitchValidateTokenResponse = {
+  'client_id': 'test_client_id',
+  'login': 'testuser',
+  'scopes': ['chat:read', 'chat:edit'],
+  'user_id': '12345',
+  'expires_in': 5000000,
+};
+
+// ── BTTV API Responses ──
+
+const bttvEmotesGlobalResponse = [
+  {'id': 'bttv1', 'code': 'SourPls'},
+  {'id': 'bttv2', 'code': 'catJAM'},
+];
+
+const bttvEmotesChannelResponse = {
+  'channelEmotes': [
+    {'id': 'ch1', 'code': 'ChannelEmote'},
+  ],
+  'sharedEmotes': [
+    {'id': 'sh1', 'code': 'SharedEmote'},
+    {'id': 'sh2', 'code': 'SharedEmote2'},
+  ],
+};
+
+const bttvBadgesResponse = [
+  {
+    'providerId': 'user123',
+    'badge': {
+      'description': 'BTTV Developer',
+      'svg': 'https://cdn.bttv.net/badge/dev.svg',
+    },
+  },
+  {
+    'providerId': 'user456',
+    'badge': {
+      'description': 'BTTV Supporter',
+      'svg': 'https://cdn.bttv.net/badge/supporter.svg',
+    },
+  },
+];
+
+// ── FFZ API Responses ──
+
+const ffzEmotesGlobalResponse = {
+  'default_sets': [1],
+  'sets': {
+    '1': {
+      'emoticons': [
+        {
+          'name': 'LULW',
+          'height': 28,
+          'width': 28,
+          'owner': {'display_name': 'FFZOwner', 'name': 'ffzowner'},
+          'urls': {
+            '1': 'https://cdn.ffz.net/1x.png',
+            '2': 'https://cdn.ffz.net/2x.png',
+            '4': 'https://cdn.ffz.net/4x.png',
+          },
+          'animated': null,
+        },
+      ],
+    },
+  },
+};
+
+const ffzRoomInfoResponse = {
+  'room': {
+    'set': 123,
+    'vip_badge': null,
+    'mod_urls': null,
+  },
+  'sets': {
+    '123': {
+      'emoticons': [
+        {
+          'name': 'ChannelFFZ',
+          'height': 32,
+          'width': 32,
+          'owner': {'display_name': 'Streamer', 'name': 'streamer'},
+          'urls': {
+            '1': 'https://cdn.ffz.net/ch/1x.png',
+            '2': 'https://cdn.ffz.net/ch/2x.png',
+            '4': 'https://cdn.ffz.net/ch/4x.png',
+          },
+          'animated': null,
+        },
+      ],
+    },
+  },
+};
+
+const ffzBadgesResponse = {
+  'badges': [
+    {
+      'id': 1,
+      'title': 'FFZ Developer',
+      'color': '#FF0000',
+      'urls': {
+        '1': 'https://cdn.ffz.net/badge/1x.png',
+        '2': 'https://cdn.ffz.net/badge/2x.png',
+        '4': 'https://cdn.ffz.net/badge/4x.png',
+      },
+    },
+    {
+      'id': 2,
+      'title': 'FFZ Supporter',
+      'color': '#00FF00',
+      'urls': {
+        '1': 'https://cdn.ffz.net/badge2/1x.png',
+        '2': 'https://cdn.ffz.net/badge2/2x.png',
+        '4': 'https://cdn.ffz.net/badge2/4x.png',
+      },
+    },
+  ],
+  'users': {
+    '1': [11111, 22222],
+    '2': [22222, 33333],
+  },
+};
+
+// ── 7TV API Responses ──
+
+const sevenTVEmotesGlobalResponse = {
+  'emotes': [
+    {
+      'id': '7tv1',
+      'name': 'EZ',
+      'data': {
+        'id': '7tv1',
+        'name': 'EZ',
+        'flags': 0,
+        'owner': {'username': 'creator', 'display_name': 'Creator'},
+        'host': {
+          'url': '//cdn.7tv.app/emote/7tv1',
+          'files': [
+            {'name': '1x.webp', 'width': 32, 'height': 32, 'format': 'WEBP'},
+            {'name': '2x.webp', 'width': 64, 'height': 64, 'format': 'WEBP'},
+            {'name': '3x.webp', 'width': 96, 'height': 96, 'format': 'WEBP'},
+            {
+              'name': '4x.webp',
+              'width': 128,
+              'height': 128,
+              'format': 'WEBP',
+            },
+          ],
+        },
+      },
+    },
+  ],
+};
+
+const sevenTVEmotesChannelResponse = {
+  'emote_set': {
+    'id': 'set_abc123',
+    'emotes': [
+      {
+        'id': '7tv_ch1',
+        'name': 'Clap',
+        'data': {
+          'id': '7tv_ch1',
+          'name': 'Clap',
+          'flags': 0,
+          'owner': null,
+          'host': {
+            'url': '//cdn.7tv.app/emote/7tv_ch1',
+            'files': [
+              {
+                'name': '1x.webp',
+                'width': 32,
+                'height': 32,
+                'format': 'WEBP',
+              },
+              {
+                'name': '4x.webp',
+                'width': 128,
+                'height': 128,
+                'format': 'WEBP',
+              },
+            ],
+          },
+        },
+      },
+    ],
+  },
+};
+
+// ── Chatters Response ──
+
+const chattersResponse = {
+  'chatter_count': 5,
+  'chatters': {
+    'broadcaster': ['streamer'],
+    'vips': ['vip1'],
+    'moderators': ['mod1'],
+    'staff': <String>[],
+    'admins': <String>[],
+    'global_mods': <String>[],
+    'viewers': ['viewer1', 'viewer2'],
+  },
+};
+
+// ── 7TV Events ──
+
+const sevenTVEventJson = {
+  'op': 0,
+  't': 1,
+  'd': {
+    'type': 'emote_set.update',
+    'condition': {'object_id': 'set_abc123'},
+  },
+};
diff --git a/test/fixtures/irc_messages.dart b/test/fixtures/irc_messages.dart
new file mode 100644
index 00000000..a5bcbfaa
--- /dev/null
+++ b/test/fixtures/irc_messages.dart
@@ -0,0 +1,197 @@
+/// Test fixtures containing real Twitch IRC message samples.
+/// These are used to test the IRC message parsing logic.
+library;
+
+/// A basic chat message (PRIVMSG) with standard tags
+const basicPrivmsg =
+    '@badge-info=;badges=;color=#FF0000;display-name=TestUser;emotes=;'
+    'id=abc123-def456;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=67890;user-type= '
+    ':testuser!testuser@testuser.tmi.twitch.tv PRIVMSG #channel :Hello World';
+
+/// Exercises the full IRCv3 tag escape set plus a value that itself contains
+/// '='. Uses a raw string so the backslashes are literal wire bytes.
+const messageWithEscapedTagChars =
+    r'@a-space=one\stwo;a-semi=left\:right;a-slash=a\\b;a-equals=k=v;'
+    r'a-double=x\\sy;display-name=EscapeAll;mod=0 '
+    r':escapeall!escapeall@escapeall.tmi.twitch.tv PRIVMSG #channel :hi';
+
+/// A message whose prefix is not the usual `nick!user@host` form (no '!').
+/// The parser should fall back to the login tag instead of throwing.
+const messageNoBangPrefix =
+    '@login=fallbackuser;mod=0;id=nobang-1 '
+    ':some.server.example PRIVMSG #channel :server style';
+
+/// A chat message with emotes in the tags
+/// Note: emote positions are 0-indexed byte positions in the message
+/// "Kappa LUL" - Kappa is at 0-4, LUL is at 6-8
+const privmsgWithEmotes =
+    '@badge-info=subscriber/12;badges=subscriber/12,premium/1;'
+    'color=#1E90FF;display-name=EmoteUser;'
+    'emotes=25:0-4/1902:6-8;id=msg-id-123;mod=0;room-id=12345;'
+    'subscriber=1;tmi-sent-ts=1234567890123;turbo=0;user-id=11111;user-type= '
+    ':emoteuser!emoteuser@emoteuser.tmi.twitch.tv PRIVMSG #channel :Kappa LUL';
+
+/// A chat message with multiple instances of the same emote
+const privmsgWithMultipleEmotes =
+    '@badge-info=;badges=;color=#00FF00;display-name=MultiEmote;'
+    'emotes=25:0-4,11-15;id=msg-456;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=22222;user-type= '
+    ':multiemote!multiemote@multiemote.tmi.twitch.tv PRIVMSG #channel :Kappa test Kappa';
+
+/// An IRC /me action message
+const actionMessage =
+    '@badge-info=;badges=broadcaster/1;color=#8A2BE2;display-name=Broadcaster;'
+    'emotes=;id=action-123;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=12345;user-type= '
+    ':broadcaster!broadcaster@broadcaster.tmi.twitch.tv PRIVMSG #channel '
+    ':\x01ACTION is testing\x01';
+
+/// A message that mentions another user
+const mentionMessage =
+    '@badge-info=;badges=;color=#FF6347;display-name=Mentioner;emotes=;'
+    'id=mention-123;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=33333;user-type= '
+    ':mentioner!mentioner@mentioner.tmi.twitch.tv PRIVMSG #channel :@targetuser hello!';
+
+/// A message with escaped spaces in tags (\\s represents a space)
+const messageWithEscapedSpaces =
+    '@badge-info=subscriber/12\\smonths;badges=subscriber/12;color=#FF0000;'
+    'display-name=EscapeTest;emotes=;id=escape-123;mod=0;room-id=12345;'
+    'subscriber=1;tmi-sent-ts=1234567890123;turbo=0;user-id=44444;user-type= '
+    ':escapetest!escapetest@escapetest.tmi.twitch.tv PRIVMSG #channel :test message';
+
+/// A CLEARCHAT command that bans/times out a specific user
+const clearChatUser =
+    '@ban-duration=600;room-id=12345;target-user-id=67890;tmi-sent-ts=1234567890123 '
+    ':tmi.twitch.tv CLEARCHAT #channel :banneduser';
+
+/// A CLEARCHAT command that clears the entire chat (no target user)
+const clearChatAll =
+    '@room-id=12345;tmi-sent-ts=1234567890123 '
+    ':tmi.twitch.tv CLEARCHAT #channel';
+
+/// A CLEARMSG command that deletes a specific message
+const clearMsg =
+    '@login=deleteduser;room-id=;target-msg-id=target-msg-abc123;'
+    'tmi-sent-ts=1234567890123 '
+    ':tmi.twitch.tv CLEARMSG #channel :deleted message content';
+
+/// A NOTICE command (system message)
+const noticeMessage =
+    '@msg-id=slow_on;room-id=12345 '
+    ':tmi.twitch.tv NOTICE #channel :This room is now in slow mode.';
+
+/// A USERNOTICE command (subscription, raid, etc.)
+const userNoticeSubscription =
+    '@badge-info=subscriber/1;badges=subscriber/0;color=#FF69B4;'
+    'display-name=NewSub;emotes=;id=sub-123;login=newsub;mod=0;'
+    'msg-id=sub;msg-param-cumulative-months=1;msg-param-months=0;'
+    'msg-param-multimonth-duration=0;msg-param-multimonth-tenure=0;'
+    'msg-param-should-share-streak=0;msg-param-sub-plan-name=Channel\\sSub;'
+    'msg-param-sub-plan=1000;msg-param-was-gifted=false;room-id=12345;'
+    'subscriber=1;system-msg=NewSub\\ssubscribed\\sat\\sTier\\s1.;'
+    'tmi-sent-ts=1234567890123;user-id=55555;user-type= '
+    ':tmi.twitch.tv USERNOTICE #channel';
+
+/// A ROOMSTATE command with room settings
+const roomState =
+    '@emote-only=0;followers-only=-1;r9k=0;room-id=12345;slow=0;subs-only=0 '
+    ':tmi.twitch.tv ROOMSTATE #channel';
+
+/// A USERSTATE command with user state info
+const userState =
+    '@badge-info=;badges=broadcaster/1;color=#FF0000;display-name=Broadcaster;'
+    'emote-sets=0,300374282;mod=0;subscriber=0;user-type= '
+    ':tmi.twitch.tv USERSTATE #channel';
+
+/// A GLOBALUSERSTATE command
+const globalUserState =
+    '@badge-info=;badges=premium/1;color=#8A2BE2;display-name=GlobalUser;'
+    'emote-sets=0,300374282;user-id=12345;user-type= '
+    ':tmi.twitch.tv GLOBALUSERSTATE';
+
+/// A message with Unicode that should be filtered (invalid Unicode char)
+const messageWithInvalidUnicode =
+    '@badge-info=;badges=;color=#00FF00;display-name=UnicodeTest;emotes=;'
+    'id=unicode-123;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=66666;user-type= '
+    ':unicodetest!unicodetest@unicodetest.tmi.twitch.tv PRIVMSG #channel '
+    ':Hello\u{E0000}World';
+
+/// A message that is a reply to another message
+const replyMessage =
+    '@badge-info=;badges=;color=#FF4500;display-name=Replier;emotes=;'
+    'id=reply-123;mod=0;reply-parent-display-name=OriginalUser;'
+    'reply-parent-msg-body=original\\smessage;reply-parent-msg-id=original-123;'
+    'reply-parent-user-id=77777;reply-parent-user-login=originaluser;'
+    'room-id=12345;subscriber=0;tmi-sent-ts=1234567890123;'
+    'turbo=0;user-id=88888;user-type= '
+    ':replier!replier@replier.tmi.twitch.tv PRIVMSG #channel :@OriginalUser this is my reply';
+
+/// A message from a moderator
+const moderatorMessage =
+    '@badge-info=subscriber/24;badges=moderator/1,subscriber/24;'
+    'color=#2E8B57;display-name=ModUser;emotes=;id=mod-123;mod=1;'
+    'room-id=12345;subscriber=1;tmi-sent-ts=1234567890123;'
+    'turbo=0;user-id=99999;user-type=mod '
+    ':moduser!moduser@moduser.tmi.twitch.tv PRIVMSG #channel :Mod message here';
+
+/// A message with no color set (should default to grey)
+const messageNoColor =
+    '@badge-info=;badges=;color=;display-name=NoColor;emotes=;'
+    'id=nocolor-123;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=11111;user-type= '
+    ':nocolor!nocolor@nocolor.tmi.twitch.tv PRIVMSG #channel :No color message';
+
+/// A historical message (from recent messages API)
+const historicalMessage =
+    '@badge-info=;badges=;color=#FF0000;display-name=HistUser;emotes=;'
+    'historical=1;id=hist-123;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=12121;user-type= '
+    ':histuser!histuser@histuser.tmi.twitch.tv PRIVMSG #channel :Historical message';
+
+/// A historical message as serialized by the recent-messages API, which emits
+/// empty tags as bare keys (e.g. `emotes`, `flags`) instead of the `key=` form
+/// that live Twitch IRC uses.
+const historicalMessageBareTags =
+    '@badges=raging-wolf-helm/1;emotes;first-msg=0;tmi-sent-ts=1234567890123;'
+    'flags;mod=0;returning-chatter=0;rm-received-ts=1234567890456;color=#1E90FF;'
+    'id=hist-bare-123;room-id=12345;historical=1;user-type;turbo=0;subscriber=0;'
+    'badge-info;display-name=BareUser;user-id=18181 '
+    ':bareuser!bareuser@bareuser.tmi.twitch.tv PRIVMSG #channel :Bare tag message';
+
+/// A message from a shared chat session (source room different from current)
+const sharedChatMessage =
+    '@badge-info=;badges=;color=#00BFFF;display-name=SharedUser;emotes=;'
+    'id=shared-123;mod=0;room-id=12345;source-room-id=99999;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=13131;user-type= '
+    ':shareduser!shareduser@shareduser.tmi.twitch.tv PRIVMSG #channel :From another channel';
+
+/// A message with emoji characters
+const messageWithEmoji =
+    '@badge-info=;badges=;color=#FFD700;display-name=EmojiUser;emotes=;'
+    'id=emoji-123;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=14141;user-type= '
+    ':emojiuser!emojiuser@emojiuser.tmi.twitch.tv PRIVMSG #channel :Hello 😀🎉 World';
+
+/// A message with empty body (edge case)
+const messageEmptyBody =
+    '@badge-info=;badges=;color=#FF0000;display-name=EmptyMsg;emotes=;'
+    'id=empty-123;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=16161;user-type= '
+    ':emptymsg!emptymsg@emptymsg.tmi.twitch.tv PRIVMSG #channel :';
+
+/// A message containing only emotes (no text words)
+const messageOnlyEmotes =
+    '@badge-info=;badges=;color=#FF0000;display-name=EmoteOnly;'
+    'emotes=25:0-4,6-10;id=emoteonly-123;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=17171;user-type= '
+    ':emoteonly!emoteonly@emoteonly.tmi.twitch.tv PRIVMSG #channel :Kappa Kappa';
+
+/// A message with a URL
+const messageWithUrl =
+    '@badge-info=;badges=;color=#9400D3;display-name=LinkUser;emotes=;'
+    'id=url-123;mod=0;room-id=12345;subscriber=0;'
+    'tmi-sent-ts=1234567890123;turbo=0;user-id=15151;user-type= '
+    ':linkuser!linkuser@linkuser.tmi.twitch.tv PRIVMSG #channel :Check out https://twitch.tv/channel';
diff --git a/test/models/badges_test.dart b/test/models/badges_test.dart
new file mode 100644
index 00000000..af527669
--- /dev/null
+++ b/test/models/badges_test.dart
@@ -0,0 +1,341 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/badges.dart';
+
+void main() {
+  group('ChatBadge.fromTwitch', () {
+    test('creates badge with correct properties', () {
+      final twitchBadge = BadgeInfoTwitch(
+        'https://static-cdn.jtvnw.net/badges/v1/1x.png',
+        'https://static-cdn.jtvnw.net/badges/v1/2x.png',
+        'https://static-cdn.jtvnw.net/badges/v1/4x.png',
+        'subscriber',
+        'Subscriber',
+        '12 Month Subscriber',
+      );
+
+      final badge = ChatBadge.fromTwitch(twitchBadge);
+
+      expect(badge.name, 'Subscriber');
+      expect(badge.url, 'https://static-cdn.jtvnw.net/badges/v1/4x.png');
+      expect(badge.type, BadgeType.twitch);
+      expect(badge.color, isNull);
+    });
+
+    test('uses 4x image URL (largest)', () {
+      final twitchBadge = BadgeInfoTwitch(
+        'https://cdn/1x.png',
+        'https://cdn/2x.png',
+        'https://cdn/4x.png',
+        'mod',
+        'Moderator',
+        'A moderator',
+      );
+
+      final badge = ChatBadge.fromTwitch(twitchBadge);
+
+      expect(badge.url, 'https://cdn/4x.png');
+    });
+
+    test('uses title for badge name, not id', () {
+      final twitchBadge = BadgeInfoTwitch(
+        'url1',
+        'url2',
+        'url4',
+        'vip',
+        'VIP',
+        'Very Important Person',
+      );
+
+      final badge = ChatBadge.fromTwitch(twitchBadge);
+
+      expect(badge.name, 'VIP');
+    });
+  });
+
+  group('ChatBadge.fromBTTV', () {
+    test('creates badge with correct properties', () {
+      final bttvBadge = BadgeInfoBTTV(
+        '12345',
+        BadgeDetailsBTTV('BetterTTV Developer', 'https://cdn.bttv.net/badge.svg'),
+      );
+
+      final badge = ChatBadge.fromBTTV(bttvBadge);
+
+      expect(badge.name, 'BetterTTV Developer');
+      expect(badge.url, 'https://cdn.bttv.net/badge.svg');
+      expect(badge.type, BadgeType.bttv);
+      expect(badge.color, isNull);
+    });
+
+    test('uses badge description as name', () {
+      final bttvBadge = BadgeInfoBTTV(
+        '67890',
+        BadgeDetailsBTTV('Custom Badge Description', 'https://example.com/badge.svg'),
+      );
+
+      final badge = ChatBadge.fromBTTV(bttvBadge);
+
+      expect(badge.name, 'Custom Badge Description');
+    });
+
+    test('uses badge SVG URL', () {
+      final bttvBadge = BadgeInfoBTTV(
+        'providerid',
+        BadgeDetailsBTTV('Test Badge', 'https://custom.svg.url/badge.svg'),
+      );
+
+      final badge = ChatBadge.fromBTTV(bttvBadge);
+
+      expect(badge.url, 'https://custom.svg.url/badge.svg');
+    });
+  });
+
+  group('ChatBadge.fromFFZ', () {
+    test('creates badge with correct properties including color', () {
+      final ffzBadge = BadgeInfoFFZ(
+        1,
+        'FFZ Supporter',
+        '#FF5500',
+        const BadgeUrlsFFZ(
+          'https://cdn.ffz.net/1x.png',
+          'https://cdn.ffz.net/2x.png',
+          'https://cdn.ffz.net/4x.png',
+        ),
+      );
+
+      final badge = ChatBadge.fromFFZ(ffzBadge);
+
+      expect(badge.name, 'FFZ Supporter');
+      expect(badge.url, 'https://cdn.ffz.net/4x.png');
+      expect(badge.type, BadgeType.ffz);
+      expect(badge.color, '#FF5500');
+    });
+
+    test('uses 4x image URL', () {
+      final ffzBadge = BadgeInfoFFZ(
+        2,
+        'Test Badge',
+        '#00FF00',
+        const BadgeUrlsFFZ(
+          'https://cdn/1x.png',
+          'https://cdn/2x.png',
+          'https://cdn/4x.png',
+        ),
+      );
+
+      final badge = ChatBadge.fromFFZ(ffzBadge);
+
+      expect(badge.url, 'https://cdn/4x.png');
+    });
+
+    test('preserves hex color string', () {
+      final ffzBadge = BadgeInfoFFZ(
+        3,
+        'Colored Badge',
+        '#ABCDEF',
+        const BadgeUrlsFFZ('1x', '2x', '4x'),
+      );
+
+      final badge = ChatBadge.fromFFZ(ffzBadge);
+
+      expect(badge.color, '#ABCDEF');
+    });
+
+    test('handles various color formats', () {
+      // Test lowercase hex
+      final ffzBadge1 = BadgeInfoFFZ(
+        4,
+        'Badge1',
+        '#aabbcc',
+        const BadgeUrlsFFZ('1x', '2x', '4x'),
+      );
+      expect(ChatBadge.fromFFZ(ffzBadge1).color, '#aabbcc');
+
+      // Test uppercase hex
+      final ffzBadge2 = BadgeInfoFFZ(
+        5,
+        'Badge2',
+        '#AABBCC',
+        const BadgeUrlsFFZ('1x', '2x', '4x'),
+      );
+      expect(ChatBadge.fromFFZ(ffzBadge2).color, '#AABBCC');
+    });
+  });
+
+  group('ChatBadge.from7TV', () {
+    test('creates badge with correct properties', () {
+      final badge7TV = BadgeInfo7TV(
+        '7TV Subscriber',
+        [
+          ['1x_url', 'https://cdn.7tv.app/badge/1x.png'],
+          ['2x_url', 'https://cdn.7tv.app/badge/2x.png'],
+          ['3x_url', 'https://cdn.7tv.app/badge/3x.png'],
+        ],
+        ['user1', 'user2'],
+      );
+
+      final badge = ChatBadge.from7TV(badge7TV);
+
+      expect(badge.name, '7TV Subscriber');
+      expect(badge.type, BadgeType.sevenTV);
+      expect(badge.color, isNull);
+    });
+
+    test('uses urls[2][1] for badge URL (3x size)', () {
+      final badge7TV = BadgeInfo7TV(
+        'Test Badge',
+        [
+          ['1x', 'https://cdn.7tv.app/1x.png'],
+          ['2x', 'https://cdn.7tv.app/2x.png'],
+          ['3x', 'https://cdn.7tv.app/3x.png'],
+        ],
+        [],
+      );
+
+      final badge = ChatBadge.from7TV(badge7TV);
+
+      // urls[2][1] means third array (index 2), second element (index 1)
+      expect(badge.url, 'https://cdn.7tv.app/3x.png');
+    });
+
+    test('uses tooltip as badge name', () {
+      final badge7TV = BadgeInfo7TV(
+        'Custom Tooltip Text',
+        [
+          ['1x', 'url1'],
+          ['2x', 'url2'],
+          ['3x', 'url3'],
+        ],
+        [],
+      );
+
+      final badge = ChatBadge.from7TV(badge7TV);
+
+      expect(badge.name, 'Custom Tooltip Text');
+    });
+  });
+
+  group('BadgeType', () {
+    test('toString returns human-readable string', () {
+      expect(BadgeType.twitch.toString(), 'Twitch badge');
+      expect(BadgeType.bttv.toString(), 'BetterTTV badge');
+      expect(BadgeType.ffz.toString(), 'FrankerFaceZ badge');
+      expect(BadgeType.sevenTV.toString(), '7TV badge');
+    });
+
+    test('all badge types have unique toString', () {
+      final strings = BadgeType.values.map((t) => t.toString()).toSet();
+      expect(strings.length, BadgeType.values.length);
+    });
+  });
+
+  group('ChatBadge constructor', () {
+    test('creates badge with all required fields', () {
+      const badge = ChatBadge(
+        name: 'Test Badge',
+        url: 'https://example.com/badge.png',
+        type: BadgeType.twitch,
+      );
+
+      expect(badge.name, 'Test Badge');
+      expect(badge.url, 'https://example.com/badge.png');
+      expect(badge.type, BadgeType.twitch);
+      expect(badge.color, isNull);
+    });
+
+    test('creates badge with optional color', () {
+      const badge = ChatBadge(
+        name: 'Colored Badge',
+        url: 'https://example.com/badge.png',
+        type: BadgeType.ffz,
+        color: '#FF0000',
+      );
+
+      expect(badge.color, '#FF0000');
+    });
+  });
+
+  group('BadgeInfoTwitch', () {
+    test('fromJson creates correct instance', () {
+      final json = {
+        'image_url_1x': 'https://cdn/1x.png',
+        'image_url_2x': 'https://cdn/2x.png',
+        'image_url_4x': 'https://cdn/4x.png',
+        'id': 'badge_id',
+        'title': 'Badge Title',
+        'description': 'Badge Description',
+      };
+
+      final badge = BadgeInfoTwitch.fromJson(json);
+
+      expect(badge.imageUrl1x, 'https://cdn/1x.png');
+      expect(badge.imageUrl2x, 'https://cdn/2x.png');
+      expect(badge.imageUrl4x, 'https://cdn/4x.png');
+      expect(badge.id, 'badge_id');
+      expect(badge.title, 'Badge Title');
+      expect(badge.description, 'Badge Description');
+    });
+  });
+
+  group('BadgeInfoFFZ', () {
+    test('fromJson creates correct instance', () {
+      final json = {
+        'id': 123,
+        'title': 'FFZ Badge',
+        'color': '#00FF00',
+        'urls': {
+          '1': 'https://cdn/1x.png',
+          '2': 'https://cdn/2x.png',
+          '4': 'https://cdn/4x.png',
+        },
+      };
+
+      final badge = BadgeInfoFFZ.fromJson(json);
+
+      expect(badge.id, 123);
+      expect(badge.title, 'FFZ Badge');
+      expect(badge.color, '#00FF00');
+      expect(badge.urls.url1x, 'https://cdn/1x.png');
+      expect(badge.urls.url4x, 'https://cdn/4x.png');
+    });
+  });
+
+  group('BadgeInfo7TV', () {
+    test('fromJson creates correct instance', () {
+      final json = {
+        'tooltip': '7TV Badge',
+        'urls': [
+          ['1x', 'https://cdn/1x.png'],
+          ['2x', 'https://cdn/2x.png'],
+          ['3x', 'https://cdn/3x.png'],
+        ],
+        'users': ['user1', 'user2', 'user3'],
+      };
+
+      final badge = BadgeInfo7TV.fromJson(json);
+
+      expect(badge.tooltip, '7TV Badge');
+      expect(badge.urls.length, 3);
+      expect(badge.urls[2][1], 'https://cdn/3x.png');
+      expect(badge.users, ['user1', 'user2', 'user3']);
+    });
+  });
+
+  group('BadgeInfoBTTV', () {
+    test('fromJson creates correct instance', () {
+      final json = {
+        'providerId': 'provider123',
+        'badge': {
+          'description': 'BTTV Badge',
+          'svg': 'https://cdn.bttv.net/badge.svg',
+        },
+      };
+
+      final badge = BadgeInfoBTTV.fromJson(json);
+
+      expect(badge.providerId, 'provider123');
+      expect(badge.badge.description, 'BTTV Badge');
+      expect(badge.badge.svg, 'https://cdn.bttv.net/badge.svg');
+    });
+  });
+}
diff --git a/test/models/category_test.dart b/test/models/category_test.dart
new file mode 100644
index 00000000..6623b7cf
--- /dev/null
+++ b/test/models/category_test.dart
@@ -0,0 +1,55 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/category.dart';
+
+void main() {
+  group('CategoryTwitch', () {
+    test('fromJson deserializes snake_case fields', () {
+      final category = CategoryTwitch.fromJson(const {
+        'box_art_url': 'https://cdn/boxart.jpg',
+        'id': '509658',
+        'name': 'Just Chatting',
+      });
+
+      expect(category.boxArtUrl, 'https://cdn/boxart.jpg');
+      expect(category.id, '509658');
+      expect(category.name, 'Just Chatting');
+    });
+  });
+
+  group('CategoriesTwitch', () {
+    test('fromJson deserializes data list and pagination', () {
+      final categories = CategoriesTwitch.fromJson(const {
+        'data': [
+          {
+            'box_art_url': 'https://cdn/boxart.jpg',
+            'id': '509658',
+            'name': 'Just Chatting',
+          },
+        ],
+        'pagination': {'cursor': 'cat_cursor'},
+      });
+
+      expect(categories.data.length, 1);
+      expect(categories.data.first.name, 'Just Chatting');
+      expect(categories.pagination?['cursor'], 'cat_cursor');
+    });
+
+    test('fromJson handles empty data list', () {
+      final categories = CategoriesTwitch.fromJson(const {
+        'data': <dynamic>[],
+        'pagination': <String, String>{},
+      });
+
+      expect(categories.data, isEmpty);
+    });
+
+    test('fromJson handles null pagination', () {
+      final categories = CategoriesTwitch.fromJson(const {
+        'data': <dynamic>[],
+        'pagination': null,
+      });
+
+      expect(categories.pagination, isNull);
+    });
+  });
+}
diff --git a/test/models/channel_test.dart b/test/models/channel_test.dart
new file mode 100644
index 00000000..6a08ec86
--- /dev/null
+++ b/test/models/channel_test.dart
@@ -0,0 +1,49 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/channel.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  group('Channel', () {
+    test('fromJson deserializes snake_case fields', () {
+      final channel = Channel.fromJson(
+        (twitchChannelResponse['data']! as List).first as Map<String, dynamic>,
+      );
+
+      expect(channel.broadcasterId, '12345');
+      expect(channel.broadcasterLogin, 'testuser');
+      expect(channel.broadcasterName, 'TestUser');
+      expect(channel.broadcasterLanguage, 'en');
+      expect(channel.title, 'Test Stream');
+      expect(channel.gameId, '509658');
+      expect(channel.gameName, 'Just Chatting');
+    });
+  });
+
+  group('ChannelQuery', () {
+    test('fromJson deserializes snake_case fields', () {
+      final query = ChannelQuery.fromJson(
+        (twitchChannelQueryResponse['data']! as List).first
+            as Map<String, dynamic>,
+      );
+
+      expect(query.broadcasterLogin, 'testuser');
+      expect(query.displayName, 'TestUser');
+      expect(query.id, '12345');
+      expect(query.isLive, isTrue);
+      expect(query.startedAt, '2024-01-01T00:00:00Z');
+    });
+
+    test('fromJson handles isLive false', () {
+      final query = ChannelQuery.fromJson(const {
+        'broadcaster_login': 'offline',
+        'display_name': 'Offline',
+        'id': '99999',
+        'is_live': false,
+        'started_at': '',
+      });
+
+      expect(query.isLive, isFalse);
+    });
+  });
+}
diff --git a/test/models/chatters_test.dart b/test/models/chatters_test.dart
new file mode 100644
index 00000000..95eca790
--- /dev/null
+++ b/test/models/chatters_test.dart
@@ -0,0 +1,36 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/chatters.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  group('ChatUsers', () {
+    test('fromJson deserializes chatter count and chatters', () {
+      final chatUsers = ChatUsers.fromJson(
+        chattersResponse as Map<String, dynamic>,
+      );
+
+      expect(chatUsers.chatterCount, 5);
+      expect(chatUsers.chatters.broadcaster, ['streamer']);
+      expect(chatUsers.chatters.vips, ['vip1']);
+      expect(chatUsers.chatters.moderators, ['mod1']);
+      expect(chatUsers.chatters.viewers, ['viewer1', 'viewer2']);
+    });
+  });
+
+  group('Chatters', () {
+    test('fromJson handles all role lists', () {
+      final chatters = Chatters.fromJson(
+        chattersResponse['chatters'] as Map<String, dynamic>,
+      );
+
+      expect(chatters.broadcaster, hasLength(1));
+      expect(chatters.vips, hasLength(1));
+      expect(chatters.moderators, hasLength(1));
+      expect(chatters.staff, isEmpty);
+      expect(chatters.admins, isEmpty);
+      expect(chatters.globalMods, isEmpty);
+      expect(chatters.viewers, hasLength(2));
+    });
+  });
+}
diff --git a/test/models/emotes_test.dart b/test/models/emotes_test.dart
new file mode 100644
index 00000000..08ec7ca5
--- /dev/null
+++ b/test/models/emotes_test.dart
@@ -0,0 +1,531 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/emotes.dart';
+
+void main() {
+  group('Emote.fromTwitch', () {
+    test('creates emote with correct URL', () {
+      final twitchEmote = EmoteTwitch(
+        '25',
+        'Kappa',
+        'bitstier',
+        null,
+      );
+
+      final emote = Emote.fromTwitch(twitchEmote, EmoteType.twitchGlobal);
+
+      expect(
+        emote.url,
+        'https://static-cdn.jtvnw.net/emoticons/v2/25/default/dark/3.0',
+      );
+      expect(emote.name, 'Kappa');
+      expect(emote.type, EmoteType.twitchGlobal);
+      expect(emote.zeroWidth, isFalse);
+    });
+
+    test('preserves owner ID when provided', () {
+      final twitchEmote = EmoteTwitch(
+        '12345',
+        'SubEmote',
+        'subscriptions',
+        '67890',
+      );
+
+      final emote = Emote.fromTwitch(twitchEmote, EmoteType.twitchSub);
+
+      expect(emote.ownerId, '67890');
+    });
+
+    test('handles null owner ID', () {
+      final twitchEmote = EmoteTwitch(
+        '25',
+        'Kappa',
+        'bitstier',
+        null,
+      );
+
+      final emote = Emote.fromTwitch(twitchEmote, EmoteType.twitchGlobal);
+
+      expect(emote.ownerId, isNull);
+    });
+  });
+
+  group('Emote.fromBTTV', () {
+    test('creates emote with correct URL', () {
+      final bttvEmote = EmoteBTTV('abc123', 'PogChamp');
+
+      final emote = Emote.fromBTTV(bttvEmote, EmoteType.bttvGlobal);
+
+      expect(emote.url, 'https://cdn.betterttv.net/emote/abc123/3x');
+      expect(emote.name, 'PogChamp');
+      expect(emote.type, EmoteType.bttvGlobal);
+    });
+
+    for (final name in [
+      'SoSnowy',
+      'IceCold',
+      'SantaHat',
+      'TopHat',
+      'ReinDeer',
+      'CandyCane',
+      'cvMask',
+      'cvHazmat',
+    ]) {
+      test('marks $name as zero-width', () {
+        final emote = Emote.fromBTTV(EmoteBTTV('id', name), EmoteType.bttvGlobal);
+        expect(emote.zeroWidth, isTrue);
+      });
+    }
+
+    test('regular emotes are not zero-width', () {
+      final bttvEmote = EmoteBTTV('regularid', 'RegularEmote');
+
+      final emote = Emote.fromBTTV(bttvEmote, EmoteType.bttvGlobal);
+
+      expect(emote.zeroWidth, isFalse);
+    });
+  });
+
+  group('Emote.fromFFZ', () {
+    test('creates emote with static URL when no animation', () {
+      final ffzEmote = EmoteFFZ(
+        'TestFFZ',
+        28,
+        28,
+        const OwnerFFZ(displayName: 'Owner', name: 'owner'),
+        const ImagesFFZ(
+          'https://cdn.ffz.net/1x.png',
+          'https://cdn.ffz.net/2x.png',
+          'https://cdn.ffz.net/4x.png',
+        ),
+        null, // No animation
+      );
+
+      final emote = Emote.fromFFZ(ffzEmote, EmoteType.ffzChannel);
+
+      expect(emote.url, 'https://cdn.ffz.net/4x.png');
+      expect(emote.name, 'TestFFZ');
+      expect(emote.type, EmoteType.ffzChannel);
+      expect(emote.width, 28);
+      expect(emote.height, 28);
+      expect(emote.ownerDisplayName, 'Owner');
+      expect(emote.ownerUsername, 'owner');
+    });
+
+    test('prefers animated URL when available', () {
+      final ffzEmote = EmoteFFZ(
+        'AnimatedFFZ',
+        32,
+        32,
+        const OwnerFFZ(displayName: 'AnimOwner', name: 'animowner'),
+        const ImagesFFZ(
+          'https://cdn.ffz.net/static/1x.png',
+          'https://cdn.ffz.net/static/2x.png',
+          'https://cdn.ffz.net/static/4x.png',
+        ),
+        const ImagesFFZ(
+          'https://cdn.ffz.net/anim/1x.gif',
+          'https://cdn.ffz.net/anim/2x.gif',
+          'https://cdn.ffz.net/anim/4x.gif',
+        ),
+      );
+
+      final emote = Emote.fromFFZ(ffzEmote, EmoteType.ffzGlobal);
+
+      expect(emote.url, 'https://cdn.ffz.net/anim/4x.gif');
+    });
+
+    test('falls back to 2x then 1x when 4x not available', () {
+      final ffzEmote = EmoteFFZ(
+        'NoFourX',
+        20,
+        20,
+        const OwnerFFZ(displayName: 'Owner', name: 'owner'),
+        const ImagesFFZ(
+          'https://cdn.ffz.net/1x.png',
+          'https://cdn.ffz.net/2x.png',
+          null, // No 4x
+        ),
+        null,
+      );
+
+      final emote = Emote.fromFFZ(ffzEmote, EmoteType.ffzChannel);
+
+      expect(emote.url, 'https://cdn.ffz.net/2x.png');
+    });
+
+    test('falls back to 1x when only 1x available', () {
+      final ffzEmote = EmoteFFZ(
+        'OnlyOneX',
+        18,
+        18,
+        const OwnerFFZ(displayName: 'Owner', name: 'owner'),
+        const ImagesFFZ(
+          'https://cdn.ffz.net/1x.png',
+          null, // No 2x
+          null, // No 4x
+        ),
+        null,
+      );
+
+      final emote = Emote.fromFFZ(ffzEmote, EmoteType.ffzChannel);
+
+      expect(emote.url, 'https://cdn.ffz.net/1x.png');
+    });
+
+    test('prefers animated fallback chain over static', () {
+      final ffzEmote = EmoteFFZ(
+        'AnimFallback',
+        24,
+        24,
+        const OwnerFFZ(displayName: 'Owner', name: 'owner'),
+        const ImagesFFZ(
+          'https://cdn.ffz.net/static/1x.png',
+          'https://cdn.ffz.net/static/2x.png',
+          'https://cdn.ffz.net/static/4x.png',
+        ),
+        const ImagesFFZ(
+          'https://cdn.ffz.net/anim/1x.gif',
+          'https://cdn.ffz.net/anim/2x.gif',
+          null, // No animated 4x
+        ),
+      );
+
+      final emote = Emote.fromFFZ(ffzEmote, EmoteType.ffzGlobal);
+
+      // Should use animated 2x since animated 4x is not available
+      expect(emote.url, 'https://cdn.ffz.net/anim/2x.gif');
+    });
+
+    test('animated with only 1x falls back to animated 1x', () {
+      final ffzEmote = EmoteFFZ(
+        'AnimOnly1x',
+        24,
+        24,
+        const OwnerFFZ(displayName: 'Owner', name: 'owner'),
+        const ImagesFFZ(
+          'https://cdn.ffz.net/static/1x.png',
+          'https://cdn.ffz.net/static/2x.png',
+          'https://cdn.ffz.net/static/4x.png',
+        ),
+        const ImagesFFZ(
+          'https://cdn.ffz.net/anim/1x.gif',
+          null, // No animated 2x
+          null, // No animated 4x
+        ),
+      );
+
+      final emote = Emote.fromFFZ(ffzEmote, EmoteType.ffzGlobal);
+
+      expect(emote.url, 'https://cdn.ffz.net/anim/1x.gif');
+    });
+  });
+
+  group('Emote.from7TV', () {
+    test('creates emote with WEBP URL (filters AVIF)', () {
+      final emote7TV = Emote7TV(
+        '7tvid123',
+        'TestEmote',
+        Emote7TVData(
+          '7tvid123',
+          'TestEmote',
+          0, // No flags
+          const Owner7TV(username: 'owner', displayName: 'Owner'),
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/7tvid123',
+            [
+              Emote7TVFile('1x.webp', 32, 32, 'WEBP'),
+              Emote7TVFile('2x.webp', 64, 64, 'WEBP'),
+              Emote7TVFile('3x.webp', 96, 96, 'WEBP'),
+              Emote7TVFile('4x.webp', 128, 128, 'WEBP'),
+              Emote7TVFile('1x.avif', 32, 32, 'AVIF'),
+              Emote7TVFile('2x.avif', 64, 64, 'AVIF'),
+              Emote7TVFile('3x.avif', 96, 96, 'AVIF'),
+              Emote7TVFile('4x.avif', 128, 128, 'AVIF'),
+            ],
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVChannel);
+
+      // Should use WEBP, not AVIF
+      expect(emote.url, contains('webp'));
+      expect(emote.url, isNot(contains('avif')));
+      expect(emote.url, 'https://cdn.7tv.app/emote/7tvid123/4x.webp');
+    });
+
+    test('detects zero-width from flag bit 8 (256)', () {
+      final emote7TV = Emote7TV(
+        'zw123',
+        'ZeroWidth',
+        Emote7TVData(
+          'zw123',
+          'ZeroWidth',
+          256, // Bit 8 set = zero-width
+          null,
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/zw123',
+            [Emote7TVFile('1x.webp', 32, 32, 'WEBP')],
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVGlobal);
+
+      expect(emote.zeroWidth, isTrue);
+    });
+
+    test('non-zero-width when flag bit 8 not set', () {
+      final emote7TV = Emote7TV(
+        'regular123',
+        'RegularEmote',
+        Emote7TVData(
+          'regular123',
+          'RegularEmote',
+          128, // Different flag, not 256
+          null,
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/regular123',
+            [Emote7TVFile('1x.webp', 32, 32, 'WEBP')],
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVChannel);
+
+      expect(emote.zeroWidth, isFalse);
+    });
+
+    test('sets realName when different from emote name', () {
+      final emote7TV = Emote7TV(
+        'alias123',
+        'AliasName', // The alias used in channel
+        Emote7TVData(
+          'alias123',
+          'OriginalName', // The original name
+          0,
+          null,
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/alias123',
+            [Emote7TVFile('1x.webp', 32, 32, 'WEBP')],
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVChannel);
+
+      expect(emote.name, 'AliasName');
+      expect(emote.realName, 'OriginalName');
+    });
+
+    test('realName is null when name matches', () {
+      final emote7TV = Emote7TV(
+        'same123',
+        'SameName',
+        Emote7TVData(
+          'same123',
+          'SameName', // Same as emote.name
+          0,
+          null,
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/same123',
+            [Emote7TVFile('1x.webp', 32, 32, 'WEBP')],
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVGlobal);
+
+      expect(emote.name, 'SameName');
+      expect(emote.realName, isNull);
+    });
+
+    test('extracts owner info when available', () {
+      final emote7TV = Emote7TV(
+        'owned123',
+        'OwnedEmote',
+        Emote7TVData(
+          'owned123',
+          'OwnedEmote',
+          0,
+          const Owner7TV(username: 'creator', displayName: 'EmoteCreator'),
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/owned123',
+            [Emote7TVFile('1x.webp', 32, 32, 'WEBP')],
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVChannel);
+
+      expect(emote.ownerUsername, 'creator');
+      expect(emote.ownerDisplayName, 'EmoteCreator');
+    });
+
+    test('handles null owner', () {
+      final emote7TV = Emote7TV(
+        'noowner123',
+        'NoOwner',
+        Emote7TVData(
+          'noowner123',
+          'NoOwner',
+          0,
+          null, // No owner
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/noowner123',
+            [Emote7TVFile('1x.webp', 32, 32, 'WEBP')],
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVGlobal);
+
+      expect(emote.ownerUsername, isNull);
+      expect(emote.ownerDisplayName, isNull);
+    });
+
+    test('uses first file dimensions', () {
+      final emote7TV = Emote7TV(
+        'dim123',
+        'Dimensions',
+        Emote7TVData(
+          'dim123',
+          'Dimensions',
+          0,
+          null,
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/dim123',
+            [
+              Emote7TVFile('1x.webp', 28, 32, 'WEBP'),
+              Emote7TVFile('2x.webp', 56, 64, 'WEBP'),
+            ],
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVChannel);
+
+      expect(emote.width, 28);
+      expect(emote.height, 32);
+    });
+
+    test('handles empty file list', () {
+      final emote7TV = Emote7TV(
+        'empty123',
+        'EmptyFiles',
+        Emote7TVData(
+          'empty123',
+          'EmptyFiles',
+          0,
+          null,
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/empty123',
+            [], // No files
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVGlobal);
+
+      // Should return empty URL when no files
+      expect(emote.url, '');
+      expect(emote.width, isNull);
+      expect(emote.height, isNull);
+    });
+
+    test('filters AVIF-only files and returns empty URL', () {
+      final emote7TV = Emote7TV(
+        'avifonly123',
+        'AvifOnly',
+        Emote7TVData(
+          'avifonly123',
+          'AvifOnly',
+          0,
+          null,
+          Emote7TVHost(
+            '//cdn.7tv.app/emote/avifonly123',
+            [
+              Emote7TVFile('1x.avif', 32, 32, 'AVIF'),
+              Emote7TVFile('2x.avif', 64, 64, 'AVIF'),
+            ],
+          ),
+        ),
+      );
+
+      final emote = Emote.from7TV(emote7TV, EmoteType.sevenTVChannel);
+
+      // All files are AVIF, so should return empty URL
+      expect(emote.url, '');
+    });
+  });
+
+  group('EmoteType', () {
+    test('toString returns human-readable string', () {
+      expect(EmoteType.twitchBits.toString(), 'Twitch bits emote');
+      expect(EmoteType.twitchFollower.toString(), 'Twitch follower emote');
+      expect(EmoteType.twitchSub.toString(), 'Twitch sub emote');
+      expect(EmoteType.twitchGlobal.toString(), 'Twitch global emote');
+      expect(EmoteType.twitchUnlocked.toString(), 'Twitch unlocked emote');
+      expect(EmoteType.twitchChannel.toString(), 'Twitch channel emote');
+      expect(EmoteType.ffzGlobal.toString(), 'FrankerFaceZ global emote');
+      expect(EmoteType.ffzChannel.toString(), 'FrankerFaceZ channel emote');
+      expect(EmoteType.bttvGlobal.toString(), 'BetterTTV global emote');
+      expect(EmoteType.bttvChannel.toString(), 'BetterTTV channel emote');
+      expect(EmoteType.bttvShared.toString(), 'BetterTTV shared emote');
+      expect(EmoteType.sevenTVGlobal.toString(), '7TV global emote');
+      expect(EmoteType.sevenTVChannel.toString(), '7TV channel emote');
+    });
+  });
+
+  group('EmoteBTTVChannel', () {
+    test('combines channel and shared emotes', () {
+      final json = {
+        'channelEmotes': [
+          {'id': 'ch1', 'code': 'ChannelEmote'},
+        ],
+        'sharedEmotes': [
+          {'id': 'sh1', 'code': 'SharedEmote1'},
+          {'id': 'sh2', 'code': 'SharedEmote2'},
+        ],
+      };
+
+      final result = EmoteBTTVChannel.fromJson(json);
+
+      expect(result.channelEmotes.length, 1);
+      expect(result.channelEmotes.first.code, 'ChannelEmote');
+      expect(result.sharedEmotes.length, 2);
+      expect(result.sharedEmotes.first.code, 'SharedEmote1');
+    });
+  });
+
+  group('Emote JSON serialization', () {
+    test('roundtrip serialization works', () {
+      const original = Emote(
+        name: 'TestEmote',
+        realName: 'RealName',
+        width: 32,
+        height: 32,
+        zeroWidth: true,
+        url: 'https://example.com/emote.png',
+        type: EmoteType.sevenTVChannel,
+        ownerDisplayName: 'Owner',
+        ownerUsername: 'owner',
+        ownerId: '12345',
+      );
+
+      final json = original.toJson();
+      final restored = Emote.fromJson(json);
+
+      expect(restored.name, original.name);
+      expect(restored.realName, original.realName);
+      expect(restored.width, original.width);
+      expect(restored.height, original.height);
+      expect(restored.zeroWidth, original.zeroWidth);
+      expect(restored.url, original.url);
+      expect(restored.type, original.type);
+      expect(restored.ownerDisplayName, original.ownerDisplayName);
+      expect(restored.ownerUsername, original.ownerUsername);
+      expect(restored.ownerId, original.ownerId);
+    });
+  });
+}
diff --git a/test/models/events_test.dart b/test/models/events_test.dart
new file mode 100644
index 00000000..168dd39c
--- /dev/null
+++ b/test/models/events_test.dart
@@ -0,0 +1,110 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/events.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  group('SevenTVEvent', () {
+    test('fromJson deserializes op, t, and d fields', () {
+      final event = SevenTVEvent.fromJson(
+        sevenTVEventJson as Map<String, dynamic>,
+      );
+
+      expect(event.op, 0);
+      expect(event.t, 1);
+      expect(event.d.type, 'emote_set.update');
+    });
+
+    test('toJson roundtrip preserves data', () {
+      final event = SevenTVEvent.fromJson(
+        sevenTVEventJson as Map<String, dynamic>,
+      );
+
+      // Use jsonEncode/jsonDecode for a true roundtrip, since toJson()
+      // doesn't recursively serialize nested objects without explicitToJson.
+      final json = jsonDecode(jsonEncode(event.toJson()))
+          as Map<String, dynamic>;
+      final restored = SevenTVEvent.fromJson(json);
+
+      expect(restored.op, event.op);
+      expect(restored.t, event.t);
+      expect(restored.d.type, event.d.type);
+    });
+
+    test('fromJson handles null t field', () {
+      final event = SevenTVEvent.fromJson(const {
+        'op': 2,
+        'd': {'type': null},
+      });
+
+      expect(event.op, 2);
+      expect(event.t, isNull);
+    });
+  });
+
+  group('SevenTVEventData', () {
+    test('fromJson deserializes type and condition', () {
+      final data = SevenTVEventData.fromJson(
+        (sevenTVEventJson as Map<String, dynamic>)['d']
+            as Map<String, dynamic>,
+      );
+
+      expect(data.type, 'emote_set.update');
+      expect(data.condition?['object_id'], 'set_abc123');
+    });
+
+    test('fromJson with null type', () {
+      final data = SevenTVEventData.fromJson(const {
+        'type': null,
+        'condition': null,
+      });
+
+      expect(data.type, isNull);
+      expect(data.condition, isNull);
+    });
+
+    test('toJson produces valid output', () {
+      const data = SevenTVEventData(
+        type: 'emote_set.update',
+        condition: {'object_id': 'test'},
+      );
+
+      final json = data.toJson();
+
+      expect(json['type'], 'emote_set.update');
+      expect(json['condition'], {'object_id': 'test'});
+    });
+  });
+
+  group('SevenTVEventEmoteSetBody', () {
+    test('fromJson deserializes actor and pushed/pulled lists', () {
+      final body = SevenTVEventEmoteSetBody.fromJson(const {
+        'actor': {
+          'username': 'moderator',
+          'display_name': 'Moderator',
+        },
+        'pushed': <dynamic>[],
+        'pulled': <dynamic>[],
+      });
+
+      expect(body.actor.username, 'moderator');
+      expect(body.actor.displayName, 'Moderator');
+      expect(body.pushed, isEmpty);
+      expect(body.pulled, isEmpty);
+    });
+
+    test('fromJson handles null pushed/pulled', () {
+      final body = SevenTVEventEmoteSetBody.fromJson(const {
+        'actor': {
+          'username': 'mod',
+          'display_name': 'Mod',
+        },
+      });
+
+      expect(body.pushed, isNull);
+      expect(body.pulled, isNull);
+    });
+  });
+}
diff --git a/test/models/irc_test.dart b/test/models/irc_test.dart
new file mode 100644
index 00000000..2155d611
--- /dev/null
+++ b/test/models/irc_test.dart
@@ -0,0 +1,701 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/constants.dart';
+import 'package:frosty/models/irc.dart';
+
+import '../fixtures/irc_messages.dart';
+
+void main() {
+  group('IRCMessage.fromString', () {
+    group('basic parsing', () {
+      test('parses basic chat message correctly', () {
+        final msg = IRCMessage.fromString(basicPrivmsg);
+
+        expect(msg.user, 'testuser');
+        expect(msg.message, 'Hello World');
+        expect(msg.command, Command.privateMessage);
+        expect(msg.tags['display-name'], 'TestUser');
+        expect(msg.tags['color'], '#FF0000');
+        expect(msg.tags['user-id'], '67890');
+        expect(msg.tags['room-id'], '12345');
+      });
+
+      test('parses message with escaped spaces in tags', () {
+        final msg = IRCMessage.fromString(messageWithEscapedSpaces);
+
+        // \\s should be converted to actual space
+        expect(msg.tags['badge-info'], 'subscriber/12 months');
+        expect(msg.message, 'test message');
+      });
+
+      test('unescapes the full IRCv3 tag escape set', () {
+        final msg = IRCMessage.fromString(messageWithEscapedTagChars);
+
+        expect(msg.tags['a-space'], 'one two');
+        expect(msg.tags['a-semi'], 'left;right');
+        expect(msg.tags['a-slash'], r'a\b');
+        // Only the first '=' splits key/value; later '=' stays in the value.
+        expect(msg.tags['a-equals'], 'k=v');
+        // `\\` consumes both backslashes; the following 's' is a literal letter,
+        // not a `\s` space escape (single-pass unescaping).
+        expect(msg.tags['a-double'], r'x\sy');
+      });
+
+      test('falls back to login tag when prefix has no "!"', () {
+        // An unexpected prefix shape must not throw and drop the message.
+        final msg = IRCMessage.fromString(messageNoBangPrefix);
+
+        expect(msg.user, 'fallbackuser');
+        expect(msg.message, 'server style');
+      });
+
+      test('handles message with no color tag', () {
+        final msg = IRCMessage.fromString(messageNoColor);
+
+        // Tags with empty values are skipped during parsing
+        expect(msg.tags['color'], isNull);
+        expect(msg.user, 'nocolor');
+      });
+
+      test('splits message into words correctly', () {
+        final msg = IRCMessage.fromString(basicPrivmsg);
+
+        expect(msg.split, ['Hello', 'World']);
+      });
+    });
+
+    group('command detection', () {
+      test('identifies PRIVMSG command', () {
+        final msg = IRCMessage.fromString(basicPrivmsg);
+        expect(msg.command, Command.privateMessage);
+      });
+
+      test('identifies CLEARCHAT command for user ban', () {
+        final msg = IRCMessage.fromString(clearChatUser);
+        expect(msg.command, Command.clearChat);
+        expect(msg.message, 'banneduser');
+        expect(msg.tags['ban-duration'], '600');
+      });
+
+      test('identifies CLEARCHAT command for full chat clear', () {
+        final msg = IRCMessage.fromString(clearChatAll);
+        expect(msg.command, Command.clearChat);
+        expect(msg.message, isNull);
+      });
+
+      test('identifies CLEARMSG command', () {
+        final msg = IRCMessage.fromString(clearMsg);
+        expect(msg.command, Command.clearMessage);
+        expect(msg.tags['target-msg-id'], 'target-msg-abc123');
+      });
+
+      test('identifies NOTICE command', () {
+        final msg = IRCMessage.fromString(noticeMessage);
+        expect(msg.command, Command.notice);
+        expect(msg.tags['msg-id'], 'slow_on');
+      });
+
+      test('identifies USERNOTICE command', () {
+        final msg = IRCMessage.fromString(userNoticeSubscription);
+        expect(msg.command, Command.userNotice);
+        expect(msg.tags['msg-id'], 'sub');
+      });
+
+      test('identifies ROOMSTATE command', () {
+        final msg = IRCMessage.fromString(roomState);
+        expect(msg.command, Command.roomState);
+        expect(msg.tags['slow'], '0');
+        expect(msg.tags['emote-only'], '0');
+      });
+
+      test('identifies USERSTATE command', () {
+        final msg = IRCMessage.fromString(userState);
+        expect(msg.command, Command.userState);
+        expect(msg.tags['mod'], '0');
+      });
+
+      test('identifies GLOBALUSERSTATE command', () {
+        final msg = IRCMessage.fromString(globalUserState);
+        expect(msg.command, Command.globalUserState);
+      });
+    });
+
+    group('emote parsing', () {
+      test('extracts local emotes from emote tag', () {
+        final msg = IRCMessage.fromString(privmsgWithEmotes);
+
+        expect(msg.localEmotes, isNotNull);
+        expect(msg.localEmotes!.containsKey('Kappa'), isTrue);
+        expect(msg.localEmotes!.containsKey('LUL'), isTrue);
+
+        // Verify emote URLs are constructed correctly
+        expect(
+          msg.localEmotes!['Kappa']!.url,
+          contains('static-cdn.jtvnw.net/emoticons/v2/25'),
+        );
+      });
+
+      test('handles multiple instances of same emote', () {
+        final msg = IRCMessage.fromString(privmsgWithMultipleEmotes);
+
+        // Should still only have one entry in localEmotes map
+        expect(msg.localEmotes!.length, 1);
+        expect(msg.localEmotes!['Kappa'], isNotNull);
+      });
+
+      test('handles message with no emotes', () {
+        final msg = IRCMessage.fromString(basicPrivmsg);
+
+        expect(msg.localEmotes, isEmpty);
+      });
+    });
+
+    group('IRC action (/me) detection', () {
+      test('detects /me action messages', () {
+        final msg = IRCMessage.fromString(actionMessage);
+
+        expect(msg.action, isTrue);
+        expect(msg.message, 'is testing');
+        // Action prefix and suffix should be stripped
+        expect(msg.message, isNot(contains('\x01')));
+      });
+
+      test('non-action messages have action=false', () {
+        final msg = IRCMessage.fromString(basicPrivmsg);
+        expect(msg.action, isFalse);
+      });
+    });
+
+    group('mention detection', () {
+      test('detects when message mentions logged-in user', () {
+        final msg = IRCMessage.fromString(
+          mentionMessage,
+          userLogin: 'targetuser',
+        );
+
+        expect(msg.mention, isTrue);
+      });
+
+      test('mention detection lowercases the message', () {
+        // Note: The code lowercases the message but compares against userLogin as-is
+        // So userLogin should be provided in lowercase for proper matching
+        final msg = IRCMessage.fromString(
+          mentionMessage,
+          userLogin: 'targetuser', // lowercase to match the lowercased message
+        );
+
+        expect(msg.mention, isTrue);
+      });
+
+      test('no mention when user is not mentioned', () {
+        final msg = IRCMessage.fromString(
+          basicPrivmsg,
+          userLogin: 'someotheruser',
+        );
+
+        expect(msg.mention, isFalse);
+      });
+
+      test('mention is false when userLogin not provided', () {
+        final msg = IRCMessage.fromString(basicPrivmsg);
+        expect(msg.mention, isFalse);
+      });
+    });
+
+    group('Unicode handling', () {
+      test('removes invalid Unicode characters', () {
+        final msg = IRCMessage.fromString(messageWithInvalidUnicode);
+
+        // The invalid Unicode character should be stripped
+        expect(msg.message, 'HelloWorld');
+        expect(msg.message, isNot(contains('\u{E0000}')));
+      });
+
+      test('handles emoji characters correctly', () {
+        final msg = IRCMessage.fromString(messageWithEmoji);
+
+        expect(msg.message, contains('😀'));
+        expect(msg.message, contains('🎉'));
+        // Emojis should be separated into their own entries in split
+        expect(msg.split!.any((s) => s.contains('😀')), isTrue);
+      });
+    });
+
+    group('reply message handling', () {
+      test('parses reply message tags', () {
+        final msg = IRCMessage.fromString(replyMessage);
+
+        expect(msg.tags['reply-parent-display-name'], 'OriginalUser');
+        expect(msg.tags['reply-parent-msg-id'], 'original-123');
+        expect(msg.tags['reply-parent-user-login'], 'originaluser');
+      });
+    });
+
+    group('special message types', () {
+      test('parses moderator message', () {
+        final msg = IRCMessage.fromString(moderatorMessage);
+
+        expect(msg.tags['mod'], '1');
+        expect(msg.tags['badges'], contains('moderator'));
+      });
+
+      test('parses historical message', () {
+        final msg = IRCMessage.fromString(historicalMessage);
+
+        expect(msg.tags['historical'], '1');
+      });
+
+      test('parses historical message with bare (valueless) tags', () {
+        // The recent-messages API serializes empty tags as bare keys (e.g.
+        // `emotes`, `flags`) instead of `key=`. This previously threw a
+        // RangeError, silently dropping all recent messages.
+        final msg = IRCMessage.fromString(historicalMessageBareTags);
+
+        expect(msg.tags['historical'], '1');
+        expect(msg.tags['display-name'], 'BareUser');
+        expect(msg.message, 'Bare tag message');
+        // Bare tags should be absent from the map, not crash parsing.
+        expect(msg.tags.containsKey('emotes'), isFalse);
+        expect(msg.tags.containsKey('flags'), isFalse);
+      });
+
+      test('parses shared chat message with source room', () {
+        final msg = IRCMessage.fromString(sharedChatMessage);
+
+        expect(msg.tags['source-room-id'], '99999');
+        expect(msg.tags['room-id'], '12345');
+      });
+
+      test('parses message with URL in split', () {
+        final msg = IRCMessage.fromString(messageWithUrl);
+
+        expect(msg.message, contains('https://twitch.tv/channel'));
+        expect(msg.split, isNotNull);
+        expect(
+          msg.split!.any((word) => regexLink.hasMatch(word)),
+          isTrue,
+        );
+      });
+    });
+  });
+
+  group('IRCMessage.clearChat', () {
+    late List<IRCMessage> messages;
+    late List<IRCMessage> bufferedMessages;
+
+    setUp(() {
+      // Create test messages from different users
+      messages = [
+        IRCMessage.fromString(basicPrivmsg), // from testuser
+        IRCMessage.fromString(moderatorMessage), // from moduser
+        IRCMessage.fromString(
+          basicPrivmsg.replaceAll('testuser', 'user2').replaceAll('TestUser', 'User2'),
+        ), // from user2
+      ];
+      bufferedMessages = [];
+    });
+
+    test('marks all messages from banned user', () {
+      // Create a CLEARCHAT message targeting testuser
+      final clearChatMsg = IRCMessage(
+        raw: '',
+        command: Command.clearChat,
+        tags: {'ban-duration': '600'},
+        message: 'testuser',
+      );
+
+      IRCMessage.clearChat(
+        messages: messages,
+        bufferedMessages: bufferedMessages,
+        ircMessage: clearChatMsg,
+      );
+
+      // testuser's message should be marked as clearChat
+      expect(
+        messages.where((m) => m.user == 'testuser').first.command,
+        Command.clearChat,
+      );
+      // Other users' messages should be unchanged
+      expect(
+        messages.where((m) => m.user == 'moduser').first.command,
+        Command.privateMessage,
+      );
+    });
+
+    test('adds ban-duration tag to affected messages', () {
+      final clearChatMsg = IRCMessage(
+        raw: '',
+        command: Command.clearChat,
+        tags: {'ban-duration': '300'},
+        message: 'testuser',
+      );
+
+      IRCMessage.clearChat(
+        messages: messages,
+        bufferedMessages: bufferedMessages,
+        ircMessage: clearChatMsg,
+      );
+
+      final affectedMessage = messages.where((m) => m.user == 'testuser').first;
+      expect(affectedMessage.tags['ban-duration'], '300');
+    });
+
+    test('clears entire chat when no target user', () {
+      final clearAllMsg = IRCMessage(
+        raw: '',
+        command: Command.clearChat,
+        tags: {},
+      );
+
+      IRCMessage.clearChat(
+        messages: messages,
+        bufferedMessages: bufferedMessages,
+        ircMessage: clearAllMsg,
+      );
+
+      // Messages list should be cleared and contain only the notice
+      expect(messages.length, 1);
+      expect(messages.first.command, Command.notice);
+      expect(messages.first.message, 'Chat was cleared by a moderator');
+    });
+  });
+
+  group('IRCMessage.clearMessage', () {
+    late List<IRCMessage> messages;
+    late List<IRCMessage> bufferedMessages;
+
+    setUp(() {
+      messages = [
+        IRCMessage(
+          raw: '',
+          command: Command.privateMessage,
+          tags: {'id': 'msg-1'},
+          user: 'user1',
+          message: 'Message 1',
+        ),
+        IRCMessage(
+          raw: '',
+          command: Command.privateMessage,
+          tags: {'id': 'msg-2'},
+          user: 'user2',
+          message: 'Message 2',
+        ),
+        IRCMessage(
+          raw: '',
+          command: Command.privateMessage,
+          tags: {'id': 'msg-3'},
+          user: 'user1',
+          message: 'Message 3',
+        ),
+      ];
+      bufferedMessages = [];
+    });
+
+    test('marks specific message by ID', () {
+      final clearMsg = IRCMessage(
+        raw: '',
+        command: Command.clearMessage,
+        tags: {'target-msg-id': 'msg-2'},
+      );
+
+      IRCMessage.clearMessage(
+        messages: messages,
+        bufferedMessages: bufferedMessages,
+        ircMessage: clearMsg,
+      );
+
+      // Only msg-2 should be marked
+      expect(
+        messages.firstWhere((m) => m.tags['id'] == 'msg-2').command,
+        Command.clearMessage,
+      );
+      // Other messages unchanged
+      expect(
+        messages.firstWhere((m) => m.tags['id'] == 'msg-1').command,
+        Command.privateMessage,
+      );
+      expect(
+        messages.firstWhere((m) => m.tags['id'] == 'msg-3').command,
+        Command.privateMessage,
+      );
+    });
+
+    test('handles non-existent message ID gracefully', () {
+      final clearMsg = IRCMessage(
+        raw: '',
+        command: Command.clearMessage,
+        tags: {'target-msg-id': 'non-existent'},
+      );
+
+      // Should not throw
+      expect(
+        () => IRCMessage.clearMessage(
+          messages: messages,
+          bufferedMessages: bufferedMessages,
+          ircMessage: clearMsg,
+        ),
+        returnsNormally,
+      );
+
+      // All messages should be unchanged
+      expect(
+        messages.every((m) => m.command == Command.privateMessage),
+        isTrue,
+      );
+    });
+  });
+
+  group('IRCMessage.createNotice', () {
+    test('creates notice message with correct properties', () {
+      final notice = IRCMessage.createNotice(message: 'Test notice');
+
+      expect(notice.command, Command.notice);
+      expect(notice.message, 'Test notice');
+      expect(notice.raw, isEmpty);
+      expect(notice.tags, contains('tmi-sent-ts'));
+      expect(notice.tags.length, 1);
+    });
+
+    test('creates notice with action callback', () {
+      var called = false;
+      final notice = IRCMessage.createNotice(
+        message: 'Test',
+        actionCallback: () => called = true,
+        actionLabel: 'Retry',
+      );
+
+      expect(notice.actionCallback, isNotNull);
+      expect(notice.actionLabel, 'Retry');
+      notice.actionCallback!();
+      expect(called, isTrue);
+    });
+  });
+
+  group('ROOMSTATE', () {
+    test('creates default ROOMSTATE', () {
+      const roomstate = ROOMSTATE();
+
+      expect(roomstate.emoteOnly, '0');
+      expect(roomstate.followersOnly, '-1');
+      expect(roomstate.r9k, '0');
+      expect(roomstate.slowMode, '0');
+      expect(roomstate.subMode, '0');
+    });
+
+    test('updates from IRC message', () {
+      const original = ROOMSTATE();
+      final ircMsg = IRCMessage(
+        raw: '',
+        command: Command.roomState,
+        tags: {
+          'emote-only': '1',
+          'followers-only': '10',
+          'slow': '30',
+        },
+      );
+
+      final updated = original.fromIRCMessage(ircMsg);
+
+      expect(updated.emoteOnly, '1');
+      expect(updated.followersOnly, '10');
+      expect(updated.slowMode, '30');
+      // Unchanged values should keep original
+      expect(updated.r9k, '0');
+      expect(updated.subMode, '0');
+    });
+  });
+
+  group('IRCMessage.clearChat — buffered messages', () {
+    test('marks buffered messages from banned user', () {
+      final messages = <IRCMessage>[];
+      final bufferedMessages = [
+        IRCMessage(
+          raw: '',
+          command: Command.privateMessage,
+          tags: {'id': 'buf-1'},
+          user: 'banneduser',
+          message: 'Buffered msg',
+        ),
+        IRCMessage(
+          raw: '',
+          command: Command.privateMessage,
+          tags: {'id': 'buf-2'},
+          user: 'innocentuser',
+          message: 'Other msg',
+        ),
+      ];
+
+      final clearChatMsg = IRCMessage(
+        raw: '',
+        command: Command.clearChat,
+        tags: {'ban-duration': '600'},
+        message: 'banneduser',
+      );
+
+      IRCMessage.clearChat(
+        messages: messages,
+        bufferedMessages: bufferedMessages,
+        ircMessage: clearChatMsg,
+      );
+
+      expect(bufferedMessages[0].command, Command.clearChat);
+      expect(bufferedMessages[0].tags['ban-duration'], '600');
+      expect(bufferedMessages[1].command, Command.privateMessage);
+    });
+
+    test('full chat clear also clears buffered messages', () {
+      final messages = [
+        IRCMessage(
+          raw: '',
+          command: Command.privateMessage,
+          tags: {},
+          message: 'msg',
+        ),
+      ];
+      final bufferedMessages = [
+        IRCMessage(
+          raw: '',
+          command: Command.privateMessage,
+          tags: {},
+          message: 'buffered',
+        ),
+      ];
+
+      final clearAllMsg = IRCMessage(
+        raw: '',
+        command: Command.clearChat,
+        tags: {},
+      );
+
+      IRCMessage.clearChat(
+        messages: messages,
+        bufferedMessages: bufferedMessages,
+        ircMessage: clearAllMsg,
+      );
+
+      expect(bufferedMessages, isEmpty);
+    });
+  });
+
+  group('IRCMessage.clearMessage — buffered messages', () {
+    test('marks buffered message by ID', () {
+      final messages = <IRCMessage>[];
+      final bufferedMessages = [
+        IRCMessage(
+          raw: '',
+          command: Command.privateMessage,
+          tags: {'id': 'buf-target'},
+          user: 'someuser',
+          message: 'To be deleted',
+        ),
+      ];
+
+      final clearMsg = IRCMessage(
+        raw: '',
+        command: Command.clearMessage,
+        tags: {'target-msg-id': 'buf-target'},
+      );
+
+      IRCMessage.clearMessage(
+        messages: messages,
+        bufferedMessages: bufferedMessages,
+        ircMessage: clearMsg,
+      );
+
+      expect(bufferedMessages.first.command, Command.clearMessage);
+    });
+  });
+
+  group('IRCMessage edge cases', () {
+    test('parses message with empty body', () {
+      final msg = IRCMessage.fromString(messageEmptyBody);
+
+      expect(msg.command, Command.privateMessage);
+      // Empty trailing content after the colon
+      expect(msg.message, isEmpty);
+    });
+
+    test('parses emote-only message', () {
+      final msg = IRCMessage.fromString(messageOnlyEmotes);
+
+      expect(msg.command, Command.privateMessage);
+      expect(msg.message, 'Kappa Kappa');
+      expect(msg.localEmotes, isNotNull);
+      expect(msg.localEmotes!.containsKey('Kappa'), isTrue);
+    });
+
+    test('returns Command.none for a truncated line without a command', () {
+      // A malformed/truncated line (e.g. from the recent-messages history API)
+      // whose message section is a single token used to throw a RangeError on
+      // splitMessage[1]. It must now parse safely as a none command.
+      final msg = IRCMessage.fromString('@historical=1 :justaprefix');
+
+      expect(msg.command, Command.none);
+      expect(msg.tags['historical'], '1');
+    });
+
+    test('returns Command.none for a line with no separating space', () {
+      // No space means there are no tags to slice and no body to parse; must
+      // not throw on the substring/split calls.
+      final msg = IRCMessage.fromString('@onlytags');
+
+      expect(msg.command, Command.none);
+    });
+  });
+
+  group('USERSTATE', () {
+    test('creates default USERSTATE', () {
+      const userstate = USERSTATE();
+
+      expect(userstate.color, '');
+      expect(userstate.displayName, '');
+      expect(userstate.mod, isFalse);
+      expect(userstate.subscriber, isFalse);
+    });
+
+    test('updates from IRC message', () {
+      const original = USERSTATE();
+      final ircMsg = IRCMessage(
+        raw: '@color=#FF0000;display-name=TestUser;mod=1;subscriber=1',
+        command: Command.userState,
+        tags: {
+          'color': '#FF0000',
+          'display-name': 'TestUser',
+          'mod': '1',
+          'subscriber': '1',
+        },
+      );
+
+      final updated = original.fromIRCMessage(ircMsg);
+
+      expect(updated.color, '#FF0000');
+      expect(updated.displayName, 'TestUser');
+      expect(updated.mod, isTrue);
+      expect(updated.subscriber, isTrue);
+    });
+
+    test('mod=0 is false', () {
+      const original = USERSTATE();
+      final ircMsg = IRCMessage(
+        raw: '',
+        command: Command.userState,
+        tags: {'mod': '0'},
+      );
+
+      final updated = original.fromIRCMessage(ircMsg);
+      expect(updated.mod, isFalse);
+    });
+
+    test('missing mod and subscriber tags are false', () {
+      const original = USERSTATE();
+      final ircMsg = IRCMessage(
+        raw: '',
+        command: Command.userState,
+        tags: {'display-name': 'TestUser'},
+      );
+
+      final updated = original.fromIRCMessage(ircMsg);
+      expect(updated.mod, isFalse);
+      expect(updated.subscriber, isFalse);
+    });
+  });
+}
diff --git a/test/models/playback_access_token_test.dart b/test/models/playback_access_token_test.dart
new file mode 100644
index 00000000..fb09a3fa
--- /dev/null
+++ b/test/models/playback_access_token_test.dart
@@ -0,0 +1,78 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/playback_access_token.dart';
+
+Map<String, dynamic> gqlResponse({required String value, String sig = 'sig'}) =>
+    {
+      'data': {
+        'streamPlaybackAccessToken': {'value': value, 'signature': sig},
+      },
+    };
+
+void main() {
+  group('PlaybackAccessToken.fromGqlResponse', () {
+    test('parses hide_ads and restricted bitrates from token payload', () {
+      final value = jsonEncode({
+        'hide_ads': true,
+        'chansub': {
+          'restricted_bitrates': [
+            '1080p60',
+            '720p60',
+            'chunked',
+            'archives',
+            'sub_archives',
+            'live',
+            'audio_only',
+          ],
+        },
+      });
+
+      final token = PlaybackAccessToken.fromGqlResponse(
+        gqlResponse(value: value),
+      );
+
+      expect(token.value, value);
+      expect(token.signature, 'sig');
+      expect(token.hideAds, isTrue);
+      // chunked/archives/sub_archives/live are playlist-internal names, not
+      // real qualities; names merely containing those words must survive.
+      expect(token.restrictedQualities, [
+        '1080p60',
+        '720p60',
+        'audio_only',
+      ]);
+    });
+
+    test('does not filter qualities that merely contain reserved words', () {
+      final value = jsonEncode({
+        'chansub': {
+          'restricted_bitrates': ['1080p60_live', 'olive', 'rearchives'],
+        },
+      });
+
+      final token = PlaybackAccessToken.fromGqlResponse(
+        gqlResponse(value: value),
+      );
+
+      expect(token.restrictedQualities, ['1080p60_live', 'olive', 'rearchives']);
+    });
+
+    test('survives a non-JSON token payload', () {
+      final token = PlaybackAccessToken.fromGqlResponse(
+        gqlResponse(value: 'not-json'),
+      );
+
+      expect(token.value, 'not-json');
+      expect(token.hideAds, isFalse);
+      expect(token.restrictedQualities, isEmpty);
+    });
+
+    test('throws FormatException when token is missing', () {
+      expect(
+        () => PlaybackAccessToken.fromGqlResponse({'data': null}),
+        throwsFormatException,
+      );
+    });
+  });
+}
diff --git a/test/models/shared_chat_session_test.dart b/test/models/shared_chat_session_test.dart
new file mode 100644
index 00000000..d3d5c0a0
--- /dev/null
+++ b/test/models/shared_chat_session_test.dart
@@ -0,0 +1,41 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/shared_chat_session.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  group('SharedChatSession', () {
+    test('fromJson deserializes all fields', () {
+      final session = SharedChatSession.fromJson(
+        (twitchSharedChatSessionResponse['data']! as List).first
+            as Map<String, dynamic>,
+      );
+
+      expect(session.sessionId, 'session_123');
+      expect(session.hostBroadcasterId, '12345');
+      expect(session.participants.length, 2);
+      expect(session.createdAt, '2024-01-01T00:00:00Z');
+      expect(session.updatedAt, '2024-01-01T01:00:00Z');
+    });
+  });
+
+  group('Participant', () {
+    test('fromJson deserializes broadcaster_id', () {
+      final participant = Participant.fromJson(const {
+        'broadcaster_id': '67890',
+      });
+
+      expect(participant.broadcasterId, '67890');
+    });
+
+    test('participants from shared chat session are correct', () {
+      final session = SharedChatSession.fromJson(
+        (twitchSharedChatSessionResponse['data']! as List).first
+            as Map<String, dynamic>,
+      );
+
+      expect(session.participants[0].broadcasterId, '12345');
+      expect(session.participants[1].broadcasterId, '67890');
+    });
+  });
+}
diff --git a/test/models/stream_test.dart b/test/models/stream_test.dart
new file mode 100644
index 00000000..76ef1105
--- /dev/null
+++ b/test/models/stream_test.dart
@@ -0,0 +1,45 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/stream.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  group('StreamTwitch', () {
+    test('fromJson deserializes snake_case fields', () {
+      final stream = StreamTwitch.fromJson(
+        (twitchStreamResponse['data']! as List).first as Map<String, dynamic>,
+      );
+
+      expect(stream.userId, '12345');
+      expect(stream.userLogin, 'testuser');
+      expect(stream.userName, 'TestUser');
+      expect(stream.gameId, '509658');
+      expect(stream.gameName, 'Just Chatting');
+      expect(stream.title, 'Test Stream');
+      expect(stream.viewerCount, 1000);
+      expect(stream.startedAt, '2024-01-01T00:00:00Z');
+      expect(stream.thumbnailUrl, 'https://cdn/thumb.jpg');
+    });
+  });
+
+  group('StreamsTwitch', () {
+    test('fromJson deserializes data and pagination', () {
+      final streams = StreamsTwitch.fromJson(
+        twitchStreamResponse as Map<String, dynamic>,
+      );
+
+      expect(streams.data.length, 1);
+      expect(streams.data.first.userName, 'TestUser');
+      expect(streams.pagination['cursor'], 'next_cursor');
+    });
+
+    test('fromJson handles empty data list', () {
+      final streams = StreamsTwitch.fromJson(const {
+        'data': <dynamic>[],
+        'pagination': <String, String>{},
+      });
+
+      expect(streams.data, isEmpty);
+    });
+  });
+}
diff --git a/test/models/user_test.dart b/test/models/user_test.dart
new file mode 100644
index 00000000..d8de1787
--- /dev/null
+++ b/test/models/user_test.dart
@@ -0,0 +1,44 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/models/user.dart';
+
+import '../fixtures/api_responses.dart';
+
+void main() {
+  group('UserTwitch', () {
+    test('fromJson deserializes snake_case fields', () {
+      final user = UserTwitch.fromJson(
+        (twitchUserResponse['data']! as List).first as Map<String, dynamic>,
+      );
+
+      expect(user.id, '12345');
+      expect(user.login, 'testuser');
+      expect(user.displayName, 'TestUser');
+      expect(user.profileImageUrl, 'https://cdn/profile.png');
+    });
+  });
+
+  group('UserBlockedTwitch', () {
+    test('fromJson deserializes snake_case fields', () {
+      final blocked = UserBlockedTwitch.fromJson(
+        (twitchBlockedUsersResponse['data']! as List).first
+            as Map<String, dynamic>,
+      );
+
+      expect(blocked.userId, '99999');
+      expect(blocked.userLogin, 'blockeduser');
+      expect(blocked.displayName, 'BlockedUser');
+    });
+
+    test('fromJson with different values', () {
+      final blocked = UserBlockedTwitch.fromJson(const {
+        'user_id': '11111',
+        'user_login': 'another_blocked',
+        'display_name': 'AnotherBlocked',
+      });
+
+      expect(blocked.userId, '11111');
+      expect(blocked.userLogin, 'another_blocked');
+      expect(blocked.displayName, 'AnotherBlocked');
+    });
+  });
+}
diff --git a/test/regex_test.dart b/test/regex_test.dart
new file mode 100644
index 00000000..d97486ce
--- /dev/null
+++ b/test/regex_test.dart
@@ -0,0 +1,343 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/constants.dart';
+import 'package:frosty/models/irc.dart';
+
+void main() {
+  group('regexLink', () {
+    group('URL matching', () {
+      test('matches HTTPS URLs', () {
+        expect(regexLink.hasMatch('https://twitch.tv'), isTrue);
+        expect(regexLink.hasMatch('https://www.twitch.tv'), isTrue);
+        expect(regexLink.hasMatch('https://example.com/path'), isTrue);
+        expect(regexLink.hasMatch('https://sub.domain.com'), isTrue);
+      });
+
+      test('matches HTTP URLs', () {
+        expect(regexLink.hasMatch('http://example.com'), isTrue);
+        expect(regexLink.hasMatch('http://www.example.com'), isTrue);
+      });
+
+      test('matches URLs without protocol', () {
+        expect(regexLink.hasMatch('twitch.tv'), isTrue);
+        expect(regexLink.hasMatch('www.twitch.tv'), isTrue);
+        expect(regexLink.hasMatch('example.com'), isTrue);
+      });
+
+      test('matches URLs with paths', () {
+        expect(regexLink.hasMatch('twitch.tv/channel'), isTrue);
+        expect(regexLink.hasMatch('example.com/path/to/page'), isTrue);
+        expect(regexLink.hasMatch('github.com/user/repo'), isTrue);
+      });
+
+      test('matches URLs with query strings', () {
+        expect(regexLink.hasMatch('example.com?query=value'), isTrue);
+        expect(regexLink.hasMatch('example.com/path?foo=bar&baz=qux'), isTrue);
+      });
+
+      test('matches URLs with ports', () {
+        // Note: localhost without a TLD doesn't match (requires domain.tld format)
+        expect(regexLink.hasMatch('localhost:3000'), isFalse);
+        expect(regexLink.hasMatch('example.com:8080/path'), isTrue);
+        expect(regexLink.hasMatch('sub.example.com:8080'), isTrue);
+      });
+
+      test('matches URLs with hash fragments', () {
+        expect(regexLink.hasMatch('example.com#section'), isTrue);
+        expect(regexLink.hasMatch('example.com/page#anchor'), isTrue);
+      });
+
+      test('matches various TLDs', () {
+        expect(regexLink.hasMatch('example.co'), isTrue);
+        expect(regexLink.hasMatch('example.io'), isTrue);
+        expect(regexLink.hasMatch('example.dev'), isTrue);
+        expect(regexLink.hasMatch('example.org'), isTrue);
+        expect(regexLink.hasMatch('example.net'), isTrue);
+      });
+
+      test('matches international TLDs', () {
+        expect(regexLink.hasMatch('example.co.uk'), isTrue);
+        expect(regexLink.hasMatch('example.com.br'), isTrue);
+      });
+    });
+
+    group('file name matching', () {
+      test('matches common image files', () {
+        expect(regexLink.hasMatch('image.png'), isTrue);
+        expect(regexLink.hasMatch('photo.jpg'), isTrue);
+        expect(regexLink.hasMatch('photo.jpeg'), isTrue);
+        expect(regexLink.hasMatch('animation.gif'), isTrue);
+        expect(regexLink.hasMatch('bitmap.bmp'), isTrue);
+        expect(regexLink.hasMatch('modern.webp'), isTrue);
+      });
+
+      test('matches video and archive files', () {
+        expect(regexLink.hasMatch('video.mp4'), isTrue);
+        expect(regexLink.hasMatch('movie.avi'), isTrue);
+        expect(regexLink.hasMatch('archive.zip'), isTrue);
+        expect(regexLink.hasMatch('archive.rar'), isTrue);
+      });
+
+      test('matches document and executable files', () {
+        expect(regexLink.hasMatch('document.pdf'), isTrue);
+        expect(regexLink.hasMatch('program.exe'), isTrue);
+      });
+
+      test('handles filenames with underscores and hyphens', () {
+        expect(regexLink.hasMatch('my_image.png'), isTrue);
+        expect(regexLink.hasMatch('my-image.png'), isTrue);
+        expect(regexLink.hasMatch('my_cool-image_v2.jpg'), isTrue);
+      });
+    });
+
+    group('non-matching cases', () {
+      test('does not match plain text', () {
+        expect(regexLink.hasMatch('hello world'), isFalse);
+        expect(regexLink.hasMatch('just some text'), isFalse);
+      });
+
+      test('does not match words ending with common extensions', () {
+        // These should NOT match as they're not file patterns
+        expect(regexLink.hasMatch('testing'), isFalse);
+        expect(regexLink.hasMatch('running'), isFalse);
+      });
+
+      test('does not match single words without TLD', () {
+        expect(regexLink.hasMatch('example'), isFalse);
+        expect(regexLink.hasMatch('localhost'), isFalse);
+      });
+
+      test('matches domain part of email addresses', () {
+        // The regex matches the domain portion (example.com) within an email
+        // This is expected behavior — the regex is for URLs, not email filtering
+        expect(regexLink.hasMatch('user@example.com'), isTrue);
+      });
+    });
+
+    group('boundary handling', () {
+      test('matches URLs in sentences', () {
+        final text = 'Check out twitch.tv/channel for more';
+        expect(regexLink.hasMatch(text), isTrue);
+
+        final match = regexLink.firstMatch(text);
+        expect(match?.group(0), 'twitch.tv/channel');
+      });
+
+      test('handles URLs at start of string', () {
+        final match = regexLink.firstMatch('example.com is a website');
+        expect(match?.group(0), 'example.com');
+      });
+
+      test('handles URLs at end of string', () {
+        final match = regexLink.firstMatch('Visit example.com');
+        expect(match?.group(0), 'example.com');
+      });
+    });
+  });
+
+  group('regexEmoji', () {
+    group('matching emojis', () {
+      test('matches basic smileys', () {
+        expect(regexEmoji.hasMatch('😀'), isTrue);
+        expect(regexEmoji.hasMatch('😃'), isTrue);
+        expect(regexEmoji.hasMatch('😄'), isTrue);
+        expect(regexEmoji.hasMatch('🙂'), isTrue);
+        expect(regexEmoji.hasMatch('😊'), isTrue);
+      });
+
+      test('matches celebration emojis', () {
+        expect(regexEmoji.hasMatch('🎉'), isTrue);
+        expect(regexEmoji.hasMatch('🎊'), isTrue);
+        expect(regexEmoji.hasMatch('🎁'), isTrue);
+      });
+
+      test('matches hand gestures', () {
+        expect(regexEmoji.hasMatch('👍'), isTrue);
+        expect(regexEmoji.hasMatch('👎'), isTrue);
+        expect(regexEmoji.hasMatch('👏'), isTrue);
+        expect(regexEmoji.hasMatch('🙌'), isTrue);
+      });
+
+      test('matches heart emojis', () {
+        expect(regexEmoji.hasMatch('❤️'), isTrue);
+        expect(regexEmoji.hasMatch('💙'), isTrue);
+        expect(regexEmoji.hasMatch('💚'), isTrue);
+        expect(regexEmoji.hasMatch('💛'), isTrue);
+      });
+
+      test('matches nature emojis', () {
+        expect(regexEmoji.hasMatch('🌟'), isTrue);
+        expect(regexEmoji.hasMatch('⭐'), isTrue);
+        expect(regexEmoji.hasMatch('🌈'), isTrue);
+        expect(regexEmoji.hasMatch('☀️'), isTrue);
+      });
+
+      test('matches flag emojis', () {
+        expect(regexEmoji.hasMatch('🇺🇸'), isTrue);
+        expect(regexEmoji.hasMatch('🇬🇧'), isTrue);
+        expect(regexEmoji.hasMatch('🇯🇵'), isTrue);
+      });
+
+      test('matches symbol emojis', () {
+        expect(regexEmoji.hasMatch('✅'), isTrue);
+        expect(regexEmoji.hasMatch('❌'), isTrue);
+        expect(regexEmoji.hasMatch('⚠️'), isTrue);
+      });
+    });
+
+    group('non-matching cases', () {
+      test('does not match regular ASCII text', () {
+        expect(regexEmoji.hasMatch('hello'), isFalse);
+        expect(regexEmoji.hasMatch('world'), isFalse);
+        expect(regexEmoji.hasMatch('test123'), isFalse);
+      });
+
+      test('does not match numbers', () {
+        expect(regexEmoji.hasMatch('123'), isFalse);
+        expect(regexEmoji.hasMatch('456789'), isFalse);
+      });
+
+      test('does not match punctuation', () {
+        expect(regexEmoji.hasMatch('!@#'), isFalse);
+        expect(regexEmoji.hasMatch('...'), isFalse);
+        expect(regexEmoji.hasMatch('???'), isFalse);
+      });
+
+      test('does not match basic ASCII symbols', () {
+        expect(regexEmoji.hasMatch(':)'), isFalse);
+        expect(regexEmoji.hasMatch(':('), isFalse);
+        expect(regexEmoji.hasMatch(':D'), isFalse);
+      });
+    });
+
+    group('extracting emojis from text', () {
+      test('extracts emoji from mixed text', () {
+        const text = 'Hello 😀 World';
+        final matches = regexEmoji.allMatches(text);
+        expect(matches.length, 1);
+        expect(matches.first.group(0), '😀');
+      });
+
+      test('extracts multiple emojis', () {
+        const text = '🎉 Party 🎊 Time 🎁';
+        final matches = regexEmoji.allMatches(text);
+        expect(matches.length, 3);
+      });
+
+      test('handles consecutive emojis', () {
+        const text = '😀😃😄';
+        final matches = regexEmoji.allMatches(text);
+        // Consecutive emojis may be grouped into a single match by the regex
+        expect(matches.length, greaterThanOrEqualTo(1));
+        // Verify all emoji characters are captured
+        final matched = matches.map((m) => m.group(0)).join();
+        expect(matched, text);
+      });
+    });
+  });
+
+  group('regexEnglish', () {
+    test('matches strings with lowercase letters', () {
+      expect(regexEnglish.hasMatch('hello'), isTrue);
+      expect(regexEnglish.hasMatch('abc'), isTrue);
+    });
+
+    test('matches strings with uppercase letters', () {
+      expect(regexEnglish.hasMatch('HELLO'), isTrue);
+      expect(regexEnglish.hasMatch('ABC'), isTrue);
+    });
+
+    test('matches mixed case', () {
+      expect(regexEnglish.hasMatch('HeLLo'), isTrue);
+    });
+
+    test('matches strings containing English letters', () {
+      expect(regexEnglish.hasMatch('テストTest'), isTrue);
+      expect(regexEnglish.hasMatch('123abc456'), isTrue);
+    });
+
+    test('does not match pure numbers', () {
+      expect(regexEnglish.hasMatch('12345'), isFalse);
+    });
+
+    test('does not match non-English alphabets only', () {
+      expect(regexEnglish.hasMatch('テスト'), isFalse);
+      expect(regexEnglish.hasMatch('测试'), isFalse);
+      expect(regexEnglish.hasMatch('тест'), isFalse);
+    });
+
+    test('does not match symbols only', () {
+      expect(regexEnglish.hasMatch(r'!@#$%'), isFalse);
+      expect(regexEnglish.hasMatch('_-+='), isFalse);
+    });
+  });
+
+  group('regexNumbersOnly', () {
+    test('matches numeric-only strings', () {
+      expect(regexNumbersOnly.hasMatch('123'), isTrue);
+      expect(regexNumbersOnly.hasMatch('0'), isTrue);
+      expect(regexNumbersOnly.hasMatch('999999'), isTrue);
+    });
+
+    test('does not match strings with letters', () {
+      expect(regexNumbersOnly.hasMatch('123abc'), isFalse);
+      expect(regexNumbersOnly.hasMatch('abc123'), isFalse);
+      expect(regexNumbersOnly.hasMatch('12a34'), isFalse);
+    });
+
+    test('does not match strings with symbols', () {
+      expect(regexNumbersOnly.hasMatch('12.34'), isFalse);
+      expect(regexNumbersOnly.hasMatch('12-34'), isFalse);
+      expect(regexNumbersOnly.hasMatch('12_34'), isFalse);
+    });
+
+    test('does not match empty string', () {
+      expect(regexNumbersOnly.hasMatch(''), isFalse);
+    });
+
+    test('does not match strings with spaces', () {
+      expect(regexNumbersOnly.hasMatch('123 456'), isFalse);
+      expect(regexNumbersOnly.hasMatch(' 123'), isFalse);
+    });
+  });
+
+  group('zeroWidthEmotes constant', () {
+    test('contains all expected zero-width BTTV emotes', () {
+      expect(zeroWidthEmotes, contains('SoSnowy'));
+      expect(zeroWidthEmotes, contains('IceCold'));
+      expect(zeroWidthEmotes, contains('SantaHat'));
+      expect(zeroWidthEmotes, contains('TopHat'));
+      expect(zeroWidthEmotes, contains('ReinDeer'));
+      expect(zeroWidthEmotes, contains('CandyCane'));
+      expect(zeroWidthEmotes, contains('cvMask'));
+      expect(zeroWidthEmotes, contains('cvHazmat'));
+    });
+
+    test('has expected count', () {
+      expect(zeroWidthEmotes.length, 8);
+    });
+  });
+
+  group('chatColorNames and chatColorValues', () {
+    test('all color names have corresponding values', () {
+      for (final name in chatColorNames) {
+        expect(chatColorValues.containsKey(name), isTrue,
+            reason: '$name should have a color value');
+      }
+    });
+
+    test('contains expected colors', () {
+      expect(chatColorNames, contains('blue'));
+      expect(chatColorNames, contains('red'));
+      expect(chatColorNames, contains('green'));
+      expect(chatColorNames, contains('hot_pink'));
+      expect(chatColorNames, contains('golden_rod'));
+    });
+
+    test('color values are non-null', () {
+      for (final entry in chatColorValues.entries) {
+        expect(entry.value, isNotNull,
+            reason: '${entry.key} should have a valid color');
+      }
+    });
+  });
+}
diff --git a/test/screens/channel/chat/banned_user_tracker_test.dart b/test/screens/channel/chat/banned_user_tracker_test.dart
new file mode 100644
index 00000000..32093682
--- /dev/null
+++ b/test/screens/channel/chat/banned_user_tracker_test.dart
@@ -0,0 +1,49 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/screens/channel/chat/stores/banned_user_tracker.dart';
+
+void main() {
+  late BannedUserTracker tracker;
+  final now = DateTime(2026, 6, 28, 12);
+  setUp(() => tracker = BannedUserTracker());
+
+  test('an untracked user is not banned', () {
+    expect(tracker.isBannedOrTimedOut('1', now), isFalse);
+  });
+
+  test('a banned user stays banned (no expiry)', () {
+    tracker.recordBan('1');
+    expect(tracker.isBannedOrTimedOut('1', now), isTrue);
+    expect(
+      tracker.isBannedOrTimedOut('1', now.add(const Duration(days: 365))),
+      isTrue,
+    );
+  });
+
+  test('a timed-out user is banned until the timeout expires', () {
+    tracker.recordTimeout('1', const Duration(seconds: 60), now);
+    expect(tracker.isBannedOrTimedOut('1', now), isTrue);
+    expect(
+      tracker.isBannedOrTimedOut('1', now.add(const Duration(seconds: 59))),
+      isTrue,
+    );
+    expect(
+      tracker.isBannedOrTimedOut('1', now.add(const Duration(seconds: 61))),
+      isFalse,
+    );
+  });
+
+  test('clear lifts a ban', () {
+    tracker.recordBan('1');
+    tracker.clear('1');
+    expect(tracker.isBannedOrTimedOut('1', now), isFalse);
+  });
+
+  test('a later permanent ban overrides an earlier timeout', () {
+    tracker.recordTimeout('1', const Duration(seconds: 10), now);
+    tracker.recordBan('1');
+    expect(
+      tracker.isBannedOrTimedOut('1', now.add(const Duration(seconds: 30))),
+      isTrue,
+    );
+  });
+}
diff --git a/test/screens/channel/chat/chat_interaction_pause_test.dart b/test/screens/channel/chat/chat_interaction_pause_test.dart
new file mode 100644
index 00000000..f535c5a4
--- /dev/null
+++ b/test/screens/channel/chat/chat_interaction_pause_test.dart
@@ -0,0 +1,86 @@
+import 'package:flutter/gestures.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/screens/channel/chat/stores/chat_interaction_pause.dart';
+
+void main() {
+  late ChatInteractionPause pause;
+
+  setUp(() => pause = ChatInteractionPause());
+
+  // A move clearly past the touch slop (a scroll), and one well within it.
+  final beyondSlop = Offset(0, kTouchSlop + 10);
+  final withinSlop = Offset(0, kTouchSlop - 5);
+
+  test('is not paused initially', () {
+    expect(pause.isPaused, isFalse);
+  });
+
+  test('is paused while a stationary pointer is down (long-press candidate)', () {
+    pause.pointerDown(1, Offset.zero);
+
+    expect(pause.isPaused, isTrue);
+  });
+
+  test('resumes once the pointer is lifted', () {
+    pause.pointerDown(1, Offset.zero);
+    pause.pointerUp(1);
+
+    expect(pause.isPaused, isFalse);
+  });
+
+  test('resumes when the pointer moves beyond the touch slop (scrolling)', () {
+    pause.pointerDown(1, Offset.zero);
+    pause.pointerMove(1, beyondSlop);
+
+    // The finger is dragging — this is a scroll, not a hold, so the chat must
+    // keep flowing rather than freeze.
+    expect(pause.isPaused, isFalse);
+  });
+
+  test('stays paused for tiny jitter within the touch slop', () {
+    pause.pointerDown(1, Offset.zero);
+    pause.pointerMove(1, withinSlop);
+
+    expect(pause.isPaused, isTrue);
+  });
+
+  test('stays resumed for the rest of the gesture even if the finger drifts '
+      'back within slop', () {
+    pause.pointerDown(1, Offset.zero);
+    pause.pointerMove(1, beyondSlop);
+    pause.pointerMove(1, withinSlop);
+
+    // Once a gesture is recognized as a scroll it should not flip back to a
+    // hold mid-drag.
+    expect(pause.isPaused, isFalse);
+  });
+
+  test('stays paused until every stationary pointer lifts (multi-touch)', () {
+    pause.pointerDown(1, Offset.zero);
+    pause.pointerDown(2, Offset.zero);
+    pause.pointerUp(1);
+
+    expect(pause.isPaused, isTrue);
+
+    pause.pointerUp(2);
+    expect(pause.isPaused, isFalse);
+  });
+
+  test('a stray pointer-up never leaves the gate stuck', () {
+    pause.pointerUp(99);
+
+    expect(pause.isPaused, isFalse);
+
+    pause.pointerDown(1, Offset.zero);
+    expect(pause.isPaused, isTrue);
+  });
+
+  test('reset clears all active pointers', () {
+    pause.pointerDown(1, Offset.zero);
+    pause.pointerDown(2, Offset.zero);
+
+    pause.reset();
+
+    expect(pause.isPaused, isFalse);
+  });
+}
diff --git a/test/screens/channel/chat/shared_chat_bubble_state_test.dart b/test/screens/channel/chat/shared_chat_bubble_state_test.dart
new file mode 100644
index 00000000..65a2b927
--- /dev/null
+++ b/test/screens/channel/chat/shared_chat_bubble_state_test.dart
@@ -0,0 +1,57 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/screens/channel/chat/stores/shared_chat_bubble_state.dart';
+
+void main() {
+  late SharedChatBubbleState state;
+  setUp(() => state = SharedChatBubbleState());
+
+  test('a channel is neither focused nor hidden by default', () {
+    expect(state.isFocused('1'), isFalse);
+    expect(state.isHidden('1'), isFalse);
+  });
+
+  test('toggleFocus spotlights an unfocused channel', () {
+    state.toggleFocus('1');
+    expect(state.isFocused('1'), isTrue);
+  });
+
+  test('toggleFocus un-spotlights an already-focused channel', () {
+    state.toggleFocus('1');
+    state.toggleFocus('1');
+    expect(state.isFocused('1'), isFalse);
+  });
+
+  test('multiple channels can be spotlighted at once', () {
+    state.toggleFocus('1');
+    state.toggleFocus('2');
+    expect(state.isFocused('1'), isTrue);
+    expect(state.isFocused('2'), isTrue);
+  });
+
+  test('hide filters a channel and drops it from the spotlight', () {
+    state.toggleFocus('1');
+    state.hide('1');
+    expect(state.isHidden('1'), isTrue);
+    expect(state.isFocused('1'), isFalse);
+  });
+
+  test('toggleFocus is a no-op for a hidden channel', () {
+    state.hide('1');
+    state.toggleFocus('1');
+    expect(state.isFocused('1'), isFalse);
+  });
+
+  test('show lifts a hide', () {
+    state.hide('1');
+    state.show('1');
+    expect(state.isHidden('1'), isFalse);
+  });
+
+  test('reset clears both focused and hidden channels', () {
+    state.toggleFocus('1');
+    state.hide('2');
+    state.reset();
+    expect(state.isFocused('1'), isFalse);
+    expect(state.isHidden('2'), isFalse);
+  });
+}
diff --git a/test/screens/channel/video/chat_latency_sync_test.dart b/test/screens/channel/video/chat_latency_sync_test.dart
new file mode 100644
index 00000000..6d9a49fb
--- /dev/null
+++ b/test/screens/channel/video/chat_latency_sync_test.dart
@@ -0,0 +1,111 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/screens/channel/video/chat_latency_sync.dart';
+import 'package:frosty/screens/channel/video/video_timing_constants.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+
+void main() {
+  // Reference the real constant so assertions track config changes rather
+  // than a hardcoded magic number.
+  final tolerance =
+      VideoTimingConstants.chatSyncDriftToleranceSeconds.toDouble();
+
+  late SettingsStore settingsStore;
+  late ChatLatencySync sync;
+
+  setUp(() {
+    settingsStore = SettingsStore.fromJson({});
+    sync = ChatLatencySync(settingsStore: settingsStore);
+  });
+
+  group('ChatLatencySync reset', () {
+    test('zeroes syncedChatDelay when autoSyncChatDelay is enabled', () {
+      settingsStore.autoSyncChatDelay = true;
+      settingsStore.syncedChatDelay = 7.5;
+
+      sync.reset();
+
+      expect(settingsStore.syncedChatDelay, 0.0);
+    });
+
+    test('is a no-op when autoSyncChatDelay is disabled', () {
+      settingsStore.autoSyncChatDelay = false;
+      settingsStore.syncedChatDelay = 7.5;
+
+      sync.reset();
+
+      expect(settingsStore.syncedChatDelay, 7.5);
+    });
+  });
+
+  group('ChatLatencySync report', () {
+    test('does nothing when autoSyncChatDelay is disabled', () {
+      settingsStore.autoSyncChatDelay = false;
+      settingsStore.syncedChatDelay = 0.0;
+
+      sync.report(12.0);
+
+      expect(settingsStore.syncedChatDelay, 0.0);
+    });
+
+    test('writes the first measurement when current delay is zero', () {
+      settingsStore.autoSyncChatDelay = true;
+      settingsStore.syncedChatDelay = 0.0;
+
+      // Even a tiny value writes because the current value is exactly 0.
+      sync.report(0.5);
+
+      expect(settingsStore.syncedChatDelay, 0.5);
+    });
+
+    test('writes when drift exceeds the tolerance', () {
+      settingsStore.autoSyncChatDelay = true;
+      settingsStore.syncedChatDelay = 5.0;
+
+      final report = 5.0 + tolerance + 1.0;
+      sync.report(report);
+
+      expect(settingsStore.syncedChatDelay, report);
+    });
+
+    test('does not write when drift is within the tolerance', () {
+      settingsStore.autoSyncChatDelay = true;
+      settingsStore.syncedChatDelay = 5.0;
+
+      // Strictly inside the tolerance band.
+      sync.report(5.0 + (tolerance - 0.5));
+
+      expect(settingsStore.syncedChatDelay, 5.0);
+    });
+
+    test('does not write when drift is exactly at the tolerance', () {
+      settingsStore.autoSyncChatDelay = true;
+      settingsStore.syncedChatDelay = 5.0;
+
+      // The code uses strictly-greater-than (`>`), so a drift equal to the
+      // tolerance must NOT write.
+      sync.report(5.0 + tolerance);
+
+      expect(settingsStore.syncedChatDelay, 5.0);
+    });
+
+    test('writes when drift just exceeds the tolerance', () {
+      settingsStore.autoSyncChatDelay = true;
+      settingsStore.syncedChatDelay = 5.0;
+
+      final report = 5.0 + tolerance + 0.1;
+      sync.report(report);
+
+      expect(settingsStore.syncedChatDelay, report);
+    });
+
+    test('writes when a downward drift exceeds the tolerance', () {
+      settingsStore.autoSyncChatDelay = true;
+      settingsStore.syncedChatDelay = 10.0;
+
+      final report = 10.0 - tolerance - 1.0;
+      sync.report(report);
+
+      expect(settingsStore.syncedChatDelay, report);
+    });
+  });
+}
diff --git a/test/screens/channel/video/playback_error_recovery_test.dart b/test/screens/channel/video/playback_error_recovery_test.dart
new file mode 100644
index 00000000..adc80903
--- /dev/null
+++ b/test/screens/channel/video/playback_error_recovery_test.dart
@@ -0,0 +1,56 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/screens/channel/video/playback_error_recovery.dart';
+import 'package:frosty/screens/channel/video/video_timing_constants.dart';
+
+void main() {
+  group('shouldAutoRecoverFromPlayerError', () {
+    test('recovers Source error / generic failures under the refresh cap', () {
+      expect(
+        shouldAutoRecoverFromPlayerError(refreshCapReached: false),
+        isTrue,
+      );
+      expect(
+        shouldAutoRecoverFromPlayerError(
+          refreshCapReached: false,
+          errorCode: null,
+        ),
+        isTrue,
+      );
+    });
+
+    test('stops once the refresh cap is reached', () {
+      expect(
+        shouldAutoRecoverFromPlayerError(refreshCapReached: true),
+        isFalse,
+      );
+    });
+
+    test('defers mediaServicesWereReset to its dedicated rebuild path', () {
+      expect(
+        shouldAutoRecoverFromPlayerError(
+          refreshCapReached: false,
+          errorCode: 'mediaServicesWereReset',
+        ),
+        isFalse,
+      );
+    });
+  });
+
+  group('playerErrorRetryDelay', () {
+    test('refreshes 4xx token failures immediately', () {
+      expect(playerErrorRetryDelay(statusCode: 403), Duration.zero);
+      expect(playerErrorRetryDelay(statusCode: 404), Duration.zero);
+    });
+
+    test('waits briefly for network / Source errors without status', () {
+      expect(
+        playerErrorRetryDelay(),
+        VideoTimingConstants.initRetryDelay,
+      );
+      expect(
+        playerErrorRetryDelay(statusCode: 500),
+        VideoTimingConstants.initRetryDelay,
+      );
+    });
+  });
+}
diff --git a/test/screens/channel/video/stream_info_poller_test.dart b/test/screens/channel/video/stream_info_poller_test.dart
new file mode 100644
index 00000000..935a98ad
--- /dev/null
+++ b/test/screens/channel/video/stream_info_poller_test.dart
@@ -0,0 +1,194 @@
+import 'dart:async';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/models/channel.dart';
+import 'package:frosty/models/stream.dart';
+import 'package:frosty/screens/channel/video/stream_info_poller.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../../../fixtures/api_responses.dart';
+
+class MockTwitchApi extends Mock implements TwitchApi {}
+
+void main() {
+  const userLogin = 'testuser';
+  const userId = '12345';
+
+  late MockTwitchApi api;
+
+  // Fresh fixtures per test so nothing leaks between cases.
+  StreamTwitch buildStream() => StreamTwitch.fromJson(
+    (twitchStreamResponse['data']! as List).first as Map<String, dynamic>,
+  );
+
+  Channel buildChannel() => Channel.fromJson(
+    (twitchChannelResponse['data']! as List).first as Map<String, dynamic>,
+  );
+
+  // Fresh poller per test so _lastUpdate / _inFlight debounce state never
+  // carries over between tests.
+  StreamInfoPoller buildPoller() =>
+      StreamInfoPoller(twitchApi: api, userLogin: userLogin, userId: userId);
+
+  setUp(() {
+    api = MockTwitchApi();
+  });
+
+  group('live', () {
+    test('returns stream when getStream succeeds', () async {
+      when(
+        () => api.getStream(userLogin: any(named: 'userLogin')),
+      ).thenAnswer((_) async => buildStream());
+
+      final poller = buildPoller();
+      final result = await poller.fetch();
+
+      expect(result, isNotNull);
+      expect(result!.stream, isNotNull);
+      expect(result.stream!.userName, 'TestUser');
+      expect(result.offlineChannel, isNull);
+
+      verify(() => api.getStream(userLogin: userLogin)).called(1);
+      verifyNever(() => api.getChannel(userId: any(named: 'userId')));
+    });
+  });
+
+  group('debounce', () {
+    test(
+      'second fetch within debounce window returns null, forceUpdate bypasses',
+      () async {
+        when(
+          () => api.getStream(userLogin: any(named: 'userLogin')),
+        ).thenAnswer((_) async => buildStream());
+
+        final poller = buildPoller();
+
+        // First fetch resolves with a real result.
+        final first = await poller.fetch();
+        expect(first, isNotNull);
+        expect(first!.stream, isNotNull);
+
+        // Immediate second fetch (no forceUpdate) is inside the 5s debounce
+        // window -> debounced -> null.
+        final second = await poller.fetch();
+        expect(second, isNull);
+
+        // forceUpdate bypasses the debounce -> a fresh result.
+        final forced = await poller.fetch(forceUpdate: true);
+        expect(forced, isNotNull);
+        expect(forced!.stream, isNotNull);
+
+        // Two real fetches (first + forced); the debounced one issued no call.
+        verify(() => api.getStream(userLogin: userLogin)).called(2);
+      },
+    );
+  });
+
+  group('in-flight dedup', () {
+    test(
+      'concurrent fetches await the same request and call getStream once',
+      () async {
+        final completer = Completer<StreamTwitch>();
+        when(
+          () => api.getStream(userLogin: any(named: 'userLogin')),
+        ).thenAnswer((_) => completer.future);
+
+        final poller = buildPoller();
+
+        // Fire both without awaiting so the second sees the in-flight future.
+        final firstFuture = poller.fetch();
+        final secondFuture = poller.fetch();
+
+        // Now let the underlying request complete.
+        completer.complete(buildStream());
+
+        final first = await firstFuture;
+        final second = await secondFuture;
+
+        expect(first, isNotNull);
+        expect(second, isNotNull);
+        // Same deduplicated result instance.
+        expect(identical(first, second), isTrue);
+        expect(first!.stream, isNotNull);
+
+        verify(() => api.getStream(userLogin: userLogin)).called(1);
+      },
+    );
+  });
+
+  group('second-chance retry', () {
+    test(
+      'getStream fails once then succeeds on retry -> stream, no getChannel',
+      () async {
+        var calls = 0;
+        when(() => api.getStream(userLogin: any(named: 'userLogin'))).thenAnswer(
+          (_) async {
+            calls++;
+            if (calls == 1) throw Exception('transient drop');
+            return buildStream();
+          },
+        );
+
+        final poller = buildPoller();
+        final result = await poller.fetch();
+
+        expect(result, isNotNull);
+        expect(result!.stream, isNotNull);
+        expect(result.offlineChannel, isNull);
+
+        verify(() => api.getStream(userLogin: userLogin)).called(2);
+        verifyNever(() => api.getChannel(userId: any(named: 'userId')));
+      },
+    );
+  });
+
+  group('offline', () {
+    test(
+      'getStream fails twice, getChannel succeeds -> offlineChannel',
+      () async {
+        when(
+          () => api.getStream(userLogin: any(named: 'userLogin')),
+        ).thenThrow(Exception('offline'));
+        when(
+          () => api.getChannel(userId: any(named: 'userId')),
+        ).thenAnswer((_) async => buildChannel());
+
+        final poller = buildPoller();
+        final result = await poller.fetch();
+
+        expect(result, isNotNull);
+        expect(result!.stream, isNull);
+        expect(result.offlineChannel, isNotNull);
+        expect(result.offlineChannel!.broadcasterName, 'TestUser');
+
+        verify(() => api.getStream(userLogin: userLogin)).called(2);
+        verify(() => api.getChannel(userId: userId)).called(1);
+      },
+    );
+  });
+
+  group('total failure', () {
+    test(
+      'getStream fails twice and getChannel fails -> empty result',
+      () async {
+        when(
+          () => api.getStream(userLogin: any(named: 'userLogin')),
+        ).thenThrow(Exception('stream boom'));
+        when(
+          () => api.getChannel(userId: any(named: 'userId')),
+        ).thenThrow(Exception('channel boom'));
+
+        final poller = buildPoller();
+        final result = await poller.fetch();
+
+        expect(result, isNotNull);
+        expect(result!.stream, isNull);
+        expect(result.offlineChannel, isNull);
+
+        verify(() => api.getStream(userLogin: userLogin)).called(2);
+        verify(() => api.getChannel(userId: userId)).called(1);
+      },
+    );
+  });
+}
diff --git a/test/screens/channel/video/video_timing_constants_test.dart b/test/screens/channel/video/video_timing_constants_test.dart
new file mode 100644
index 00000000..9632ee94
--- /dev/null
+++ b/test/screens/channel/video/video_timing_constants_test.dart
@@ -0,0 +1,159 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/screens/channel/video/video_timing_constants.dart';
+
+/// Regression guard for the cross-layer ordering invariants documented in
+/// [VideoTimingConstants]. These constants are tuned against native code in
+/// two other layers (iOS notification-stall recovery and the Android
+/// VideoPlayerObserver watchdog) that are NOT visible from Dart. If someone
+/// retunes a value past a safe bound, these tests fail with a message quoting
+/// the contract so the regression is self-explanatory.
+void main() {
+  group('VideoTimingConstants stall-timer ordering', () {
+    test(
+      'stallDetectionDelay sits between iOS ~1s recovery and Android 12s watchdog',
+      () {
+        final seconds = VideoTimingConstants.stallDetectionDelay.inSeconds;
+
+        expect(
+          seconds,
+          greaterThan(1),
+          reason:
+              'Contract: 1s < stallDetectionDelay. iOS native notification-stall '
+              'recovery fires at ~1s; the Dart timer must not race ahead of it.',
+        );
+        expect(
+          seconds,
+          lessThan(12),
+          reason:
+              'Contract: stallDetectionDelay < 12s. The Android native watchdog '
+              '(VideoPlayerObserver.kt STALL_WATCHDOG_MS) fires at 12s with a '
+              'heavier stop()/prepare() recovery. Dart\'s attempt-1 seek must '
+              'pre-empt it, so it must fire first.',
+        );
+      },
+    );
+  });
+
+  group('VideoTimingConstants refreshBackoff', () {
+    test('is non-empty and starts at Duration.zero', () {
+      expect(VideoTimingConstants.refreshBackoff, isNotEmpty);
+      expect(
+        VideoTimingConstants.refreshBackoff.first,
+        Duration.zero,
+        reason:
+            'First refresh attempt should be immediate (0 = first attempt per '
+            'the doc comment).',
+      );
+    });
+
+    test('covers every refresh attempt up to maxRefreshAttempts', () {
+      // The comment states attempts beyond the list length fall through to the
+      // error path via [maxRefreshAttempts]. So the list must be long enough to
+      // back off every attempt before that fall-through, i.e. cover all
+      // maxRefreshAttempts attempts.
+      expect(
+        VideoTimingConstants.refreshBackoff.length,
+        greaterThanOrEqualTo(VideoTimingConstants.maxRefreshAttempts),
+        reason:
+            'refreshBackoff must index every attempt up to maxRefreshAttempts '
+            '(${VideoTimingConstants.maxRefreshAttempts}); a shorter list would '
+            'drop a backoff and the attempt would fall through to the error '
+            'path prematurely.',
+      );
+    });
+
+    test('delays are monotonically non-decreasing', () {
+      final backoff = VideoTimingConstants.refreshBackoff;
+      for (var i = 1; i < backoff.length; i++) {
+        expect(
+          backoff[i],
+          greaterThanOrEqualTo(backoff[i - 1]),
+          reason:
+              'Backoff must not shrink between attempts: index $i '
+              '(${backoff[i]}) < index ${i - 1} (${backoff[i - 1]}). '
+              'Later retries should wait at least as long as earlier ones.',
+        );
+      }
+    });
+  });
+
+  group('VideoTimingConstants latency vs chat-sync tolerance', () {
+    test('highLatencyThreshold is much greater than chatSyncDriftTolerance', () {
+      expect(
+        VideoTimingConstants.highLatencyThresholdSeconds,
+        greaterThan(VideoTimingConstants.chatSyncDriftToleranceSeconds),
+        reason:
+            'High-latency intervention (seek/refresh) must only trigger far '
+            'past the chat-sync drift tolerance '
+            '(${VideoTimingConstants.chatSyncDriftToleranceSeconds}s); otherwise '
+            'normal sync drift would be misread as a latency problem and trigger '
+            'recovery.',
+      );
+    });
+
+    test('highLatencyThreshold sits comfortably above normal live latency', () {
+      // Normal live latency is well under ~15s; the threshold must clear that
+      // so routine live playback is never flagged as high-latency.
+      expect(
+        VideoTimingConstants.highLatencyThresholdSeconds,
+        greaterThanOrEqualTo(15),
+        reason:
+            'highLatencyThresholdSeconds must stay above normal live latency '
+            '(under ~15s) so healthy playback is not flagged for recovery.',
+      );
+    });
+  });
+
+  group('VideoTimingConstants short-play loop detection', () {
+    test('shortPlayWindow is positive', () {
+      expect(VideoTimingConstants.shortPlayWindow, greaterThan(Duration.zero));
+    });
+
+    test('shortPlayLoopThreshold is a small positive int', () {
+      expect(
+        VideoTimingConstants.shortPlayLoopThreshold,
+        greaterThan(0),
+        reason: 'Need at least one bounce to detect a failed-recovery loop.',
+      );
+      expect(
+        VideoTimingConstants.shortPlayLoopThreshold,
+        lessThanOrEqualTo(10),
+        reason:
+            'Threshold should stay small so a tailored error surfaces promptly '
+            'rather than after many silent loops.',
+      );
+    });
+  });
+
+  group('VideoTimingConstants overlay ordering', () {
+    test('overlayQuickHide is not slower than overlayAutoHide', () {
+      expect(
+        VideoTimingConstants.overlayQuickHide,
+        lessThanOrEqualTo(VideoTimingConstants.overlayAutoHide),
+        reason:
+            'The quick-hide path must hide the overlay at least as fast as the '
+            'auto-hide path; otherwise "quick" would be slower than the default.',
+      );
+    });
+  });
+
+  group('VideoTimingConstants positive intervals', () {
+    test('nativeStreamInfoInterval is positive', () {
+      expect(
+        VideoTimingConstants.nativeStreamInfoInterval,
+        greaterThan(Duration.zero),
+      );
+    });
+
+    test('latencyPollingInterval is positive', () {
+      expect(
+        VideoTimingConstants.latencyPollingInterval,
+        greaterThan(Duration.zero),
+      );
+    });
+
+    test('maxRefreshAttempts is positive', () {
+      expect(VideoTimingConstants.maxRefreshAttempts, greaterThan(0));
+    });
+  });
+}
diff --git a/test/screens/home/stream_list/stream_list_store_test.dart b/test/screens/home/stream_list/stream_list_store_test.dart
new file mode 100644
index 00000000..1a066c66
--- /dev/null
+++ b/test/screens/home/stream_list/stream_list_store_test.dart
@@ -0,0 +1,203 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/models/stream.dart';
+import 'package:frosty/models/user.dart';
+import 'package:frosty/screens/home/stream_list/stream_list_store.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class MockTwitchApi extends Mock implements TwitchApi {}
+
+class MockTwitchGqlApi extends Mock implements TwitchGqlApi {}
+
+void main() {
+  setUpAll(() {
+    registerFallbackValue(StreamViewerSort.viewersDesc);
+    registerFallbackValue(<String>[]);
+  });
+
+  late MockTwitchApi api;
+  late MockTwitchGqlApi gqlApi;
+  late AuthStore authStore;
+  late SettingsStore settingsStore;
+
+  StreamTwitch stream(String id, int viewers) => StreamTwitch(
+    id,
+    'user$id',
+    'User$id',
+    'game',
+    'Game',
+    'title',
+    viewers,
+    '2026-01-01T00:00:00Z',
+    'https://cdn/live_user_$id-{width}x{height}.jpg',
+  );
+
+  Future<void> waitUntilIdle(ListStore store) async {
+    await Future<void>.delayed(Duration.zero);
+    for (var i = 0; i < 50 && store.isLoading; i++) {
+      await Future<void>.delayed(const Duration(milliseconds: 5));
+    }
+  }
+
+  setUp(() {
+    SharedPreferences.setMockInitialValues({});
+    api = MockTwitchApi();
+    gqlApi = MockTwitchGqlApi();
+    authStore = AuthStore(twitchApi: api, twitchGqlApi: gqlApi);
+    settingsStore = SettingsStore()..streamLanguages = [];
+
+    when(() => api.getUserInfo()).thenAnswer(
+      (_) async => const UserTwitch(
+        '123',
+        'me',
+        'Me',
+        'https://cdn/me.png',
+      ),
+    );
+    when(() => api.getUserBlockedList(id: any(named: 'id'))).thenAnswer(
+      (_) async => <UserBlockedTwitch>[],
+    );
+  });
+
+  group('ListStore tag GQL pagination', () {
+    test('keeps server ASC order across GQL pages', () async {
+      when(
+        () => gqlApi.getStreams(
+          freeformTags: any(named: 'freeformTags'),
+          languages: any(named: 'languages'),
+          sort: any(named: 'sort'),
+          cursor: any(named: 'cursor'),
+          first: any(named: 'first'),
+          authToken: any(named: 'authToken'),
+          integrityToken: any(named: 'integrityToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenAnswer((invocation) async {
+        final cursor = invocation.namedArguments[#cursor] as String?;
+        if (cursor == null) {
+          return StreamsTwitch(
+            [stream('1', 3), stream('2', 7)],
+            const {'cursor': 'c1'},
+          );
+        }
+        expect(cursor, 'c1');
+        return StreamsTwitch(
+          [stream('3', 12), stream('4', 20)],
+          const {},
+        );
+      });
+
+      settingsStore.streamViewerSort = StreamViewerSort.viewersAsc;
+
+      final store = ListStore(
+        authStore: authStore,
+        settingsStore: settingsStore,
+        twitchApi: api,
+        twitchGqlApi: gqlApi,
+        listType: ListType.tag,
+        freeformTag: 'Deutsch',
+      );
+
+      await waitUntilIdle(store);
+
+      expect(store.streams.map((s) => s.userId), ['1', '2']);
+      expect(store.hasMore, isTrue);
+
+      await store.getStreams();
+      await waitUntilIdle(store);
+
+      expect(store.streams.map((s) => s.userId), ['1', '2', '3', '4']);
+      expect(store.streams.map((s) => s.viewerCount), [3, 7, 12, 20]);
+      expect(store.hasMore, isFalse);
+      verifyNever(
+        () => api.getDirectoryStreams(
+          languages: any(named: 'languages'),
+          gameId: any(named: 'gameId'),
+          freeformTag: any(named: 'freeformTag'),
+          cursor: any(named: 'cursor'),
+          minCount: any(named: 'minCount'),
+          maxPages: any(named: 'maxPages'),
+        ),
+      );
+
+      store.dispose();
+    });
+
+    test('falls back to Helix when GQL page-2 integrity fails', () async {
+      var gqlCalls = 0;
+      when(
+        () => gqlApi.getStreams(
+          freeformTags: any(named: 'freeformTags'),
+          languages: any(named: 'languages'),
+          sort: any(named: 'sort'),
+          cursor: any(named: 'cursor'),
+          first: any(named: 'first'),
+          authToken: any(named: 'authToken'),
+          integrityToken: any(named: 'integrityToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenAnswer((invocation) async {
+        gqlCalls++;
+        final cursor = invocation.namedArguments[#cursor] as String?;
+        if (cursor == null) {
+          return StreamsTwitch(
+            [stream('1', 100)],
+            const {'cursor': 'c1'},
+          );
+        }
+        throw const IntegrityCheckException('failed integrity check');
+      });
+
+      when(
+        () => api.getDirectoryStreams(
+          languages: any(named: 'languages'),
+          gameId: any(named: 'gameId'),
+          freeformTag: any(named: 'freeformTag'),
+          cursor: any(named: 'cursor'),
+          minCount: any(named: 'minCount'),
+          maxPages: any(named: 'maxPages'),
+        ),
+      ).thenAnswer(
+        (_) async => StreamsTwitch(
+          [stream('1', 100), stream('9', 50)],
+          const {},
+        ),
+      );
+
+      final store = ListStore(
+        authStore: authStore,
+        settingsStore: settingsStore,
+        twitchApi: api,
+        twitchGqlApi: gqlApi,
+        listType: ListType.tag,
+        freeformTag: 'Deutsch',
+      );
+
+      await waitUntilIdle(store);
+      expect(store.streams.map((s) => s.userId), ['1']);
+
+      await store.getStreams();
+      await waitUntilIdle(store);
+
+      expect(gqlCalls, greaterThanOrEqualTo(2));
+      expect(store.streams.map((s) => s.userId), ['1', '9']);
+      verify(
+        () => api.getDirectoryStreams(
+          languages: any(named: 'languages'),
+          gameId: any(named: 'gameId'),
+          freeformTag: any(named: 'freeformTag'),
+          cursor: any(named: 'cursor'),
+          minCount: any(named: 'minCount'),
+          maxPages: any(named: 'maxPages'),
+        ),
+      ).called(1);
+
+      store.dispose();
+    });
+  });
+}
diff --git a/test/screens/settings/stores/settings_store_test.dart b/test/screens/settings/stores/settings_store_test.dart
new file mode 100644
index 00000000..f6e6612c
--- /dev/null
+++ b/test/screens/settings/stores/settings_store_test.dart
@@ -0,0 +1,328 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/screens/settings/stores/settings_store.dart';
+
+void main() {
+  group('SettingsStore JSON serialization', () {
+    test('fromJson with empty map returns all defaults', () {
+      final store = SettingsStore.fromJson({});
+
+      expect(store.themeType, ThemeType.system);
+      expect(store.accentColor, 0xff9146ff);
+      expect(store.showThumbnails, isTrue);
+      expect(store.largeStreamCard, isFalse);
+      expect(store.launchUrlExternal, isFalse);
+      expect(store.showVideo, isTrue);
+      expect(store.defaultToHighestQuality, isFalse);
+      expect(store.useTextureRendering, isTrue);
+      expect(store.useNativePlayer, isTrue);
+      expect(store.blockTwitchAds, isTrue);
+      expect(store.showOverlay, isTrue);
+      expect(store.toggleableOverlay, isFalse);
+      expect(store.showLatency, isFalse);
+      expect(store.badgeScale, 1.0);
+      expect(store.emoteScale, 1.0);
+      expect(store.messageScale, 1.0);
+      expect(store.messageSpacing, 8.0);
+      expect(store.fontSize, 12.0);
+      expect(store.showDeletedMessages, isFalse);
+      expect(store.showChatMessageDividers, isFalse);
+      expect(store.timestampType, TimestampType.disabled);
+      expect(store.autoSyncChatDelay, isFalse);
+      expect(store.chatDelay, 0.0);
+      expect(store.syncedChatDelay, 0.0);
+      expect(store.effectiveChatDelay, 0.0);
+      expect(store.highlightFirstTimeChatter, isTrue);
+      expect(store.showUserNotices, isTrue);
+      expect(store.emoteMenuButtonOnLeft, isFalse);
+      expect(store.landscapeChatLeftSide, isFalse);
+      expect(store.landscapeForceVerticalChat, isFalse);
+      expect(store.landscapeCutout, LandscapeCutoutType.none);
+      expect(store.chatWidth, 0.2);
+      expect(store.fullScreenChatOverlayOpacity, 0.5);
+      expect(store.autocomplete, isTrue);
+      expect(store.showTwitchEmotes, isTrue);
+      expect(store.showTwitchBadges, isTrue);
+      expect(store.show7TVEmotes, isTrue);
+      expect(store.showBTTVEmotes, isTrue);
+      expect(store.showBTTVBadges, isTrue);
+      expect(store.showFFZEmotes, isTrue);
+      expect(store.showFFZBadges, isTrue);
+      expect(store.showRecentMessages, isFalse);
+      expect(store.persistChatTabs, isTrue);
+      expect(store.secondaryTabs, isEmpty);
+      expect(store.mutedWords, isEmpty);
+      expect(store.matchWholeWord, isTrue);
+      expect(store.shareCrashLogsAndAnalytics, isTrue);
+      expect(store.fullScreen, isFalse);
+      expect(store.fullScreenChatOverlay, isFalse);
+      expect(store.pinnedChannelIds, isEmpty);
+    });
+
+    test('roundtrip serialization preserves non-default values', () {
+      final store = SettingsStore.fromJson({});
+
+      // Set non-default values
+      store.themeType = ThemeType.dark;
+      store.accentColor = 0xFF00FF00;
+      store.showThumbnails = false;
+      store.fontSize = 16.0;
+      store.chatDelay = 5.0;
+      store.syncedChatDelay = 8.0;
+      store.showVideo = false;
+      store.timestampType = TimestampType.twelve;
+      store.landscapeCutout = LandscapeCutoutType.both;
+      store.mutedWords = ['spam', 'bad'];
+      store.pinnedChannelIds = ['ch1', 'ch2'];
+
+      final json = store.toJson();
+      final restored = SettingsStore.fromJson(json);
+
+      expect(restored.themeType, ThemeType.dark);
+      expect(restored.accentColor, 0xFF00FF00);
+      expect(restored.showThumbnails, isFalse);
+      expect(restored.fontSize, 16.0);
+      expect(restored.chatDelay, 5.0);
+      expect(restored.syncedChatDelay, 0.0);
+      expect(json.containsKey('syncedChatDelay'), isFalse);
+      expect(restored.showVideo, isFalse);
+      expect(restored.timestampType, TimestampType.twelve);
+      expect(restored.landscapeCutout, LandscapeCutoutType.both);
+      expect(restored.mutedWords, ['spam', 'bad']);
+      expect(restored.pinnedChannelIds, ['ch1', 'ch2']);
+    });
+
+    test('unknown ThemeType enum value falls back to system', () {
+      final store = SettingsStore.fromJson({'themeType': 'nonexistent_theme'});
+      expect(store.themeType, ThemeType.system);
+    });
+
+    test('unknown TimestampType enum value falls back to disabled', () {
+      final store = SettingsStore.fromJson({
+        'timestampType': 'nonexistent_timestamp',
+      });
+      expect(store.timestampType, TimestampType.disabled);
+    });
+  });
+
+  group('native player default migration', () {
+    test('5.1.0 WebView default is flipped on once', () {
+      final store = SettingsStore.fromJson({'useNativePlayer': false});
+
+      expect(store.useNativePlayer, isTrue);
+      expect(store.nativePlayerV52Migrated, isTrue);
+    });
+
+    test('opt-out is kept after the one-shot migration', () {
+      final store = SettingsStore.fromJson({
+        'useNativePlayer': false,
+        'nativePlayerV52Migrated': true,
+      });
+
+      expect(store.useNativePlayer, isFalse);
+    });
+
+    test('roundtrip after opt-out stays on WebView', () {
+      final store = SettingsStore.fromJson({});
+      store.useNativePlayer = false;
+
+      final restored = SettingsStore.fromJson(store.toJson());
+
+      expect(restored.useNativePlayer, isFalse);
+      expect(restored.nativePlayerV52Migrated, isTrue);
+    });
+  });
+
+  group('SettingsStore reset actions', () {
+    test('resetGeneralSettings restores general defaults', () {
+      final store = SettingsStore.fromJson({});
+
+      store.themeType = ThemeType.dark;
+      store.accentColor = 0xFF00FF00;
+      store.showThumbnails = false;
+      store.largeStreamCard = true;
+      store.launchUrlExternal = true;
+
+      store.resetGeneralSettings();
+
+      expect(store.themeType, ThemeType.system);
+      expect(store.accentColor, 0xff9146ff);
+      expect(store.showThumbnails, isTrue);
+      expect(store.largeStreamCard, isFalse);
+      expect(store.launchUrlExternal, isFalse);
+    });
+
+    test('resetVideoSettings restores video defaults', () {
+      final store = SettingsStore.fromJson({});
+
+      store.showVideo = false;
+      store.defaultToHighestQuality = true;
+      store.useTextureRendering = false;
+      store.useNativePlayer = false;
+      store.showOverlay = false;
+      store.toggleableOverlay = true;
+      store.showLatency = true;
+
+      store.resetVideoSettings();
+
+      expect(store.showVideo, isTrue);
+      expect(store.defaultToHighestQuality, isFalse);
+      expect(store.useTextureRendering, isTrue);
+      expect(store.useNativePlayer, isTrue);
+      expect(store.showOverlay, isTrue);
+      expect(store.toggleableOverlay, isFalse);
+      expect(store.showLatency, isFalse);
+    });
+
+    test('resetChatSettings restores chat defaults', () {
+      final store = SettingsStore.fromJson({});
+
+      store.badgeScale = 2.0;
+      store.emoteScale = 2.0;
+      store.fontSize = 20.0;
+      store.showDeletedMessages = true;
+      store.timestampType = TimestampType.twentyFour;
+      store.chatDelay = 10.0;
+      store.syncedChatDelay = 7.0;
+      store.emoteMenuButtonOnLeft = true;
+      store.landscapeCutout = LandscapeCutoutType.right;
+      store.chatWidth = 0.5;
+      store.mutedWords = ['word1'];
+      store.showBTTVEmotes = false;
+      store.showFFZBadges = false;
+
+      store.resetChatSettings();
+
+      expect(store.badgeScale, 1.0);
+      expect(store.emoteScale, 1.0);
+      expect(store.fontSize, 12.0);
+      expect(store.showDeletedMessages, isFalse);
+      expect(store.timestampType, TimestampType.disabled);
+      expect(store.chatDelay, 0.0);
+      expect(store.syncedChatDelay, 0.0);
+      expect(store.emoteMenuButtonOnLeft, isFalse);
+      expect(store.landscapeCutout, LandscapeCutoutType.none);
+      expect(store.chatWidth, 0.2);
+      expect(store.mutedWords, isEmpty);
+      expect(store.showBTTVEmotes, isTrue);
+      expect(store.showFFZBadges, isTrue);
+    });
+
+    test('resetOtherSettings restores other defaults', () {
+      final store = SettingsStore.fromJson({});
+
+      store.shareCrashLogsAndAnalytics = false;
+
+      store.resetOtherSettings();
+
+      expect(store.shareCrashLogsAndAnalytics, isTrue);
+    });
+
+    test('resetGlobalConfigs restores global config defaults', () {
+      final store = SettingsStore.fromJson({});
+
+      store.fullScreen = true;
+      store.fullScreenChatOverlay = true;
+      store.pinnedChannelIds = ['ch1'];
+
+      store.resetGlobalConfigs();
+
+      expect(store.fullScreen, isFalse);
+      expect(store.fullScreenChatOverlay, isFalse);
+      expect(store.pinnedChannelIds, isEmpty);
+    });
+
+    test('resetAllSettings restores everything to defaults', () {
+      final store = SettingsStore.fromJson({});
+
+      // Modify settings across all categories
+      store.themeType = ThemeType.light;
+      store.showVideo = false;
+      store.fontSize = 20.0;
+      store.shareCrashLogsAndAnalytics = false;
+      store.fullScreen = true;
+
+      store.resetAllSettings();
+
+      expect(store.themeType, ThemeType.system);
+      expect(store.showVideo, isTrue);
+      expect(store.fontSize, 12.0);
+      expect(store.shareCrashLogsAndAnalytics, isTrue);
+      expect(store.fullScreen, isFalse);
+    });
+
+    test('resetGeneralSettings does not affect video settings', () {
+      final store = SettingsStore.fromJson({});
+
+      store.showVideo = false;
+      store.themeType = ThemeType.dark;
+
+      store.resetGeneralSettings();
+
+      expect(store.themeType, ThemeType.system);
+      expect(store.showVideo, isFalse); // Should remain changed
+    });
+
+    test('resetVideoSettings does not affect chat settings', () {
+      final store = SettingsStore.fromJson({});
+
+      store.fontSize = 20.0;
+      store.showLatency = true;
+
+      store.resetVideoSettings();
+
+      expect(store.showLatency, isFalse);
+      expect(store.fontSize, 20.0); // Should remain changed
+    });
+
+    test('effectiveChatDelay uses synced value only during auto sync', () {
+      final store = SettingsStore.fromJson({});
+
+      store.chatDelay = 4.0;
+      store.syncedChatDelay = 9.0;
+
+      expect(store.effectiveChatDelay, 4.0);
+
+      store.autoSyncChatDelay = true;
+
+      expect(store.effectiveChatDelay, 9.0);
+    });
+  });
+
+  group('Enums', () {
+    test('ThemeType has expected values', () {
+      expect(ThemeType.values.length, 3);
+      expect(ThemeType.values, contains(ThemeType.system));
+      expect(ThemeType.values, contains(ThemeType.light));
+      expect(ThemeType.values, contains(ThemeType.dark));
+    });
+
+    test('TimestampType has expected values', () {
+      expect(TimestampType.values.length, 3);
+      expect(TimestampType.values, contains(TimestampType.disabled));
+      expect(TimestampType.values, contains(TimestampType.twelve));
+      expect(TimestampType.values, contains(TimestampType.twentyFour));
+    });
+
+    test('LandscapeCutoutType has expected values', () {
+      expect(LandscapeCutoutType.values.length, 4);
+      expect(LandscapeCutoutType.values, contains(LandscapeCutoutType.none));
+      expect(LandscapeCutoutType.values, contains(LandscapeCutoutType.left));
+      expect(LandscapeCutoutType.values, contains(LandscapeCutoutType.right));
+      expect(LandscapeCutoutType.values, contains(LandscapeCutoutType.both));
+    });
+
+    test('themeNames matches ThemeType order', () {
+      expect(themeNames.length, ThemeType.values.length);
+      expect(themeNames[0], 'System');
+      expect(themeNames[1], 'Light');
+      expect(themeNames[2], 'Dark');
+    });
+
+    test('timestampNames matches TimestampType order', () {
+      expect(timestampNames.length, TimestampType.values.length);
+      expect(timestampNames[0], 'Disabled');
+      expect(timestampNames[1], '12-hour');
+      expect(timestampNames[2], '24-hour');
+    });
+  });
+}
diff --git a/test/screens/settings/stores/user_store_test.dart b/test/screens/settings/stores/user_store_test.dart
new file mode 100644
index 00000000..4897d3ad
--- /dev/null
+++ b/test/screens/settings/stores/user_store_test.dart
@@ -0,0 +1,268 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/apis/twitch_integrity.dart';
+import 'package:frosty/models/user.dart';
+import 'package:frosty/screens/settings/stores/user_store.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class MockTwitchApi extends Mock implements TwitchApi {}
+
+class MockTwitchGqlApi extends Mock implements TwitchGqlApi {}
+
+void main() {
+  late MockTwitchApi api;
+  late MockTwitchGqlApi gqlApi;
+
+  setUp(() {
+    SharedPreferences.setMockInitialValues({});
+    api = MockTwitchApi();
+    gqlApi = MockTwitchGqlApi();
+    when(() => api.getUserInfo()).thenAnswer(
+      (_) async => const UserTwitch(
+        '12345',
+        'testuser',
+        'TestUser',
+        'https://cdn/profile.png',
+      ),
+    );
+    when(() => api.getUserBlockedList(id: any(named: 'id'))).thenAnswer(
+      (_) async => <UserBlockedTwitch>[],
+    );
+    when(() => api.getModeratedChannels(id: any(named: 'id'))).thenAnswer(
+      (_) async => <String>['999'],
+    );
+  });
+
+  UserStore makeStore({required bool hasModeratorScopes}) => UserStore(
+    twitchApi: api,
+    twitchGqlApi: gqlApi,
+    hasModeratorScopes: () => hasModeratorScopes,
+  );
+
+  group('UserStore moderated channels gating', () {
+    test('init skips moderated-channels without moderator scopes', () async {
+      final userStore = makeStore(hasModeratorScopes: false);
+
+      await userStore.init();
+      await Future<void>.delayed(Duration.zero);
+
+      verifyNever(() => api.getModeratedChannels(id: any(named: 'id')));
+      expect(userStore.moderatedChannels, isEmpty);
+    });
+
+    test('init fetches moderated-channels when moderator scopes exist', () async {
+      final userStore = makeStore(hasModeratorScopes: true);
+
+      await userStore.init();
+      await Future<void>.delayed(Duration.zero);
+
+      verify(() => api.getModeratedChannels(id: '12345')).called(1);
+      expect(userStore.moderatedChannels, ['999']);
+    });
+
+    test('refreshModeratedChannels no-ops without moderator scopes', () async {
+      final userStore = makeStore(hasModeratorScopes: false);
+      await userStore.init();
+      clearInteractions(api);
+
+      await userStore.refreshModeratedChannels();
+      verifyNever(() => api.getModeratedChannels(id: any(named: 'id')));
+    });
+
+    test('deleteMessage requires moderator scopes', () async {
+      when(
+        () => api.deleteChatMessage(
+          broadcasterId: any(named: 'broadcasterId'),
+          moderatorId: any(named: 'moderatorId'),
+          messageId: any(named: 'messageId'),
+        ),
+      ).thenAnswer((_) async => true);
+
+      final userStore = makeStore(hasModeratorScopes: false);
+      await userStore.init();
+
+      final result = await userStore.deleteMessage(
+        broadcasterId: '12345',
+        messageId: 'msg',
+      );
+
+      expect(result, isFalse);
+      verifyNever(
+        () => api.deleteChatMessage(
+          broadcasterId: any(named: 'broadcasterId'),
+          moderatorId: any(named: 'moderatorId'),
+          messageId: any(named: 'messageId'),
+        ),
+      );
+    });
+  });
+
+  group('UserStore follow', () {
+    test('isFollowingChannel caches Helix result', () async {
+      when(
+        () => api.isFollowingChannel(
+          userId: '12345',
+          broadcasterId: '999',
+        ),
+      ).thenAnswer((_) async => true);
+
+      final userStore = makeStore(hasModeratorScopes: false);
+      await userStore.init();
+
+      expect(await userStore.isFollowingChannel('999'), isTrue);
+      expect(await userStore.isFollowingChannel('999'), isTrue);
+      verify(
+        () => api.isFollowingChannel(
+          userId: '12345',
+          broadcasterId: '999',
+        ),
+      ).called(1);
+    });
+
+    test('follow retries after integrity failure', () async {
+      var calls = 0;
+      when(
+        () => gqlApi.followUser(
+          targetId: any(named: 'targetId'),
+          authToken: any(named: 'authToken'),
+          integrityToken: any(named: 'integrityToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenAnswer((_) async {
+        calls++;
+        if (calls == 1) {
+          throw const IntegrityCheckException('failed integrity check');
+        }
+      });
+      when(
+        () => gqlApi.fetchIntegrityToken(
+          authToken: any(named: 'authToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenAnswer(
+        (_) async => (
+          token: 'integrity',
+          expirationMs: DateTime.now().millisecondsSinceEpoch + 600000,
+        ),
+      );
+
+      final userStore = makeStore(hasModeratorScopes: false);
+      await userStore.init();
+      await userStore.follow(targetId: '999', gqlToken: 'web-token');
+
+      expect(userStore.cachedIsFollowing('999'), isTrue);
+      expect(calls, 2);
+      verify(
+        () => gqlApi.fetchIntegrityToken(
+          authToken: 'web-token',
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).called(1);
+    });
+
+    test('unfollow updates cache', () async {
+      when(
+        () => gqlApi.unfollowUser(
+          targetId: any(named: 'targetId'),
+          authToken: any(named: 'authToken'),
+          integrityToken: any(named: 'integrityToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenAnswer((_) async {});
+
+      final userStore = makeStore(hasModeratorScopes: false);
+      await userStore.init();
+      await userStore.unfollow(targetId: '999', gqlToken: 'web-token');
+
+      expect(userStore.cachedIsFollowing('999'), isFalse);
+    });
+
+    test('runWithGqlIntegrity refreshes token and retries', () async {
+      var calls = 0;
+      when(
+        () => gqlApi.fetchIntegrityToken(
+          authToken: any(named: 'authToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenAnswer(
+        (_) async => (
+          token: 'fresh-integrity',
+          expirationMs: DateTime.now().millisecondsSinceEpoch + 600000,
+        ),
+      );
+
+      final userStore = makeStore(hasModeratorScopes: false);
+      final result = await userStore.runWithGqlIntegrity<String>(
+        gqlToken: 'web-token',
+        action: ({authToken, integrityToken, deviceId}) async {
+          calls++;
+          expect(authToken, 'web-token');
+          expect(deviceId, isNotEmpty);
+          if (calls == 1) {
+            throw const IntegrityCheckException('failed integrity check');
+          }
+          expect(integrityToken, 'fresh-integrity');
+          return 'ok';
+        },
+      );
+
+      expect(result, 'ok');
+      expect(calls, 2);
+      verify(
+        () => gqlApi.fetchIntegrityToken(
+          authToken: 'web-token',
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).called(1);
+    });
+
+    test('runWithGqlIntegrity rethrows when no gqlToken', () async {
+      final userStore = makeStore(hasModeratorScopes: false);
+
+      await expectLater(
+        userStore.runWithGqlIntegrity<void>(
+          gqlToken: null,
+          action: ({authToken, integrityToken, deviceId}) async {
+            throw const IntegrityCheckException('failed integrity check');
+          },
+        ),
+        throwsA(isA<IntegrityCheckException>()),
+      );
+      verifyNever(
+        () => gqlApi.fetchIntegrityToken(
+          authToken: any(named: 'authToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      );
+    });
+
+    test('applyWebIntegrity stores device id for later GQL calls', () async {
+      final userStore = makeStore(hasModeratorScopes: false);
+      await userStore.applyWebIntegrity(
+        GqlIntegrityCredentials(
+          integrityToken: 'v4.public.${base64Url.encode(utf8.encode(jsonEncode({
+            'is_bad_bot': 'false',
+            'device_id': 'webview-device',
+          })))}.sig',
+          deviceId: 'webview-device',
+          expirationMs: DateTime.now().millisecondsSinceEpoch + 600000,
+        ),
+      );
+
+      final deviceId = await userStore.runWithGqlIntegrity<String>(
+        gqlToken: 'web-token',
+        action: ({authToken, integrityToken, deviceId}) async {
+          expect(deviceId, 'webview-device');
+          expect(integrityToken, isNotNull);
+          return deviceId!;
+        },
+      );
+      expect(deviceId, 'webview-device');
+    });
+  });
+}
diff --git a/test/stream_test.dart b/test/stream_test.dart
deleted file mode 100644
index 25517b72..00000000
--- a/test/stream_test.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter_test/flutter_test.dart';
-import 'package:frosty/models/stream.dart';
-
-void main() {
-  test('Twitch stream should parse correctly', () {
-    const sampleStream = '''
-      {
-        "id":"43809710301",
-        "user_id":"71092938",
-        "user_login":"xqcow",
-        "user_name":"xQcOW",
-        "game_id":"508292",
-        "game_name":"Bloons TD 6",
-        "type":"live",
-        "title":"A shorter title...",
-        "viewer_count":50051,
-        "started_at":"2021-09-23T20:06:22Z",
-        "language":"en",
-        "thumbnail_url":"https://static-cdn.jtvnw.net/previews-ttv/live_user_xqcow-{width}x{height}.jpg",
-        "tag_ids":[
-          "e6bb8b34-4c28-4b5f-94ed-12c1ebf2d0e4",
-          "6ea6bca4-4712-4ab9-a906-e3336a9d8039",
-          "6606e54c-f92d-40f6-8257-74977889ccdd"
-          ],
-        "is_mature":false
-      }
-    ''';
-
-    final decoded = jsonDecode(sampleStream);
-    final stream = StreamTwitch.fromJson(decoded);
-
-    expect(stream.userId, '71092938');
-    expect(stream.userLogin, 'xqcow');
-    expect(stream.userName, 'xQcOW');
-    expect(stream.gameId, '508292');
-    expect(stream.gameName, 'Bloons TD 6');
-    expect(stream.title, 'A shorter title...');
-    expect(stream.viewerCount, 50051);
-    expect(stream.startedAt, '2021-09-23T20:06:22Z');
-    expect(stream.thumbnailUrl,
-        'https://static-cdn.jtvnw.net/previews-ttv/live_user_xqcow-{width}x{height}.jpg');
-  });
-}
diff --git a/test/user_test.dart b/test/user_test.dart
deleted file mode 100644
index cb6066b7..00000000
--- a/test/user_test.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter_test/flutter_test.dart';
-import 'package:frosty/models/user.dart';
-
-void main() {
-  test('Twitch user should parse', () {
-    const sampleUser = '''
-      {
-        "id":"88888888",
-        "login":"bob",
-        "display_name":"Bob",
-        "type":"random type",
-        "broadcaster_type":"streamer",
-        "description":"random description",
-        "profile_image_url":"https://static-cdn.jtvnw.net/user-default-pictures-uv/ead5c8b2-a4c9-4724-b1dd-9f00b46cbd3d-profile_image-300x300.png",
-        "offline_image_url":"",
-        "view_count":94,
-        "created_at":"2013-09-25T00:32:05Z"
-      }
-    ''';
-
-    final decoded = jsonDecode(sampleUser);
-    final user = UserTwitch.fromJson(decoded);
-
-    expect(user.id, '88888888');
-    expect(user.login, 'bob');
-    expect(user.displayName, 'Bob');
-    expect(user.profileImageUrl,
-        'https://static-cdn.jtvnw.net/user-default-pictures-uv/ead5c8b2-a4c9-4724-b1dd-9f00b46cbd3d-profile_image-300x300.png');
-  });
-}
diff --git a/test/utils/twitch_oauth_scopes_test.dart b/test/utils/twitch_oauth_scopes_test.dart
new file mode 100644
index 00000000..94723f66
--- /dev/null
+++ b/test/utils/twitch_oauth_scopes_test.dart
@@ -0,0 +1,94 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/utils/twitch_oauth_scopes.dart';
+
+void main() {
+  group('scope sets', () {
+    test('core scopes exclude moderator scopes', () {
+      for (final scope in twitchModeratorScopes) {
+        expect(twitchUserScopes, isNot(contains(scope)));
+      }
+      expect(twitchAllUserScopes, containsAll(twitchUserScopes));
+      expect(twitchAllUserScopes, containsAll(twitchModeratorScopes));
+    });
+  });
+
+  group('hasModeratorScopes', () {
+    test('requires all three moderator scopes', () {
+      expect(hasModeratorScopes(twitchAllUserScopes), isTrue);
+      expect(
+        hasModeratorScopes([
+          ...twitchUserScopes,
+          'user:read:moderated_channels',
+          'moderator:manage:chat_messages',
+        ]),
+        isFalse,
+      );
+      expect(hasModeratorScopes(twitchUserScopes), isFalse);
+    });
+  });
+
+  group('missingTwitchScopes', () {
+    test('defaults to core scopes only', () {
+      final missing = missingTwitchScopes(
+        granted: const ['chat:read', 'chat:edit'],
+      );
+
+      expect(missing, contains('user:read:follows'));
+      expect(missing, isNot(contains('user:read:moderated_channels')));
+      expect(missing, isNot(contains('chat:read')));
+    });
+
+    test('returns empty when all required scopes are granted', () {
+      expect(missingTwitchScopes(granted: twitchUserScopes), isEmpty);
+      expect(
+        missingTwitchScopes(
+          granted: twitchAllUserScopes,
+          required: twitchModeratorScopes,
+        ),
+        isEmpty,
+      );
+    });
+  });
+
+  group('unauthorizedDialogMessage', () {
+    test('explains expired session when logged out', () {
+      expect(
+        unauthorizedDialogMessage(
+          isLoggedIn: false,
+          grantedScopes: const [],
+        ),
+        contains('expired'),
+      );
+    });
+
+    test('lists missing core permissions when logged in', () {
+      final message = unauthorizedDialogMessage(
+        isLoggedIn: true,
+        grantedScopes: const ['chat:read', 'chat:edit'],
+      );
+
+      expect(message, contains('additional Twitch permissions'));
+      expect(message, contains('View followed channels'));
+      expect(message, isNot(contains('View channels you moderate')));
+    });
+
+    test('prefers session expired when core scopes are complete', () {
+      expect(
+        unauthorizedDialogMessage(
+          isLoggedIn: true,
+          grantedScopes: twitchUserScopes,
+        ),
+        contains('expired'),
+      );
+    });
+  });
+
+  group('enableModeratorToolsDialogMessage', () {
+    test('lists moderator permission labels', () {
+      final message = enableModeratorToolsDialogMessage();
+      expect(message, contains('View channels you moderate'));
+      expect(message, contains('Delete chat messages as a moderator'));
+      expect(message, contains('Timeout and ban users as a moderator'));
+    });
+  });
+}
diff --git a/test/utils_test.dart b/test/utils_test.dart
new file mode 100644
index 00000000..846540f6
--- /dev/null
+++ b/test/utils_test.dart
@@ -0,0 +1,339 @@
+import 'dart:math' as math;
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/utils.dart';
+
+void main() {
+  group('getReadableName', () {
+    test('returns display name when it equals username', () {
+      expect(getReadableName('testuser', 'testuser'), 'testuser');
+    });
+
+    test('returns display name when it contains English letters (even if case differs)', () {
+      // Display name contains English letters, so it's readable as-is
+      // The function doesn't add username because English letters make it readable
+      expect(getReadableName('TestUser', 'testuser'), 'TestUser');
+    });
+
+    test('returns display name only for numeric-only names', () {
+      expect(getReadableName('12345', 'somename'), '12345');
+    });
+
+    test('returns display name only when it contains English letters', () {
+      expect(getReadableName('TestName123', 'testname123'), 'TestName123');
+      expect(getReadableName('User_Name', 'user_name'), 'User_Name');
+    });
+
+    test('adds username in parentheses for non-English display names', () {
+      // Japanese characters
+      expect(getReadableName('テスト', 'testuser'), 'テスト (testuser)');
+      // Korean characters
+      expect(getReadableName('테스트', 'testuser'), '테스트 (testuser)');
+      // Chinese characters
+      expect(getReadableName('测试', 'testuser'), '测试 (testuser)');
+      // Russian characters
+      expect(getReadableName('Тест', 'testuser'), 'Тест (testuser)');
+    });
+
+    test('adds username for mixed non-English with numbers', () {
+      // Non-English + numbers (no English letters)
+      expect(getReadableName('テスト123', 'testuser'), 'テスト123 (testuser)');
+    });
+
+    test('returns display name for mixed English and non-English', () {
+      // Has English letters, so no parentheses
+      expect(getReadableName('TestテストUser', 'testuser'), 'TestテストUser');
+    });
+  });
+
+  group('adjustChatNameColor', () {
+    // Helper to create a testable widget tree with specific theme
+    Widget buildTestWidget({
+      required Color scaffoldBackground,
+      required Widget child,
+      Brightness brightness = Brightness.dark,
+    }) {
+      return MaterialApp(
+        theme: ThemeData(
+          brightness: brightness,
+          scaffoldBackgroundColor: scaffoldBackground,
+          colorScheme: ColorScheme.fromSeed(
+            seedColor: Colors.blue,
+            brightness: brightness,
+            surface: scaffoldBackground,
+          ),
+        ),
+        home: Scaffold(body: child),
+      );
+    }
+
+    testWidgets('brightens dark colors on dark backgrounds', (tester) async {
+      late Color adjustedColor;
+      const darkBackground = Color(0xFF121212);
+      const darkNameColor = Color(0xFF000000); // Pure black
+
+      await tester.pumpWidget(
+        buildTestWidget(
+          scaffoldBackground: darkBackground,
+          child: Builder(
+            builder: (context) {
+              adjustedColor = adjustChatNameColor(context, darkNameColor);
+              return const SizedBox();
+            },
+          ),
+        ),
+      );
+
+      // The adjusted color should be lighter than the original
+      final originalLuminance = darkNameColor.computeLuminance();
+      final adjustedLuminance = adjustedColor.computeLuminance();
+
+      expect(adjustedLuminance, greaterThan(originalLuminance));
+    });
+
+    testWidgets('darkens light colors on light backgrounds', (tester) async {
+      late Color adjustedColor;
+      const lightBackground = Color(0xFFFAFAFA);
+      const lightNameColor = Color(0xFFFFFFFF); // Pure white
+
+      await tester.pumpWidget(
+        buildTestWidget(
+          scaffoldBackground: lightBackground,
+          brightness: Brightness.light,
+          child: Builder(
+            builder: (context) {
+              adjustedColor = adjustChatNameColor(context, lightNameColor);
+              return const SizedBox();
+            },
+          ),
+        ),
+      );
+
+      // The adjusted color should be darker than the original
+      final originalLuminance = lightNameColor.computeLuminance();
+      final adjustedLuminance = adjustedColor.computeLuminance();
+
+      expect(adjustedLuminance, lessThan(originalLuminance));
+    });
+
+    testWidgets('preserves colors that already meet contrast ratio',
+        (tester) async {
+      late Color adjustedColor;
+      const darkBackground = Color(0xFF121212);
+      const goodContrastColor = Color(0xFFFFFFFF); // White on dark = good contrast
+
+      await tester.pumpWidget(
+        buildTestWidget(
+          scaffoldBackground: darkBackground,
+          child: Builder(
+            builder: (context) {
+              adjustedColor = adjustChatNameColor(context, goodContrastColor);
+              return const SizedBox();
+            },
+          ),
+        ),
+      );
+
+      // Color should be unchanged or very close to original
+      expect(adjustedColor, goodContrastColor);
+    });
+
+    testWidgets('uses custom target contrast ratio', (tester) async {
+      late Color adjusted45;
+      late Color adjusted30;
+      const darkBackground = Color(0xFF121212);
+      const greyColor = Color(0xFF555555);
+
+      await tester.pumpWidget(
+        buildTestWidget(
+          scaffoldBackground: darkBackground,
+          child: Builder(
+            builder: (context) {
+              adjusted45 = adjustChatNameColor(
+                context,
+                greyColor,
+              );
+              adjusted30 = adjustChatNameColor(
+                context,
+                greyColor,
+                targetContrast: 3.0,
+              );
+              return const SizedBox();
+            },
+          ),
+        ),
+      );
+
+      // Higher contrast requirement should result in a lighter color
+      final lum45 = adjusted45.computeLuminance();
+      final lum30 = adjusted30.computeLuminance();
+
+      expect(lum45, greaterThanOrEqualTo(lum30));
+    });
+
+    testWidgets('uses custom background color parameter', (tester) async {
+      late Color adjustedColor;
+      const customBackground = Color(0xFF00FF00); // Green background
+
+      await tester.pumpWidget(
+        buildTestWidget(
+          scaffoldBackground: Colors.black,
+          child: Builder(
+            builder: (context) {
+              // Pass custom background, ignoring theme
+              adjustedColor = adjustChatNameColor(
+                context,
+                const Color(0xFF00FF00), // Same as background
+                background: customBackground,
+              );
+              return const SizedBox();
+            },
+          ),
+        ),
+      );
+
+      // Color should be adjusted for contrast against green, not black
+      // Green on green needs adjustment
+      expect(adjustedColor, isNot(const Color(0xFF00FF00)));
+    });
+
+    testWidgets('handles transparent scaffold background', (tester) async {
+      late Color adjustedColor;
+      const darkColor = Color(0xFF000000);
+
+      await tester.pumpWidget(
+        MaterialApp(
+          theme: ThemeData(
+            brightness: Brightness.dark,
+            scaffoldBackgroundColor: Colors.transparent,
+            colorScheme: const ColorScheme.dark(
+              surface: Color(0xFF1E1E1E),
+            ),
+          ),
+          home: Scaffold(
+            body: Builder(
+              builder: (context) {
+                adjustedColor = adjustChatNameColor(context, darkColor);
+                return const SizedBox();
+              },
+            ),
+          ),
+        ),
+      );
+
+      // Should use colorScheme.surface as fallback
+      // Dark color on dark surface should be adjusted
+      expect(adjustedColor.computeLuminance(), greaterThan(0.0));
+    });
+
+    testWidgets('maintains hue while adjusting lightness', (tester) async {
+      late Color adjustedColor;
+      const darkBackground = Color(0xFF121212);
+      const blueColor = Color(0xFF0000AA); // Dark blue
+
+      await tester.pumpWidget(
+        buildTestWidget(
+          scaffoldBackground: darkBackground,
+          child: Builder(
+            builder: (context) {
+              adjustedColor = adjustChatNameColor(context, blueColor);
+              return const SizedBox();
+            },
+          ),
+        ),
+      );
+
+      // Should still be recognizably blue (hue preserved)
+      final originalHsl = HSLColor.fromColor(blueColor);
+      final adjustedHsl = HSLColor.fromColor(adjustedColor);
+
+      // Hue should be the same or very close
+      expect(adjustedHsl.hue, closeTo(originalHsl.hue, 1.0));
+    });
+  });
+
+  group('Color contrast calculation (indirect tests)', () {
+    // These tests verify the contrast behavior indirectly through adjustChatNameColor
+
+    testWidgets('common Twitch colors work on dark background', (tester) async {
+      final twitchColors = [
+        const Color(0xFFFF0000), // Red
+        const Color(0xFF0000FF), // Blue
+        const Color(0xFF00FF00), // Green
+        const Color(0xFFB22222), // Firebrick
+        const Color(0xFFFF69B4), // Hot pink
+        const Color(0xFFDAA520), // Golden rod
+      ];
+
+      for (final color in twitchColors) {
+        late Color adjusted;
+        await tester.pumpWidget(
+          MaterialApp(
+            theme: ThemeData.dark().copyWith(
+              scaffoldBackgroundColor: const Color(0xFF121212),
+            ),
+            home: Scaffold(
+              body: Builder(
+                builder: (context) {
+                  adjusted = adjustChatNameColor(context, color);
+                  return const SizedBox();
+                },
+              ),
+            ),
+          ),
+        );
+
+        // All adjusted colors should have reasonable luminance
+        expect(
+          adjusted.computeLuminance(),
+          greaterThan(0.05),
+          reason: 'Color $color should be readable',
+        );
+      }
+    });
+
+    testWidgets('adjusted color meets WCAG AA 4.5:1 contrast ratio',
+        (tester) async {
+      late Color adjustedColor;
+      const darkBackground = Color(0xFF121212);
+      const darkBlue = Color(0xFF0000AA);
+
+      await tester.pumpWidget(
+        MaterialApp(
+          theme: ThemeData.dark().copyWith(
+            scaffoldBackgroundColor: darkBackground,
+          ),
+          home: Scaffold(
+            body: Builder(
+              builder: (context) {
+                adjustedColor = adjustChatNameColor(context, darkBlue);
+                return const SizedBox();
+              },
+            ),
+          ),
+        ),
+      );
+
+      // Compute WCAG contrast ratio manually
+      double linearize(double c) => c <= 0.03928
+          ? c / 12.92
+          : math.pow((c + 0.055) / 1.055, 2.4).toDouble();
+
+      double luminance(Color c) {
+        return 0.2126 * linearize(c.r) +
+            0.7152 * linearize(c.g) +
+            0.0722 * linearize(c.b);
+      }
+
+      final l1 = luminance(adjustedColor);
+      final l2 = luminance(darkBackground);
+      final hi = l1 > l2 ? l1 : l2;
+      final lo = l1 > l2 ? l2 : l1;
+      final ratio = (hi + 0.05) / (lo + 0.05);
+
+      expect(ratio, greaterThanOrEqualTo(4.5),
+          reason: 'Adjusted color should meet WCAG AA 4.5:1 contrast ratio');
+    });
+  });
+}
diff --git a/test/widgets/follow_channel_controller_test.dart b/test/widgets/follow_channel_controller_test.dart
new file mode 100644
index 00000000..bdc88570
--- /dev/null
+++ b/test/widgets/follow_channel_controller_test.dart
@@ -0,0 +1,254 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:frosty/apis/base_api_client.dart';
+import 'package:frosty/apis/twitch_api.dart';
+import 'package:frosty/apis/twitch_gql_api.dart';
+import 'package:frosty/apis/twitch_integrity.dart';
+import 'package:frosty/models/user.dart';
+import 'package:frosty/screens/settings/stores/auth_store.dart';
+import 'package:frosty/screens/settings/stores/user_store.dart';
+import 'package:frosty/widgets/follow_channel_controller.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class MockAuthStore extends Mock implements AuthStore {}
+
+class MockTwitchApi extends Mock implements TwitchApi {}
+
+class MockTwitchGqlApi extends Mock implements TwitchGqlApi {}
+
+void main() {
+  late MockAuthStore authStore;
+  late MockTwitchApi api;
+  late MockTwitchGqlApi gqlApi;
+  late UserStore userStore;
+  var notifyCount = 0;
+
+  setUp(() async {
+    SharedPreferences.setMockInitialValues({});
+    authStore = MockAuthStore();
+    api = MockTwitchApi();
+    gqlApi = MockTwitchGqlApi();
+    notifyCount = 0;
+
+    when(() => api.getUserInfo()).thenAnswer(
+      (_) async => const UserTwitch(
+        '12345',
+        'testuser',
+        'TestUser',
+        'https://cdn/profile.png',
+      ),
+    );
+    when(() => api.getUserBlockedList(id: any(named: 'id'))).thenAnswer(
+      (_) async => <UserBlockedTwitch>[],
+    );
+
+    userStore = UserStore(
+      twitchApi: api,
+      twitchGqlApi: gqlApi,
+      hasModeratorScopes: () => false,
+    );
+    await userStore.init();
+
+    when(() => authStore.user).thenReturn(userStore);
+    when(() => authStore.isLoggedIn).thenReturn(true);
+    when(() => authStore.gqlToken).thenReturn('web-token');
+  });
+
+  FollowChannelController makeController({
+    String userId = '999',
+    bool? initialIsFollowing,
+  }) {
+    return FollowChannelController(
+      authStore: authStore,
+      userId: userId,
+      initialIsFollowing: initialIsFollowing,
+      onChanged: () => notifyCount++,
+    );
+  }
+
+  group('FollowChannelController', () {
+    test('hides when logged out', () {
+      when(() => authStore.isLoggedIn).thenReturn(false);
+      final controller = makeController(initialIsFollowing: false);
+      controller.init();
+
+      expect(controller.canFollow, isFalse);
+      expect(controller.shouldShow, isFalse);
+    });
+
+    test('hides for own channel', () {
+      final controller = makeController(userId: '12345');
+      controller.init();
+
+      expect(controller.isSelf, isTrue);
+      expect(controller.canFollow, isFalse);
+      expect(controller.shouldShow, isFalse);
+    });
+
+    test('uses initialIsFollowing without Helix lookup', () {
+      final controller = makeController(initialIsFollowing: true);
+      controller.init();
+
+      expect(controller.isFollowing, isTrue);
+      expect(controller.shouldShow, isTrue);
+      verifyNever(
+        () => api.isFollowingChannel(
+          userId: any(named: 'userId'),
+          broadcasterId: any(named: 'broadcasterId'),
+        ),
+      );
+    });
+
+    test('loads follow state from Helix and caches', () async {
+      when(
+        () => api.isFollowingChannel(
+          userId: '12345',
+          broadcasterId: '999',
+        ),
+      ).thenAnswer((_) async => false);
+
+      final controller = makeController();
+      controller.init();
+      await Future<void>.delayed(Duration.zero);
+
+      expect(controller.isFollowing, isFalse);
+      expect(controller.loading, isFalse);
+      expect(controller.shouldShow, isTrue);
+      expect(userStore.cachedIsFollowing('999'), isFalse);
+    });
+
+    test('toggle follows then unfollows', () async {
+      when(
+        () => gqlApi.followUser(
+          targetId: any(named: 'targetId'),
+          authToken: any(named: 'authToken'),
+          integrityToken: any(named: 'integrityToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenAnswer((_) async {});
+      when(
+        () => gqlApi.unfollowUser(
+          targetId: any(named: 'targetId'),
+          authToken: any(named: 'authToken'),
+          integrityToken: any(named: 'integrityToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenAnswer((_) async {});
+
+      final controller = makeController(initialIsFollowing: false);
+      controller.init();
+
+      expect(await controller.toggle(), isTrue);
+      expect(controller.isFollowing, isTrue);
+      expect(userStore.cachedIsFollowing('999'), isTrue);
+
+      expect(await controller.toggle(), isFalse);
+      expect(controller.isFollowing, isFalse);
+      expect(userStore.cachedIsFollowing('999'), isFalse);
+    });
+
+    test('toggle throws when web session missing', () async {
+      when(() => authStore.gqlToken).thenReturn(null);
+      final controller = makeController(initialIsFollowing: false);
+      controller.init();
+
+      await expectLater(
+        controller.toggle(),
+        throwsA(isA<FollowNeedsWebSessionException>()),
+      );
+    });
+
+    test('toggle rethrows integrity and clears action flag', () async {
+      when(
+        () => gqlApi.followUser(
+          targetId: any(named: 'targetId'),
+          authToken: any(named: 'authToken'),
+          integrityToken: any(named: 'integrityToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenThrow(const IntegrityCheckException('failed integrity check'));
+      when(
+        () => gqlApi.fetchIntegrityToken(
+          authToken: any(named: 'authToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenThrow(const IntegrityCheckException('bad bot'));
+
+      final controller = makeController(initialIsFollowing: false);
+      controller.init();
+
+      await expectLater(
+        controller.toggle(),
+        throwsA(isA<IntegrityCheckException>()),
+      );
+      expect(controller.actionInProgress, isFalse);
+      expect(controller.isFollowing, isFalse);
+    });
+
+    test('retryAfterIntegrity applies credentials and follows', () async {
+      when(
+        () => gqlApi.followUser(
+          targetId: any(named: 'targetId'),
+          authToken: any(named: 'authToken'),
+          integrityToken: any(named: 'integrityToken'),
+          deviceId: any(named: 'deviceId'),
+        ),
+      ).thenAnswer((_) async {});
+
+      final controller = makeController(initialIsFollowing: false);
+      controller.init();
+
+      final okToken =
+          'v4.public.${base64Url.encode(utf8.encode(jsonEncode({
+            'is_bad_bot': 'false',
+            'device_id': 'device-abc',
+          })))}.sig';
+
+      final nowFollowing = await controller.retryAfterIntegrity(
+        wasFollowing: false,
+        credentials: GqlIntegrityCredentials(
+          integrityToken: okToken,
+          deviceId: 'device-abc',
+          expirationMs: DateTime.now().millisecondsSinceEpoch + 600000,
+        ),
+      );
+
+      expect(nowFollowing, isTrue);
+      expect(controller.isFollowing, isTrue);
+      verify(
+        () => gqlApi.followUser(
+          targetId: '999',
+          authToken: 'web-token',
+          integrityToken: okToken,
+          deviceId: 'device-abc',
+        ),
+      ).called(1);
+    });
+
+    test('retryAfterIntegrity rejects bad_bot integrity', () async {
+      final controller = makeController(initialIsFollowing: false);
+      controller.init();
+
+      final badToken =
+          'v4.public.${base64Url.encode(utf8.encode(jsonEncode({
+            'is_bad_bot': 'true',
+            'device_id': 'device-abc',
+          })))}.sig';
+
+      await expectLater(
+        controller.retryAfterIntegrity(
+          wasFollowing: false,
+          credentials: GqlIntegrityCredentials(
+            integrityToken: badToken,
+            deviceId: 'device-abc',
+            expirationMs: DateTime.now().millisecondsSinceEpoch + 600000,
+          ),
+        ),
+        throwsA(isA<IntegrityCheckException>()),
+      );
+      expect(controller.actionInProgress, isFalse);
+    });
+  });
+}
diff --git a/web/.claude/CLAUDE.md b/web/.claude/CLAUDE.md
new file mode 100644
index 00000000..a0942049
--- /dev/null
+++ b/web/.claude/CLAUDE.md
@@ -0,0 +1,5 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this directory.
+
+@../AGENTS.md
diff --git a/web/.gitignore b/web/.gitignore
new file mode 100644
index 00000000..f51043ee
--- /dev/null
+++ b/web/.gitignore
@@ -0,0 +1,48 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# env files (can opt-in for committing if needed)
+.env*
+.dev.vars*
+
+# cloudflare
+.open-next
+.wrangler
+cloudflare-env.d.ts
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+# ai
+.claude/settings.local.json
+.playwright-mcp
diff --git a/web/.mcp.json b/web/.mcp.json
new file mode 100644
index 00000000..86cbdc12
--- /dev/null
+++ b/web/.mcp.json
@@ -0,0 +1,8 @@
+{
+  "mcpServers": {
+    "next-devtools": {
+      "command": "node",
+      "args": ["node_modules/next-devtools-mcp/dist/index.js"]
+    }
+  }
+}
diff --git a/web/.npmrc b/web/.npmrc
new file mode 100644
index 00000000..d93a75a6
--- /dev/null
+++ b/web/.npmrc
@@ -0,0 +1,2 @@
+public-hoist-pattern[]=*eslint*
+public-hoist-pattern[]=*prettier*
diff --git a/web/.prettierignore b/web/.prettierignore
new file mode 100644
index 00000000..4bdcd7b9
--- /dev/null
+++ b/web/.prettierignore
@@ -0,0 +1,2 @@
+pnpm-lock.yaml
+src/components/ui/
diff --git a/web/.prettierrc.json b/web/.prettierrc.json
new file mode 100644
index 00000000..885dc3c1
--- /dev/null
+++ b/web/.prettierrc.json
@@ -0,0 +1,6 @@
+{
+  "singleQuote": true,
+  "jsxSingleQuote": true,
+  "semi": false,
+  "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"]
+}
diff --git a/web/AGENTS.md b/web/AGENTS.md
new file mode 100644
index 00000000..7926777d
--- /dev/null
+++ b/web/AGENTS.md
@@ -0,0 +1,94 @@
+# AGENTS.md
+
+---
+
+# Author Preferences
+
+## Infrastructure Checklist
+
+When creating new infrastructure (routes, API handlers, providers), use exploration findings as a **checklist** — systematically verify each convention is followed before writing code.
+
+---
+
+# Project
+
+Next.js 16 landing page for [Frosty](https://frostyapp.io) using the App Router with React 19. Deployed on **Cloudflare Workers** via `@opennextjs/cloudflare`.
+
+## Commands
+
+```bash
+pnpm dev          # Start development server
+pnpm build        # Production build
+pnpm start        # Start production server (Node.js)
+pnpm preview      # Build and preview on local Cloudflare Workers
+pnpm deploy       # Build and deploy to Cloudflare Workers
+pnpm upload       # Build and upload to Cloudflare Workers (no deploy)
+pnpm cf-typegen   # Generate CloudflareEnv types from wrangler.jsonc
+pnpm lint         # Run ESLint
+pnpm typecheck    # TypeScript type checking (tsc --noEmit)
+pnpm format       # Format with Prettier
+pnpm clean        # Delete .next, .open-next, and node_modules
+pnpm nuke         # Delete .next, .open-next, node_modules, and pnpm-lock.yaml
+```
+
+## Source Structure
+
+- `src/app/` - App Router pages and layouts
+- `src/components/` - React components (`ui/` subdirectory for shadcn `base-vega` style — add with `pnpm dlx shadcn@latest add <component>`)
+- `src/lib/` - Utilities (`cn()` for className merging, `constants.ts` for external links)
+- `src/assets/` - Static images (screenshots)
+
+## Key Configuration
+
+- **React Compiler**: Enabled in `next.config.ts` for automatic memoization
+- **Typed Routes**: Enabled for type-safe navigation (use `Route` type from `next/navigation`)
+- **Path Alias**: `@/*` maps to `./src/*`
+- **Strict TypeScript**: `noUncheckedIndexedAccess`, `noImplicitReturns`, `noFallthroughCasesInSwitch`, `noImplicitOverride`, `verbatimModuleSyntax`
+
+## Cache Components
+
+Not yet enabled — `cacheComponents` is not set in `next.config.ts` and no `"use cache"` directives are in use. Everything is dynamic (SSR) by default. To opt in: add `cacheComponents: true` to `next.config.ts`, use `"use cache"` + `cacheLife()` on server components/functions, and wrap async work in `<Suspense>` for PPR. Durable runtime cache requires R2 incremental cache (see `open-next.config.ts`) — without it, cache is in-memory only per Worker instance.
+
+## Cloudflare Workers
+
+- `wrangler.jsonc` - Cloudflare Workers configuration (bindings, R2, KV, etc.)
+- `open-next.config.ts` - OpenNext adapter config (ISR requires uncommenting R2 incremental cache)
+- `cloudflare-env.d.ts` - Generated types for Cloudflare bindings (run `pnpm cf-typegen` to regenerate)
+- Dev mode calls `initOpenNextCloudflareForDev()` in `next.config.ts` for local Cloudflare emulation
+
+## Naming Conventions
+
+- Components: PascalCase (`Button.tsx`)
+- Utilities: camelCase (`formatDate.ts`)
+- Hooks: `use` prefix (`useDebounce.ts`)
+- Types: PascalCase (`UserProfile`)
+
+## ESLint Rules
+
+Config: `eslint.config.mjs`. Ignores `src/components/ui/`.
+
+Notable strict rules enforced:
+
+- `eqeqeq: 'smart'` - Strict equality (except `== null`)
+- `no-console` - Warn on console usage (allows `console.warn` and `console.error`)
+- `@typescript-eslint/strict-boolean-expressions` - No implicit boolean coercion (but `allowNullableBoolean` and `allowNullableString` are enabled)
+- `@typescript-eslint/switch-exhaustiveness-check` - Exhaustive switch statements
+- `@typescript-eslint/consistent-type-imports` - Use `import type` for types (`fixStyle: 'inline-type-imports'`)
+- `@typescript-eslint/no-unnecessary-condition` - No redundant conditions
+- `@typescript-eslint/no-misused-promises` - Prevent floating promises (`checksVoidReturn.attributes` disabled for JSX)
+- `@eslint-react/jsx-shorthand-boolean` - Use shorthand boolean JSX props
+- `@eslint-react/no-array-index-key` - Warn on array index as key
+- `react-you-might-not-need-an-effect` - Avoid unnecessary useEffect
+- Unused variables must be prefixed with `_`
+
+## Gotchas
+
+- **shadcn uses @base-ui/react**: Not Radix UI — component primitives differ from older shadcn examples. `button.tsx` is a `'use client'` module with no `asChild` prop. Check `src/components/ui/` before building custom UI.
+- **`useSearchParams()` needs Suspense**: Always wrap components using `useSearchParams()` in a `<Suspense>` boundary — required for production builds.
+- **Never remove `tw-animate-css`**: Required by shadcn/ui components for animations. Check shadcn dependencies before removing any package.
+- **No `pnpm` prefix inside package.json scripts**: The package manager is already the script runner. Use bare commands (e.g., `next build`, not `pnpm next build`).
+
+## Dev Tooling
+
+- **Prettier**: Auto-sorts imports (`prettier-plugin-organize-imports`) and Tailwind classes (`prettier-plugin-tailwindcss`)
+- **react-scan**: Runtime render performance visualization (dev only)
diff --git a/web/LICENSE b/web/LICENSE
new file mode 100644
index 00000000..a0c32cc5
--- /dev/null
+++ b/web/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Tommy Chow
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/web/README.md b/web/README.md
new file mode 100644
index 00000000..3f08b2d7
--- /dev/null
+++ b/web/README.md
@@ -0,0 +1,36 @@
+# [next-template](https://github.com/tommyxchow/next-template)
+
+A tailored Next.js template project for getting started quickly.
+
+## Why
+
+I spend a bit of tme repeating the same steps when setting up Next.js projects. This template builds upon [`create-next-app`](https://nextjs.org/docs/pages/api-reference/create-next-app) to include my essential packages, configurations, linting rules, and more by default.
+
+## Features
+
+- Precofigured packages
+- Preconfigured ESLint and Prettier rules
+- Default boilerplate removed
+- Dark mode support
+- Formatted README
+
+## Stack
+
+- [Next.js](https://nextjs.org/)
+- [next-themes](https://github.com/pacocoursey/next-themes)
+- [Tailwind CSS](https://tailwindcss.com/) (with [Forms](https://github.com/tailwindlabs/tailwindcss-forms) and [Typography](https://tailwindcss.com/docs/typography-plugin) plugins)
+- [tailwind-merge](https://github.com/dcastil/tailwind-merge)
+
+## Setup
+
+Setup instructions are here if necessary. Usually adding environment variables like so:
+
+```plaintext
+# .env.local
+CLIENT_ID=
+SECRET=
+```
+
+## License
+
+next-template is licensed under [MIT](LICENSE).
diff --git a/web/components.json b/web/components.json
new file mode 100644
index 00000000..4ff9765f
--- /dev/null
+++ b/web/components.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "base-vega",
+  "rsc": true,
+  "tsx": true,
+  "tailwind": {
+    "config": "",
+    "css": "src/app/globals.css",
+    "baseColor": "neutral",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "iconLibrary": "lucide",
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils",
+    "ui": "@/components/ui",
+    "lib": "@/lib",
+    "hooks": "@/hooks"
+  },
+  "menuColor": "default",
+  "menuAccent": "subtle",
+  "registries": {}
+}
diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs
new file mode 100644
index 00000000..ce7da32c
--- /dev/null
+++ b/web/eslint.config.mjs
@@ -0,0 +1,75 @@
+import eslintReact from '@eslint-react/eslint-plugin'
+import eslintJs from '@eslint/js'
+import nextVitals from 'eslint-config-next/core-web-vitals'
+import prettier from 'eslint-config-prettier/flat'
+import reactYouMightNotNeedAnEffect from 'eslint-plugin-react-you-might-not-need-an-effect'
+import { defineConfig } from 'eslint/config'
+import tseslint from 'typescript-eslint'
+
+export default defineConfig(
+  { ignores: ['src/components/ui/'] },
+  eslintJs.configs.recommended,
+  nextVitals,
+
+  // Next.js bundles eslint-plugin-react; disable its rules that overlap with @eslint-react
+  eslintReact.configs['disable-conflict-eslint-plugin-react'],
+
+  {
+    files: ['**/*.{ts,tsx}'],
+    languageOptions: {
+      parser: tseslint.parser,
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
+    extends: [
+      tseslint.configs.recommendedTypeChecked,
+      tseslint.configs.stylisticTypeChecked,
+      eslintReact.configs['recommended-type-checked'],
+      reactYouMightNotNeedAnEffect.configs.recommended,
+    ],
+    rules: {
+      eqeqeq: ['error', 'smart'],
+      'no-console': ['warn', { allow: ['warn', 'error'] }],
+      '@typescript-eslint/consistent-type-imports': [
+        'error',
+        { fixStyle: 'inline-type-imports' },
+      ],
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          args: 'all',
+          argsIgnorePattern: '^_',
+          caughtErrors: 'all',
+          caughtErrorsIgnorePattern: '^_',
+          destructuredArrayIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          ignoreRestSiblings: true,
+        },
+      ],
+      '@typescript-eslint/switch-exhaustiveness-check': 'error',
+      '@typescript-eslint/strict-boolean-expressions': [
+        'error',
+        {
+          allowNullableBoolean: true,
+          allowNullableString: true,
+        },
+      ],
+      '@typescript-eslint/no-unnecessary-condition': 'error',
+      '@typescript-eslint/no-misused-promises': [
+        'error',
+        { checksVoidReturn: { attributes: false } },
+      ],
+      '@eslint-react/jsx-shorthand-boolean': 'error',
+      '@eslint-react/no-array-index-key': 'warn',
+
+      // Redundant with react-you-might-not-need-an-effect
+      '@eslint-react/hooks-extra/no-direct-set-state-in-use-effect': 'off',
+      '@eslint-react/hooks-extra/no-direct-set-state-in-use-layout-effect':
+        'off',
+    },
+  },
+
+  prettier,
+)
diff --git a/web/next.config.ts b/web/next.config.ts
new file mode 100644
index 00000000..a5560aa1
--- /dev/null
+++ b/web/next.config.ts
@@ -0,0 +1,23 @@
+import type { NextConfig } from 'next'
+
+if (process.env.NODE_ENV === 'development') {
+  void import('@opennextjs/cloudflare').then(
+    ({ initOpenNextCloudflareForDev }) => initOpenNextCloudflareForDev(),
+  )
+}
+
+const nextConfig: NextConfig = {
+  // TODO: re-enable image optimization once free transformation quota resets
+  images: {
+    unoptimized: true,
+  },
+  typedRoutes: true,
+  reactCompiler: true,
+  logging: {
+    fetches: {
+      fullUrl: true,
+    },
+  },
+}
+
+export default nextConfig
diff --git a/web/open-next.config.ts b/web/open-next.config.ts
new file mode 100644
index 00000000..92d68194
--- /dev/null
+++ b/web/open-next.config.ts
@@ -0,0 +1,7 @@
+import { defineCloudflareConfig } from '@opennextjs/cloudflare'
+// import r2IncrementalCache from '@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache'
+
+export default defineCloudflareConfig({
+  // Enable when using ISR — requires R2 bucket in wrangler.jsonc
+  // incrementalCache: r2IncrementalCache,
+})
diff --git a/web/package.json b/web/package.json
new file mode 100644
index 00000000..64276b4f
--- /dev/null
+++ b/web/package.json
@@ -0,0 +1,68 @@
+{
+  "name": "frostyapp.io",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "preview": "opennextjs-cloudflare build && opennextjs-cloudflare preview",
+    "deploy": "opennextjs-cloudflare build && opennextjs-cloudflare deploy",
+    "upload": "opennextjs-cloudflare build && opennextjs-cloudflare upload",
+    "cf-typegen": "wrangler types --env-interface CloudflareEnv cloudflare-env.d.ts",
+    "lint": "eslint",
+    "typecheck": "tsc --noEmit",
+    "format": "prettier . --write",
+    "clean": "node -e \"['.next','.open-next','node_modules'].forEach(p=>require('fs').rmSync(p,{recursive:true,force:true}))\"",
+    "nuke": "node -e \"['.next','.open-next','node_modules','pnpm-lock.yaml'].forEach(p=>require('fs').rmSync(p,{recursive:true,force:true}))\""
+  },
+  "dependencies": {
+    "@base-ui/react": "^1.2.0",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
+    "lucide-react": "^0.574.0",
+    "motion": "^12.34.1",
+    "next": "^16.1.6",
+    "next-themes": "^0.4.6",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
+    "react-icons": "^5.5.0",
+    "sonner": "^2.0.7",
+    "tailwind-merge": "^3.4.1",
+    "tw-animate-css": "^1.4.0"
+  },
+  "devDependencies": {
+    "@eslint-react/eslint-plugin": "^2.12.4",
+    "@eslint/js": "^9.39.2",
+    "@opennextjs/cloudflare": "^1.16.5",
+    "@tailwindcss/postcss": "^4.1.18",
+    "@types/node": "^25.2.3",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
+    "babel-plugin-react-compiler": "^1.0.0",
+    "eslint": "^9.39.2",
+    "eslint-config-next": "^16.1.6",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-react-you-might-not-need-an-effect": "^0.9.1",
+    "next-devtools-mcp": "^0.3.10",
+    "postcss": "^8.5.6",
+    "prettier": "^3.8.1",
+    "prettier-plugin-organize-imports": "^4.3.0",
+    "prettier-plugin-tailwindcss": "^0.7.2",
+    "shadcn": "^3.8.5",
+    "tailwindcss": "^4.1.18",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.56.0",
+    "wrangler": "^4.66.0"
+  },
+  "packageManager": "pnpm@10.27.0",
+  "pnpm": {
+    "onlyBuiltDependencies": [
+      "esbuild",
+      "msw",
+      "sharp",
+      "unrs-resolver",
+      "workerd"
+    ]
+  }
+}
diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml
new file mode 100644
index 00000000..9096a24e
--- /dev/null
+++ b/web/pnpm-lock.yaml
@@ -0,0 +1,9434 @@
+lockfileVersion: '9.0'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+
+  .:
+    dependencies:
+      '@base-ui/react':
+        specifier: ^1.2.0
+        version: 1.5.0(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      class-variance-authority:
+        specifier: ^0.7.1
+        version: 0.7.1
+      clsx:
+        specifier: ^2.1.1
+        version: 2.1.1
+      lucide-react:
+        specifier: ^0.574.0
+        version: 0.574.0(react@19.2.7)
+      motion:
+        specifier: ^12.34.1
+        version: 12.40.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      next:
+        specifier: ^16.1.6
+        version: 16.2.9(@babel/core@7.29.7)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      next-themes:
+        specifier: ^0.4.6
+        version: 0.4.6(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      react:
+        specifier: ^19.2.4
+        version: 19.2.7
+      react-dom:
+        specifier: ^19.2.4
+        version: 19.2.7(react@19.2.7)
+      react-icons:
+        specifier: ^5.5.0
+        version: 5.6.0(react@19.2.7)
+      sonner:
+        specifier: ^2.0.7
+        version: 2.0.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      tailwind-merge:
+        specifier: ^3.4.1
+        version: 3.6.0
+      tw-animate-css:
+        specifier: ^1.4.0
+        version: 1.4.0
+    devDependencies:
+      '@eslint-react/eslint-plugin':
+        specifier: ^2.12.4
+        version: 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint/js':
+        specifier: ^9.39.2
+        version: 9.39.4
+      '@opennextjs/cloudflare':
+        specifier: ^1.16.5
+        version: 1.19.11(next@16.2.9(@babel/core@7.29.7)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(wrangler@4.100.0)
+      '@tailwindcss/postcss':
+        specifier: ^4.1.18
+        version: 4.3.1
+      '@types/node':
+        specifier: ^25.2.3
+        version: 25.9.3
+      '@types/react':
+        specifier: ^19.2.14
+        version: 19.2.17
+      '@types/react-dom':
+        specifier: ^19.2.3
+        version: 19.2.3(@types/react@19.2.17)
+      babel-plugin-react-compiler:
+        specifier: ^1.0.0
+        version: 1.0.0
+      eslint:
+        specifier: ^9.39.2
+        version: 9.39.4(jiti@2.7.0)
+      eslint-config-next:
+        specifier: ^16.1.6
+        version: 16.2.9(@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3))(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint-config-prettier:
+        specifier: ^10.1.8
+        version: 10.1.8(eslint@9.39.4(jiti@2.7.0))
+      eslint-plugin-react-you-might-not-need-an-effect:
+        specifier: ^0.9.1
+        version: 0.9.3(eslint@9.39.4(jiti@2.7.0))
+      next-devtools-mcp:
+        specifier: ^0.3.10
+        version: 0.3.10
+      postcss:
+        specifier: ^8.5.6
+        version: 8.5.15
+      prettier:
+        specifier: ^3.8.1
+        version: 3.8.4
+      prettier-plugin-organize-imports:
+        specifier: ^4.3.0
+        version: 4.3.0(prettier@3.8.4)(typescript@5.9.3)
+      prettier-plugin-tailwindcss:
+        specifier: ^0.7.2
+        version: 0.7.4(prettier-plugin-organize-imports@4.3.0(prettier@3.8.4)(typescript@5.9.3))(prettier@3.8.4)
+      shadcn:
+        specifier: ^3.8.5
+        version: 3.8.5(@types/node@25.9.3)(typescript@5.9.3)
+      tailwindcss:
+        specifier: ^4.1.18
+        version: 4.3.1
+      typescript:
+        specifier: ^5.9.3
+        version: 5.9.3
+      typescript-eslint:
+        specifier: ^8.56.0
+        version: 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      wrangler:
+        specifier: ^4.66.0
+        version: 4.100.0
+
+packages:
+
+  '@alloc/quick-lru@5.2.0':
+    resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
+    engines: {node: '>=10'}
+
+  '@antfu/ni@25.0.0':
+    resolution: {integrity: sha512-9q/yCljni37pkMr4sPrI3G4jqdIk074+iukc5aFJl7kmDCCsiJrbZ6zKxnES1Gwg+i9RcDZwvktl23puGslmvA==}
+    hasBin: true
+
+  '@ast-grep/napi-darwin-arm64@0.40.5':
+    resolution: {integrity: sha512-2F072fGN0WTq7KI3okuEnkGJVEHLbi56Bw1H6NAMf7j2mJJeQWsRyGOMcyNnUXZDeNdvoMH0OB2a5wwUegY/nQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@ast-grep/napi-darwin-x64@0.40.5':
+    resolution: {integrity: sha512-dJMidHZhhxuLBYNi6/FKI812jQ7wcFPSKkVPwviez2D+KvYagapUMAV/4dJ7FCORfguVk8Y0jpPAlYmWRT5nvA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@ast-grep/napi-linux-arm64-gnu@0.40.5':
+    resolution: {integrity: sha512-nBRCbyoS87uqkaw4Oyfe5VO+SRm2B+0g0T8ME69Qry9ShMf41a2bTdpcQx9e8scZPogq+CTwDHo3THyBV71l9w==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@ast-grep/napi-linux-arm64-musl@0.40.5':
+    resolution: {integrity: sha512-/qKsmds5FMoaEj6FdNzepbmLMtlFuBLdrAn9GIWCqOIcVcYvM1Nka8+mncfeXB/MFZKOrzQsQdPTWqrrQzXLrA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@ast-grep/napi-linux-x64-gnu@0.40.5':
+    resolution: {integrity: sha512-DP4oDbq7f/1A2hRTFLhJfDFR6aI5mRWdEfKfHzRItmlKsR9WlcEl1qDJs/zX9R2EEtIDsSKRzuJNfJllY3/W8Q==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@ast-grep/napi-linux-x64-musl@0.40.5':
+    resolution: {integrity: sha512-BRZUvVBPUNpWPo6Ns8chXVzxHPY+k9gpsubGTHy92Q26ecZULd/dTkWWdnvfhRqttsSQ9Pe/XQdi5+hDQ6RYcg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@ast-grep/napi-win32-arm64-msvc@0.40.5':
+    resolution: {integrity: sha512-y95zSEwc7vhxmcrcH0GnK4ZHEBQrmrszRBNQovzaciF9GUqEcCACNLoBesn4V47IaOp4fYgD2/EhGRTIBFb2Ug==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@ast-grep/napi-win32-ia32-msvc@0.40.5':
+    resolution: {integrity: sha512-K/u8De62iUnFCzVUs7FBdTZ2Jrgc5/DLHqjpup66KxZ7GIM9/HGME/O8aSoPkpcAeCD4TiTZ11C1i5p5H98hTg==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@ast-grep/napi-win32-x64-msvc@0.40.5':
+    resolution: {integrity: sha512-dqm5zg/o4Nh4VOQPEpMS23ot8HVd22gG0eg01t4CFcZeuzyuSgBlOL3N7xLbz3iH2sVkk7keuBwAzOIpTqziNQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@ast-grep/napi@0.40.5':
+    resolution: {integrity: sha512-hJA62OeBKUQT68DD2gDyhOqJxZxycqg8wLxbqjgqSzYttCMSDL9tiAQ9abgekBYNHudbJosm9sWOEbmCDfpX2A==}
+    engines: {node: '>= 10'}
+
+  '@aws-crypto/crc32@5.2.0':
+    resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-crypto/crc32c@5.2.0':
+    resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==}
+
+  '@aws-crypto/sha1-browser@5.2.0':
+    resolution: {integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==}
+
+  '@aws-crypto/sha256-browser@5.2.0':
+    resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==}
+
+  '@aws-crypto/sha256-js@5.2.0':
+    resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-crypto/supports-web-crypto@5.2.0':
+    resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==}
+
+  '@aws-crypto/util@5.2.0':
+    resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==}
+
+  '@aws-sdk/checksums@3.1000.5':
+    resolution: {integrity: sha512-zOXUUnilC6lgCsQtp77p/QNPmRlTES9Xi6tlDwbR6kfC/kz5PCzZckgHWm5z+8DskdwuMAbFDq61x3zr10GEEQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/client-cloudfront@3.984.0':
+    resolution: {integrity: sha512-couDuDLpJtoeWne/nYyJ+I+5ntBVdNgBVRTCoDaXuVV7OC3u/wz5Ps0+GogspEwMLEFoOJ8t691h3YXQtnpQTw==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/client-dynamodb@3.984.0':
+    resolution: {integrity: sha512-8/Oft9MWQtbG6p9f8eY5fsKC2CcO5YVDlwive8eUYS9mEbgnyQxm68OyH26WvsSTykQ9QkIbR+fOG56RsIBODw==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/client-lambda@3.984.0':
+    resolution: {integrity: sha512-kqwNBIGNxGVhINwgN/UQfdsQkaMjbu9PFV2EhATWouV+RT60uMjK9JENgLDwbgJmEVbbnPsh9HaZ5KKwPSdiDg==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/client-s3@3.984.0':
+    resolution: {integrity: sha512-7ny2Slr93Y+QniuluvcfWwyDi32zWQfznynL56Tk0vVh7bWrvS/odm8WP2nInKicRVNipcJHY2YInur6Q/9V0A==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/client-sqs@3.984.0':
+    resolution: {integrity: sha512-TDvHpOUWlpanc3xQ5Xw0y8L2hoojBFCCSmXQ/6rKqGOf1ScX3dMA+K9aF0Zp0iwjhSh4VvsHD42esl8XwQZDjA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/core@3.974.20':
+    resolution: {integrity: sha512-7sDi2B2N3mc3nf1nz6FyEx/FCrJ1N1QnBmraHHQNabFaeAh2IaOOLml48/rHOD1bICHgTRkbBgNTvUzEr5Z35g==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/credential-provider-env@3.972.46':
+    resolution: {integrity: sha512-+GPXVS2srMOlH74S+SmC1gVuP2TvUZ0siuC0onKO93q+udP+M72dmY8wJfVQ5CX9z/9X5A1HHwz5yRIGBtskvQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/credential-provider-http@3.972.48':
+    resolution: {integrity: sha512-fA5loSdlocacRxyUXtpoHSMuk5rsIKRDzQYVMnMxjcmFeZshaJlJ8lymy/hYKji6sne/UmNGj5pxuEs6kq/Qcg==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/credential-provider-ini@3.972.53':
+    resolution: {integrity: sha512-ZfdhIOR41q8TcWEnUac+gCOb+O2LBWdHLmjedXpXz4IEFW2ppNuFcm6p0sMTavpM+zD5TYfpH5Gp7guRyqSgsQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/credential-provider-login@3.972.52':
+    resolution: {integrity: sha512-9hu2oR0qH7Fst5Tzdx+UWxm+w5zCXtErTLtOOW5hwwQc170CLwOeniRxyFY6s9mHfGEfC5zFukNBdKBwJR8mhQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/credential-provider-node@3.972.55':
+    resolution: {integrity: sha512-zMGLa/dhESVqmCD7mmIFFKSwSFrJGScvCXcjvBZEVOOMauFS5JRQvLTMukFpMEFWiV6dTAlsen2ATDBulLPtbg==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/credential-provider-process@3.972.46':
+    resolution: {integrity: sha512-VUoNFBIjWrUN8NbFiQiuxQEgFjvziAlBRPK+ddh27aj65gk0BYu6bLZnrdrNZwpW6vAihtSUtEMQ1PUJ32QRPA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/credential-provider-sso@3.972.52':
+    resolution: {integrity: sha512-nb2/n4o/HQf+FVpVbZe9vCTFngmuDoIsltMgLAtjixaKzvzhB4J8WSDFyWgnErgLHk55ctWH+I4PU+LIHhyffg==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/credential-provider-web-identity@3.972.52':
+    resolution: {integrity: sha512-lKj6aRSGbqLmpYmM24bY7a1Xmfcq2vkE3hv8CSPYfc1yCu0BPu/XEJ1L4Fm61MsU6ULLNSG8UGsffNoFUBjESA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/dynamodb-codec@3.973.20':
+    resolution: {integrity: sha512-SFfxiqVgWeIe+RsJJNAMD//2IfehT4bLpGyNJRB0MgHmOIJtdcfMnR1k7KYyaHokSoQVdncVa9O9DIGa4eqcwg==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/endpoint-cache@3.972.7':
+    resolution: {integrity: sha512-LkwS3ZOUNL5kHzmz3dDx8lE3HOhZmf2VGjbJ/tMUZJYWWl3J0RJTZM7RFz1MLt06WDVvlShcAjY/RzhYlqLL7g==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-bucket-endpoint@3.972.24':
+    resolution: {integrity: sha512-DUGVPyHUdSJ8reJrFTdSkt768EyEbX8quIcd6lqTwr2GqFX2yVocSv66akxFd21VJvdFNdhLU4D+NHCvR6gmOw==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-endpoint-discovery@3.972.18':
+    resolution: {integrity: sha512-1vKJt/6MBB/MBMRM3qzCMdW70syJY8u2DH+dq7yCnPn7wVJmyeAzAa/sK1lIbbYh8BVLbM5FspsT4zbe885gOw==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-expect-continue@3.972.20':
+    resolution: {integrity: sha512-S6sqRv/HhFfv+eCwi+dSIjRTXAxLxyESJIP9giIIVuJAEdi2zFoMd0PdIg65U7JprT7yq0TvHilp2BBDbw8slw==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-flexible-checksums@3.974.30':
+    resolution: {integrity: sha512-OaIhub+3yTgfFWPzKO8OzOZFIMUoJaiS5v67y3spQg7SoULGoMx4jKVBbE+uhnzkiZXQ+rEDS0RqrK4/aD1yJw==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-host-header@3.972.21':
+    resolution: {integrity: sha512-+SRZL54/T9Ryxa/NmHM7WZAliU6wnfzeosT/+4IVuTgq0zSCpPx2j3yaEP4JFZlvWvoOCbKgr+4tBqSAG/dl5Q==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-location-constraint@3.972.17':
+    resolution: {integrity: sha512-DYCppgVKrKRuS+bVJsgQ0N6uARd9YoF1H1rVeTnhHsCp2Ppru9BXb4LdvDQzoKc4fK+MABl3Fz9ck40WBrUsWA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-logger@3.972.20':
+    resolution: {integrity: sha512-8oOvo7XNDeOlwa5ys2Q0UTLCKmtvRiqf8rOU63lKniPmP3dnI5lnoy9dteZ79lxb9hmXCrO28aZMqds6C5AEoA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-recursion-detection@3.972.22':
+    resolution: {integrity: sha512-q4H/CoOYrTbyAW0d9RrHf9kTYKVXpAwoK0VEy3UT2Asad+6aa6vzQgz35dh20tRA7zlEo/Nsyjy9PVlHgdq0Vg==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-sdk-s3@3.972.51':
+    resolution: {integrity: sha512-keQgcIUTcHL0Qn7guhsuLaxQU36r9norCrxgaPH4DNCwon4TPtXdI/UdYuycl9vj3Dlwc3YR1dfL3U+6iIwJ6w==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-sdk-sqs@3.972.30':
+    resolution: {integrity: sha512-PVAj7VgWK/ZxCXnkgC4B7cdJyUN99Nsr7IEduHt4A1GieuB+ZnU5bSifHwapbr17wrFkmdxfSh+aA0Lj+Ads6w==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-ssec@3.972.17':
+    resolution: {integrity: sha512-LGpxxtMv/8cQnLeUiZqubqlzSA5ebv+yx+651dq7Sf+KxErRFaj6bdz7Rl9sO8ixvm5+ROfHeZDdNUprVz1etg==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/middleware-user-agent@3.972.50':
+    resolution: {integrity: sha512-5JIDcDFWy3DUW95sOlXLbeb7RkGFUcNh1QidKsznqtlm5YGsXP0EGWaqzxBTvVmOhqKs2RmNmI6w9V/5dS3CLQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/nested-clients@3.997.20':
+    resolution: {integrity: sha512-IYJuLpXp2DEILVQpQOy0PMpkftv0AHEOCn52o0atyOaumA0CdWQ3klPyXdViGYLbNpESsVFMVybvHUeZAuiGxA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/region-config-resolver@3.972.24':
+    resolution: {integrity: sha512-WY6uVMsq0EvxY4BcYhZmG2Ivd1EzNvZAqsXFlL3pTPMG0P4J83TYVQIs8P0nd5lc+Bp3llrYwggruvXzrfUtsQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/signature-v4-multi-region@3.984.0':
+    resolution: {integrity: sha512-TaWbfYCwnuOSvDSrgs7QgoaoXse49E7LzUkVOUhoezwB7bkmhp+iojADm7UepCEu4021SquD7NG1xA+WCvmldA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/signature-v4-multi-region@3.996.34':
+    resolution: {integrity: sha512-mx1L5qlumSOt/nKM3BFaHE2HVkWwz0i4Bw0pyYO42FfX/FeLlo8YI6csC0gSPprEk6fTIqI+CZN9RwUwKd5krQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/token-providers@3.1066.0':
+    resolution: {integrity: sha512-UqEUJq7dqa44hneLDUcX7UJy95cg8YqEWyakRpvIPnrNS3Mq+UlQHgCDGu5pvwAPtlIW4qcYbvW6reG6++FyvA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/types@3.973.12':
+    resolution: {integrity: sha512-43ajd1NF0RMgX5k0hxCNUyEdrtFUsb2aHT2QvpktSC/2Eyb2Jr/JPVqdp0XIoaHWikZJq5tNWSLO6kB5q2eMCA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/util-endpoints@3.984.0':
+    resolution: {integrity: sha512-9ebjLA0hMKHeVvXEtTDCCOBtwjb0bOXiuUV06HNeVdgAjH6gj4x4Zwt4IBti83TiyTGOCl5YfZqGx4ehVsasbQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/util-locate-window@3.965.7':
+    resolution: {integrity: sha512-M0D6oIpohdNHjc7udzTHEQyot0+0iuA36jc2I9Hps+f/GtKi2HO/pyijQnCnNcwZqLB5+rtn81z3eZK/GyjAmA==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/util-user-agent-browser@3.972.21':
+    resolution: {integrity: sha512-Y9MPH4VZaIebwxiVK6dMzSt5L04oyNiK3NNwFe4qP5B2Hfo+pmEVpSJSa+gARPtcJeRyehUMPu5/I9DLdW0cBg==}
+
+  '@aws-sdk/util-user-agent-node@3.973.36':
+    resolution: {integrity: sha512-wsmSmHTrK9lV+5SKBekp1J7W6PufdZE08X0xv5Lz1OdgYRmyuYDy/++SslKdXhcVQjxLtzMTZaLqqLZmTx6OaQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws-sdk/xml-builder@3.972.29':
+    resolution: {integrity: sha512-fk0niuGFxfi8yIJuMVM4mhwObkiQSuwZFj3tAPrLVx64Pk3BkrEIpqjzHKY4hKoEBUD6Jg/S74Zj9jy+5F3DnQ==}
+    engines: {node: '>=20.0.0'}
+
+  '@aws/lambda-invoke-store@0.2.4':
+    resolution: {integrity: sha512-iY8yvjE0y651BixKNPgmv1WrQc+GZ142sb0z4gYnChDDY2YqI4P/jsSopBWrKfAt7LOJAkOXt7rC/hms+WclQQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@babel/code-frame@7.29.7':
+    resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/compat-data@7.29.7':
+    resolution: {integrity: sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/core@7.29.7':
+    resolution: {integrity: sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/generator@7.29.7':
+    resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-annotate-as-pure@7.29.7':
+    resolution: {integrity: sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-compilation-targets@7.29.7':
+    resolution: {integrity: sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-create-class-features-plugin@7.29.7':
+    resolution: {integrity: sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-globals@7.29.7':
+    resolution: {integrity: sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-member-expression-to-functions@7.29.7':
+    resolution: {integrity: sha512-j+7JYmk1JYDtACIGj0QJqqWZjoUpMoEikQGADMaHgCMCSDqd2+P32rfcibUNrGOMWrlzK1WJBdxrB3JJQZwWtg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-imports@7.29.7':
+    resolution: {integrity: sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-transforms@7.29.7':
+    resolution: {integrity: sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-optimise-call-expression@7.29.7':
+    resolution: {integrity: sha512-+kmGVjcT9RGYzoDwdwEqEvGgKe3BYq+O1iGzjFubaNgZHwYHP6lsF2Yghf4kEuv9BV7tYDZ913aBW9am6YKong==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-plugin-utils@7.29.7':
+    resolution: {integrity: sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-replace-supers@7.29.7':
+    resolution: {integrity: sha512-atfGXWSeCiF4DnKZIfmJfQRkSw9b9gNNXR1kqKjbhG4pGYCOnkp8OcTB8E3NXjBu8NpheSnOeNKz8KT7UNFTmQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.29.7':
+    resolution: {integrity: sha512-brcMGQaVzIeUb+6/bs1Av0f8YuNNjKY2JyvfRCsFuFsdKccEQ5Ges2y74D74NZ1Rz8lKJ9ksJkfqwQFJ/iNEyQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-string-parser@7.29.7':
+    resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-identifier@7.29.7':
+    resolution: {integrity: sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-option@7.29.7':
+    resolution: {integrity: sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helpers@7.29.7':
+    resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/parser@7.29.7':
+    resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-syntax-jsx@7.29.7':
+    resolution: {integrity: sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-typescript@7.29.7':
+    resolution: {integrity: sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-commonjs@7.29.7':
+    resolution: {integrity: sha512-j0vCldybPC5b5dwCQOJ21uKtHzt7hxLygJTg9eF1ScfaikEDNfzn94XoW5Fi+seBR0nCyL23xaBFFkq7dTM8XQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typescript@7.29.7':
+    resolution: {integrity: sha512-jK52h8LaLc7JarhQV2ofeFMts4H7vnOXnqZNA6fYglBTZewRBE51KWt3BUltW1P+KoPsYkHoJeXePuz4zo2LMw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-typescript@7.29.7':
+    resolution: {integrity: sha512-/Foi8vKY2EVbed/1eZx0gJEEwHAIxogrySI7rULcRIvhZzbvoE/b5qG5Ghc0WKAFKOHA9SD1x7RsFlOYdutIiQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/runtime@7.29.7':
+    resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/template@7.29.7':
+    resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/traverse@7.29.7':
+    resolution: {integrity: sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.29.7':
+    resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==}
+    engines: {node: '>=6.9.0'}
+
+  '@base-ui/react@1.5.0':
+    resolution: {integrity: sha512-z1gSAlced1yY+iM+mHDEtIkD8UI3Ebs52MuBPxvV6f5hRutk+xvCH/wuB7hDqDzK9JG5FoMz5nhrqtSs1wjt1A==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      '@date-fns/tz': ^1.2.0
+      '@types/react': ^17 || ^18 || ^19
+      date-fns: ^4.0.0
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@date-fns/tz':
+        optional: true
+      '@types/react':
+        optional: true
+      date-fns:
+        optional: true
+
+  '@base-ui/utils@0.2.9':
+    resolution: {integrity: sha512-x/PDDCYzoqPpjrdyb3VcyylTI2IjUXEtYDGi5foh7KsnmNJIIaVwA2GLgDH1dps1GgXiJbA60hM+AyuTfQzIvw==}
+    peerDependencies:
+      '@types/react': ^17 || ^18 || ^19
+      react: ^17 || ^18 || ^19
+      react-dom: ^17 || ^18 || ^19
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@cloudflare/kv-asset-handler@0.5.0':
+    resolution: {integrity: sha512-jxQYkj8dSIzc0cD6cMMNdOc1UVjqSqu8BZdor5s8cGjW2I8BjODt/kWPVdY+u9zj3ms75Q5qaZgnxUad83+eAg==}
+    engines: {node: '>=22.0.0'}
+
+  '@cloudflare/unenv-preset@2.16.1':
+    resolution: {integrity: sha512-ECxObrMfyTl5bhQf/lZCXwo5G6xX9IAUo+nDMKK4SZ8m4Jvvxp52vilxyySSWh2YTZz8+HQ07qGH/2rEom1vDw==}
+    peerDependencies:
+      unenv: 2.0.0-rc.24
+      workerd: '>1.20260305.0 <2.0.0-0'
+    peerDependenciesMeta:
+      workerd:
+        optional: true
+
+  '@cloudflare/workerd-darwin-64@1.20260611.1':
+    resolution: {integrity: sha512-iJICldmi4sBGgi7IrQles8cStOGXM/Tmv95C4OODVs6VIbMsJPqThUM5h3uYVQNULuJ8I/aVvnJ3Eh/wZCKwuA==}
+    engines: {node: '>=16'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@cloudflare/workerd-darwin-arm64@1.20260611.1':
+    resolution: {integrity: sha512-yBbVXvbZyltR3I7NJdC4C4ItkItjZSiabcA/3HzEWOUQjLVKFqRh4so6ToHr70VCYh8VGeR8EDZL23igLhXqFQ==}
+    engines: {node: '>=16'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@cloudflare/workerd-linux-64@1.20260611.1':
+    resolution: {integrity: sha512-PfNjpxOlaIgZFYuhD7+neEEewCN2Ud993wEEN0fmbtSOax1AK53LGqmXUDvFhnbkHxJLFAxYCSNISW8QbzaAIg==}
+    engines: {node: '>=16'}
+    cpu: [x64]
+    os: [linux]
+
+  '@cloudflare/workerd-linux-arm64@1.20260611.1':
+    resolution: {integrity: sha512-GEp4XbuIKjlF8pakqXcUDJfKiJosD/Q7S83J0d+r+z9XIlYGfF3ntm08e2aiF5TFTwp3fnG4yMoPUAKNhNJpvQ==}
+    engines: {node: '>=16'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@cloudflare/workerd-windows-64@1.20260611.1':
+    resolution: {integrity: sha512-S6JkS0kEbcCKs19RGqEPhjCRbP8GBkQwqYLp2fhBJtD/KTlwqLzOJ9E6PQ7gQKgWHtxy1NBG3oXarlNFRNU/dw==}
+    engines: {node: '>=16'}
+    cpu: [x64]
+    os: [win32]
+
+  '@cspotcode/source-map-support@0.8.1':
+    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
+    engines: {node: '>=12'}
+
+  '@dotenvx/dotenvx@1.31.0':
+    resolution: {integrity: sha512-GeDxvtjiRuoyWVU9nQneId879zIyNdL05bS7RKiqMkfBSKpHMWHLoRyRqjYWLaXmX/llKO1hTlqHDmatkQAjPA==}
+    hasBin: true
+
+  '@dotenvx/dotenvx@1.71.3':
+    resolution: {integrity: sha512-WSmox5aD+XxJEUEOTk7gKLpd5+Iz9Nik89Zpbu5DijMln6LsFiv3xpNKBMc/b9sSkUlKvAblzrhik2TqKFE7NA==}
+    hasBin: true
+
+  '@ecies/ciphers@0.2.6':
+    resolution: {integrity: sha512-patgsRPKGkhhoBjETV4XxD0En4ui5fbX0hzayqI3M8tvNMGUoUvmyYAIWwlxBc1KX5cturfqByYdj5bYGRpN9g==}
+    engines: {bun: '>=1', deno: '>=2.7.10', node: '>=16'}
+    peerDependencies:
+      '@noble/ciphers': ^1.0.0
+
+  '@emnapi/core@1.10.0':
+    resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==}
+
+  '@emnapi/runtime@1.10.0':
+    resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==}
+
+  '@emnapi/runtime@1.11.1':
+    resolution: {integrity: sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==}
+
+  '@emnapi/wasi-threads@1.2.1':
+    resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==}
+
+  '@esbuild/aix-ppc64@0.25.4':
+    resolution: {integrity: sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/aix-ppc64@0.27.3':
+    resolution: {integrity: sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.25.4':
+    resolution: {integrity: sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm64@0.27.3':
+    resolution: {integrity: sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.25.4':
+    resolution: {integrity: sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-arm@0.27.3':
+    resolution: {integrity: sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.25.4':
+    resolution: {integrity: sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/android-x64@0.27.3':
+    resolution: {integrity: sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.25.4':
+    resolution: {integrity: sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-arm64@0.27.3':
+    resolution: {integrity: sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.25.4':
+    resolution: {integrity: sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.27.3':
+    resolution: {integrity: sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.25.4':
+    resolution: {integrity: sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-arm64@0.27.3':
+    resolution: {integrity: sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.25.4':
+    resolution: {integrity: sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.27.3':
+    resolution: {integrity: sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.25.4':
+    resolution: {integrity: sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm64@0.27.3':
+    resolution: {integrity: sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.25.4':
+    resolution: {integrity: sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.27.3':
+    resolution: {integrity: sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.25.4':
+    resolution: {integrity: sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.27.3':
+    resolution: {integrity: sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.25.4':
+    resolution: {integrity: sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.27.3':
+    resolution: {integrity: sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.25.4':
+    resolution: {integrity: sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.27.3':
+    resolution: {integrity: sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.25.4':
+    resolution: {integrity: sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.27.3':
+    resolution: {integrity: sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.25.4':
+    resolution: {integrity: sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.27.3':
+    resolution: {integrity: sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.25.4':
+    resolution: {integrity: sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.27.3':
+    resolution: {integrity: sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.25.4':
+    resolution: {integrity: sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.27.3':
+    resolution: {integrity: sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.25.4':
+    resolution: {integrity: sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-arm64@0.27.3':
+    resolution: {integrity: sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.25.4':
+    resolution: {integrity: sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.27.3':
+    resolution: {integrity: sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.25.4':
+    resolution: {integrity: sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-arm64@0.27.3':
+    resolution: {integrity: sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.25.4':
+    resolution: {integrity: sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.27.3':
+    resolution: {integrity: sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openharmony-arm64@0.27.3':
+    resolution: {integrity: sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@esbuild/sunos-x64@0.25.4':
+    resolution: {integrity: sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/sunos-x64@0.27.3':
+    resolution: {integrity: sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.25.4':
+    resolution: {integrity: sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-arm64@0.27.3':
+    resolution: {integrity: sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.25.4':
+    resolution: {integrity: sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.27.3':
+    resolution: {integrity: sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.25.4':
+    resolution: {integrity: sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.27.3':
+    resolution: {integrity: sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
+  '@eslint-community/eslint-utils@4.9.1':
+    resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.12.2':
+    resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint-react/ast@2.13.0':
+    resolution: {integrity: sha512-43+5gmqV3MpatTzKnu/V2i/jXjmepvwhrb9MaGQvnXHQgq9J7/C7VVCCcwp6Rvp2QHAFquAAdvQDSL8IueTpeA==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  '@eslint-react/core@2.13.0':
+    resolution: {integrity: sha512-m62XDzkf1hpzW4sBc7uh7CT+8rBG2xz/itSADuEntlsg4YA7Jhb8hjU6VHf3wRFDwyfx5VnbV209sbJ7Azey0Q==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  '@eslint-react/eff@2.13.0':
+    resolution: {integrity: sha512-rEH2R8FQnUAblUW+v3ZHDU1wEhatbL1+U2B1WVuBXwSKqzF7BGaLqCPIU7o9vofumz5MerVfaCtJgI8jYe2Btg==}
+    engines: {node: '>=20.19.0'}
+
+  '@eslint-react/eslint-plugin@2.13.0':
+    resolution: {integrity: sha512-iaMXpqnJCTW7317hg8L4wx7u5aIiPzZ+d1p59X8wXFgMHzFX4hNu4IfV8oygyjmWKdLsjKE9sEpv/UYWczlb+A==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  '@eslint-react/shared@2.13.0':
+    resolution: {integrity: sha512-IOloCqrZ7gGBT4lFf9+0/wn7TfzU7JBRjYwTSyb9SDngsbeRrtW95ZpgUpS8/jen1wUEm6F08duAooTZ2FtsWA==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  '@eslint-react/var@2.13.0':
+    resolution: {integrity: sha512-dM+QaeiHR16qPQoJYg205MkdHYSWVa2B7ore5OFpOPlSwqDV3tLW7I+475WjbK7potq5QNPTxRa7VLp9FGeQqA==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  '@eslint/config-array@0.21.2':
+    resolution: {integrity: sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/config-helpers@0.4.2':
+    resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/core@0.17.0':
+    resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/eslintrc@3.3.5':
+    resolution: {integrity: sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/js@9.39.4':
+    resolution: {integrity: sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/object-schema@2.1.7':
+    resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@eslint/plugin-kit@0.4.1':
+    resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@floating-ui/core@1.7.5':
+    resolution: {integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==}
+
+  '@floating-ui/dom@1.7.6':
+    resolution: {integrity: sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==}
+
+  '@floating-ui/react-dom@2.1.8':
+    resolution: {integrity: sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+
+  '@floating-ui/utils@0.2.11':
+    resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==}
+
+  '@hono/node-server@1.19.14':
+    resolution: {integrity: sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==}
+    engines: {node: '>=18.14.1'}
+    peerDependencies:
+      hono: ^4
+
+  '@humanfs/core@0.19.2':
+    resolution: {integrity: sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanfs/node@0.16.8':
+    resolution: {integrity: sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanfs/types@0.15.0':
+    resolution: {integrity: sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==}
+    engines: {node: '>=18.18.0'}
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/retry@0.4.3':
+    resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
+    engines: {node: '>=18.18'}
+
+  '@img/colour@1.1.0':
+    resolution: {integrity: sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==}
+    engines: {node: '>=18'}
+
+  '@img/sharp-darwin-arm64@0.34.5':
+    resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-darwin-x64@0.34.5':
+    resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-arm64@1.2.4':
+    resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-x64@1.2.4':
+    resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-linux-arm64@1.2.4':
+    resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-arm@1.2.4':
+    resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-ppc64@1.2.4':
+    resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-riscv64@1.2.4':
+    resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-s390x@1.2.4':
+    resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-x64@1.2.4':
+    resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
+    resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-x64@1.2.4':
+    resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linux-arm64@0.34.5':
+    resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linux-arm@0.34.5':
+    resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-linux-ppc64@0.34.5':
+    resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@img/sharp-linux-riscv64@0.34.5':
+    resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@img/sharp-linux-s390x@0.34.5':
+    resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-linux-x64@0.34.5':
+    resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-arm64@0.34.5':
+    resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-x64@0.34.5':
+    resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-wasm32@0.34.5':
+    resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [wasm32]
+
+  '@img/sharp-win32-arm64@0.34.5':
+    resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@img/sharp-win32-ia32@0.34.5':
+    resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@img/sharp-win32-x64@0.34.5':
+    resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@inquirer/ansi@2.0.7':
+    resolution: {integrity: sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+
+  '@inquirer/confirm@6.1.1':
+    resolution: {integrity: sha512-eb8DBZcz/2qHWQda4rk2JiQk5h9QV/cVHi1yjt0f69WFZMRFn0sJTye3EAP8icut8UDMjQPsaH5KbcOogefrFQ==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/core@11.2.1':
+    resolution: {integrity: sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@inquirer/figures@2.0.7':
+    resolution: {integrity: sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+
+  '@inquirer/type@4.0.7':
+    resolution: {integrity: sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==}
+    engines: {node: '>=23.5.0 || ^22.13.0 || ^20.17.0'}
+    peerDependencies:
+      '@types/node': '>=18'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+
+  '@isaacs/cliui@9.0.0':
+    resolution: {integrity: sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==}
+    engines: {node: '>=18'}
+
+  '@jridgewell/gen-mapping@0.3.13':
+    resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
+
+  '@jridgewell/remapping@2.3.5':
+    resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/source-map@0.3.11':
+    resolution: {integrity: sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==}
+
+  '@jridgewell/sourcemap-codec@1.5.5':
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
+
+  '@jridgewell/trace-mapping@0.3.31':
+    resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
+
+  '@jridgewell/trace-mapping@0.3.9':
+    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+
+  '@modelcontextprotocol/sdk@1.24.3':
+    resolution: {integrity: sha512-YgSHW29fuzKKAHTGe9zjNoo+yF8KaQPzDC2W9Pv41E7/57IfY+AMGJ/aDFlgTLcVVELoggKE4syABCE75u3NCw==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@cfworker/json-schema': ^4.1.1
+      zod: ^3.25 || ^4.0
+    peerDependenciesMeta:
+      '@cfworker/json-schema':
+        optional: true
+
+  '@modelcontextprotocol/sdk@1.29.0':
+    resolution: {integrity: sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@cfworker/json-schema': ^4.1.1
+      zod: ^3.25 || ^4.0
+    peerDependenciesMeta:
+      '@cfworker/json-schema':
+        optional: true
+
+  '@mswjs/interceptors@0.41.9':
+    resolution: {integrity: sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==}
+    engines: {node: '>=18'}
+
+  '@napi-rs/wasm-runtime@1.1.5':
+    resolution: {integrity: sha512-AWPoBRJ9tsnVhor4sjO7rkni+7p+2IAEFj6cx06UgP10jkQHqay/36uRV/bFkgrh18D9vb4cr8Q0Pthskgzy+Q==}
+    peerDependencies:
+      '@emnapi/core': ^1.7.1
+      '@emnapi/runtime': ^1.7.1
+
+  '@next/env@16.2.9':
+    resolution: {integrity: sha512-ki5VxxXfzD/9TDe13wyeTKIjQTAwBVpnr8KhRDUr8ltMUq1/NBpWNT5tiPoxiGl+PHM4X2ahSOiPk6iAimIzPg==}
+
+  '@next/eslint-plugin-next@16.2.9':
+    resolution: {integrity: sha512-UZi8+YT/MLgTC9nrrn2Xd4lBYv1B7lVmtWHfPcthAI5Tt/C1LuDe6DfmtCtJ+WQod3ksY4VrKSvk3oMVAnL7qw==}
+
+  '@next/swc-darwin-arm64@16.2.9':
+    resolution: {integrity: sha512-HkfxNYUCmcct0Xsqib5KxqMSHV4AHJq857BNRchyBDs4YS19aHzVfn1kDuBYKqLLQBjXgnkIsjV2Kd4d2wzYhw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@next/swc-darwin-x64@16.2.9':
+    resolution: {integrity: sha512-7IAtK4MeybpqRV9GRABWEhJ62mOS+rzWOzOTFie4cSEtm12xsoOMJRcECoZx3FHPzFAqN/IJtHqWAFOLfl152w==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@next/swc-linux-arm64-gnu@16.2.9':
+    resolution: {integrity: sha512-hBD75iWpUtkL9SmQmcRhmLomn9jgkPzCEkbOcLgHymPEKzv+6ONy13RRiIEz/iEObjkS2Jlb5gYS2XGoS3X4rw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@next/swc-linux-arm64-musl@16.2.9':
+    resolution: {integrity: sha512-qZTI3pf9SGc/obr8NkQAekBxmp1QK+kVm+VAf3BALLfFAj+1kUhkTxmrWpVos9R/UYIA8AWX2p6cGI5WdwzVUA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@next/swc-linux-x64-gnu@16.2.9':
+    resolution: {integrity: sha512-xm0HfRNX+UkH4R3c18ynswjj5o5uEj/7iI9p9omdtTSIsRCzQqkGMA+10nzJ4EHnYC3as65IMhbbl5fWRUWHYg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@next/swc-linux-x64-musl@16.2.9':
+    resolution: {integrity: sha512-QumimHkGEG6vM3PfEDWKyKen03NcqLOkeKB1EfcPe7VxzmEiCa4jNnMyBn/US5zcd/VE1CI+O8Ovb3lfjVHfGw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@next/swc-win32-arm64-msvc@16.2.9':
+    resolution: {integrity: sha512-hzQpKZvw8rAwI6A2uQh6SacCSvNAXaIkPNsWwzqqfRiIMiXMfH936skDhz1OO6KpvdKkJrgHHtqQOq5PIXOvdQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@next/swc-win32-x64-msvc@16.2.9':
+    resolution: {integrity: sha512-qr2VL3Ce5QrwgO2yh1ujSBawrimjVKX8FGF/cOynmdYKJY0BdHpGVNIRK1tqONB10Vkm25Ub1BD2bkjWs4+96w==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@noble/ciphers@1.3.0':
+    resolution: {integrity: sha512-2I0gnIVPtfnMw9ee9h1dJG7tp81+8Ob3OJb3Mv37rx5L40/b0i7djjCVvGOVqc9AEIQyvyu1i6ypKdFw8R8gQw==}
+    engines: {node: ^14.21.3 || >=16}
+
+  '@noble/curves@1.9.7':
+    resolution: {integrity: sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw==}
+    engines: {node: ^14.21.3 || >=16}
+
+  '@noble/hashes@1.8.0':
+    resolution: {integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==}
+    engines: {node: ^14.21.3 || >=16}
+
+  '@nodable/entities@2.2.0':
+    resolution: {integrity: sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==}
+
+  '@node-minify/core@8.0.6':
+    resolution: {integrity: sha512-/vxN46ieWDLU67CmgbArEvOb41zlYFOkOtr9QW9CnTrBLuTyGgkyNWC2y5+khvRw3Br58p2B5ZVSx/PxCTru6g==}
+    engines: {node: '>=16.0.0'}
+
+  '@node-minify/terser@8.0.6':
+    resolution: {integrity: sha512-grQ1ipham743ch2c3++C8Isk6toJnxJSyDiwUI/IWUCh4CZFD6aYVw6UAY40IpCnjrq5aXGwiv5OZJn6Pr0hvg==}
+    engines: {node: '>=16.0.0'}
+
+  '@node-minify/utils@8.0.6':
+    resolution: {integrity: sha512-csY4qcR7jUwiZmkreNTJhcypQfts2aY2CK+a+rXgXUImZiZiySh0FvwHjRnlqWKvg+y6ae9lHFzDRjBTmqlTIQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@nodelib/fs.scandir@2.1.5':
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.stat@2.0.5':
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.walk@1.2.8':
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
+
+  '@nolyfill/is-core-module@1.0.39':
+    resolution: {integrity: sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA==}
+    engines: {node: '>=12.4.0'}
+
+  '@open-draft/deferred-promise@2.2.0':
+    resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==}
+
+  '@open-draft/deferred-promise@3.0.0':
+    resolution: {integrity: sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==}
+
+  '@open-draft/logger@0.3.0':
+    resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==}
+
+  '@open-draft/until@2.1.0':
+    resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==}
+
+  '@opennextjs/aws@4.0.2':
+    resolution: {integrity: sha512-nXQPT8GZDV+NWMJV9mD/Ywxyo+tCZfFvrR6jpEOYNcxK/AqiEDlJzPybGOrHUDWAYdR1b6tmh+MoR3VbqIao3w==}
+    hasBin: true
+    peerDependencies:
+      next: '>=15.5.18 <16 || >=16.2.6'
+
+  '@opennextjs/cloudflare@1.19.11':
+    resolution: {integrity: sha512-spZ7YsZZW9q/OJStaZlJhuklYKei5e2tNQ7PMi3DDSJ7x7167m7EYYHQZfVN5gwJBDkMR2jUDW88oHjnGz4YYw==}
+    hasBin: true
+    peerDependencies:
+      next: '>=15.5.18 <16 || >=16.2.6'
+      wrangler: ^4.86.0
+
+  '@poppinss/colors@4.1.6':
+    resolution: {integrity: sha512-H9xkIdFswbS8n1d6vmRd8+c10t2Qe+rZITbbDHHkQixH5+2x1FDGmi/0K+WgWiqQFKPSlIYB7jlH6Kpfn6Fleg==}
+
+  '@poppinss/dumper@0.6.5':
+    resolution: {integrity: sha512-NBdYIb90J7LfOI32dOewKI1r7wnkiH6m920puQ3qHUeZkxNkQiFnXVWoE6YtFSv6QOiPPf7ys6i+HWWecDz7sw==}
+
+  '@poppinss/exception@1.2.3':
+    resolution: {integrity: sha512-dCED+QRChTVatE9ibtoaxc+WkdzOSjYTKi/+uacHWIsfodVfpsueo3+DKpgU5Px8qXjgmXkSvhXvSCz3fnP9lw==}
+
+  '@rtsao/scc@1.1.0':
+    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
+
+  '@sec-ant/readable-stream@0.4.1':
+    resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
+
+  '@sindresorhus/is@7.2.0':
+    resolution: {integrity: sha512-P1Cz1dWaFfR4IR+U13mqqiGsLFf1KbayybWwdd2vfctdV6hDpUkgCY0nKOLLTMSoRd/jJNjtbqzf13K8DCCXQw==}
+    engines: {node: '>=18'}
+
+  '@sindresorhus/merge-streams@4.0.0':
+    resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
+    engines: {node: '>=18'}
+
+  '@smithy/config-resolver@4.5.7':
+    resolution: {integrity: sha512-1mmr3q0viZVm9j4yYqDJFo4Yj+CmLPNYHmxweKrL08xPC1UlUKVawGYKokUlryd9Llgev91D9cWRcDmWeHKvLg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/core@3.24.7':
+    resolution: {integrity: sha512-KoUi4M1f3BG6kzN1FnCwL7oyFptTbyBJKjR6yhSib+JHRdUmM1o+VwsFtJ66NZCkCzVfJMWRHJNo0R0jznp0Pg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/credential-provider-imds@4.3.9':
+    resolution: {integrity: sha512-ZlfJ/4Fa3jYb+3eaohPfG9utX9HmdhFNcFtpoGAhUhdynAOmGXtmigbi7eEiONKM+ykHw8RwKuDEb85Lx7t7fA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/eventstream-serde-browser@4.3.7':
+    resolution: {integrity: sha512-Ux78G1xlZHYLn8jd8KtMSUo0Hr33cw7lmKdVHWwmPe0TdsR6l9Zx2T9Ljx7kcurSVU9KUwKC4wR4KebbClBWdA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/eventstream-serde-config-resolver@4.4.7':
+    resolution: {integrity: sha512-OH27/c5hUdDXVdFRBTr/dlJFfFSjccVoxSJ1p0QdDK6xP/v0cE7N2GtAuq1h/BQ5TFCXoeEmDnvcS7fwW8/+1g==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/eventstream-serde-node@4.3.7':
+    resolution: {integrity: sha512-zo8M9AzKmMsLUS9zEGo2UIW3odKCpHQXD7WSvRFBTbD8d+kn5iBphsinNyVe3XtdSoSs1XF8qDxbznW+PsZeBg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/fetch-http-handler@5.4.7':
+    resolution: {integrity: sha512-NslaM2ir0N2hisDmzXLstPaVINZheh8SokyOC++kzFPloZucL2R7Y7bS57mSzx/1Fc/fqmn7twjkeezTTrV0EA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/hash-blob-browser@4.3.7':
+    resolution: {integrity: sha512-JcP/TiSUBrHZjrY1z/jwiSxBJgkJMwYdqkyXHilg/Riybnm7hH0YQfBPk4y+09efz+BPZEBemaxAOETxPRpdLg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/hash-node@4.3.7':
+    resolution: {integrity: sha512-92AAv0TrUw6nVbKZPiGe+DmfY8CLo6fLh0Xz6dUC75bKviYZSIUMAquC4VTR9fjXlxh+NX+3SqyHhmGVcAqkAg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/hash-stream-node@4.3.7':
+    resolution: {integrity: sha512-h/sJCJiB7HmxnuiEgbqZGsULO4yHrK6zqSx2Cyu14aONhTi6klMoqcR1WkkjMlul3wVADj5eAu2mptcnV0BsXA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/invalid-dependency@4.3.7':
+    resolution: {integrity: sha512-oUWWs71R3+VjlZJU6IBcLdN/vvH7jbJ11Dy7m73bQoVcbFuuVQGoVrL3IHcSpaIsuWgEQPziKBSVzTd4Uhr+5w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/is-array-buffer@2.2.0':
+    resolution: {integrity: sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/md5-js@4.3.7':
+    resolution: {integrity: sha512-l1QeGbpVKzVhTxqY8aUMfLyVZ3D7QLUaiEVF8zqOZTCOiMSIIRH+PIzzBGGMECitXUwt0ZF/FFETamd3pNH+lw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-content-length@4.3.7':
+    resolution: {integrity: sha512-LvpbwYfDyDg3ez8qM+0+aoo+tZvG1+cJR2DLfSJn0feDBMevQwU/B85OBjnGGwyxhOFJXiGriqt1Qn/9mS8T3A==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-endpoint@4.5.7':
+    resolution: {integrity: sha512-rs+xOLEA/i5O/VWrtxjw8Wydk4gt0TcG1XBfWcSKpg41W+yWrkHuQUFrID5X+199P2DOnLoRcLmANU6IqqAKow==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-retry@4.6.7':
+    resolution: {integrity: sha512-TH2Gw3wp+1iMMwvwpfX0otsnW0c91QttO2UmtftVpZvMH5c3QFOstTmMUXtnEii9CydT/xJno4leduaXMK2D4w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-serde@4.3.7':
+    resolution: {integrity: sha512-5z8w1mTB1J4jYIFpi69wOCTPMyxeggrDcz/S3KlPWOCs0PkazW33G2mAKu/b5CMN12NpZtUH4BDbYt1IfJ0FHA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-stack@4.3.7':
+    resolution: {integrity: sha512-xtA670qWcsZA1jBDMIvBz3aYm7DQteW9IzCjsFNLfSrGeEiCIRSfHug5MzJo66qyHdZKSidU+tjtTOIeldqI7Q==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/node-config-provider@4.4.7':
+    resolution: {integrity: sha512-GbLL8AyUmsYYmWBNa4YU4vlSDG2kBeLp6Sevh20dvnfRYsgl+eGR0dv9X5wKFDURiVZCruz6OgfM1AQYOHM04Q==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/node-http-handler@4.7.8':
+    resolution: {integrity: sha512-f+DbsWUwSbtMu1a/j8Y93KiU1SRg9nyzfjereqn1BJ33QOTUXxdlYvVXMhAYl1vuR1Kmna5aIJe09KSIfyFNYw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/protocol-http@5.4.7':
+    resolution: {integrity: sha512-C4SfAC15LwAvH6xzt/KklMPUDiTdxHH3fu9+qFeuve8j+pHQyT7pF9/Vot9HOheARmxf8bHCSxIB4kFHP/hKYg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/signature-v4@5.4.7':
+    resolution: {integrity: sha512-LwQZazFayImv+IOm0S0enoLeUJwmAlhGC5O6YCcLWezyu08dF46GOxPOq35OpBIHkgd7OvNvBStIFwVNyrvoBw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/smithy-client@4.13.7':
+    resolution: {integrity: sha512-kNOS4kEILDeE9Qpp7/rGSE/VMUOhVRan3g0zDj+hFB4Ka9JJ99hJHJ0mI5x5qhAAi/fZA5DNbVKB0+RWX9UGGw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/types@4.14.4':
+    resolution: {integrity: sha512-B2S9+UGm1+/pHkcx3ZoLVX1a+pmSk8rqxRR+ZsNqZaJ5q9FWX9AFGQVM4qG5+OBeQUZVy99HY8HqW8gK/wgXzQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/url-parser@4.3.7':
+    resolution: {integrity: sha512-nAKFs3vUD7IByqFq060Xaq2ct07HkarhVpPJTh2hb23Hczu+cZWXm2AXV0D+1xc/eCksJQCmT1/3SwEYw3LXJw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-base64@4.4.7':
+    resolution: {integrity: sha512-fCRquAqooXwff8PmhPSZatA4V5uBD23b+lX9lXIyNEisTekKVJ6EePEa2rmtopySyD2TpTlsEIcET0eNauQH1w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-body-length-browser@4.3.7':
+    resolution: {integrity: sha512-NNlnEnix+DvaWvfVdJEGUewce5FbZvDfZYI6zl/UJGAJTIn5ZRKD7KXjQODhMq64UxLPajmnOmQM584Ys5ZT0g==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-body-length-node@4.3.7':
+    resolution: {integrity: sha512-C/SdrjNeT2j5rSSHese6Vbg0Yyban3pVWtYaEZ/ZwgwSiFtCrPrLtL0L4yaAPc5+uMVVWSuDf1Fp1jvMq6+kbA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-buffer-from@2.2.0':
+    resolution: {integrity: sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-defaults-mode-browser@4.4.7':
+    resolution: {integrity: sha512-elDqX7i4Y1rcbebstHoMqSyZDktp7e4pfvqzUC/oCeaP8g/qDliIzwVAKs7tpS1m/C+pJ3THPdb3r9kwI63ycg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-defaults-mode-node@4.3.7':
+    resolution: {integrity: sha512-Pw2vgWWtaX+c08r4TE1XZFsubVaFUyWv9l0TncGDpoXvuqef5+50gIdOgSF2Uf0Yjvc+r7Oz8AYtfUggXQ3ehg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-endpoints@3.5.7':
+    resolution: {integrity: sha512-HOSB9ARkpt2/LzwYMrXpoxlygo58FyIPS+CO0wAI4mAD0E15aQ5t6ZYa9WzSeWPKPed2Kmyl+NAMhsorA1aCLg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-middleware@4.3.7':
+    resolution: {integrity: sha512-q8P1up/IlZQNqopAHkGtKSpAUVdkacyVR8n8+7BjM89BBGbl6Wtf/2PSCMIYjFXKh2WegvN8ig4t4vX9WhUm8Q==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-retry@4.4.7':
+    resolution: {integrity: sha512-ijOv9opnYYNtDfi5yIjBUDfPirQiiggAQcKCthEkUofAhQRRu9IQSbhHP1RXGzrQJMgRjCZoLfx+JX5VucUXWQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-stream@4.6.7':
+    resolution: {integrity: sha512-FSdIw4ju2unfrxVmjbk+mwMJhwFkTZEYwbawd3DQMmG1Qh5MFvd6rUdtHgBP4Tya7BNcCkkZen45n9VxYxwizQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-utf8@2.3.0':
+    resolution: {integrity: sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-utf8@4.3.7':
+    resolution: {integrity: sha512-U2XPgO73I8ef8FP3jRQO4Iiol7chWuv4TD6LxNLvRo/pYwBvbelxLcODkpAA9ek+k23NMgc9NoiVzp8INwogMA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-waiter@4.4.7':
+    resolution: {integrity: sha512-U7tEAhbItBaJXmY4TfsXBR0YzWLuYPSUi1qNxsj44/5wqdzq/7jxor1oBwZMBEkDbJWGIc2J0uSmNtSZEWt6yQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@speed-highlight/core@1.2.17':
+    resolution: {integrity: sha512-Z92FwKpCtfaW1V0jTU/fh3QzYEZN8wDwrzRIBoADCJfn4mJCNcJN/XegifX7BDrQ8/h9Xh/JnbyMchL0FqXrkg==}
+
+  '@swc/helpers@0.5.15':
+    resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}
+
+  '@tailwindcss/node@4.3.1':
+    resolution: {integrity: sha512-6NDaqRoAMSXD1mr/RXu0HBvNE9a2n5tHPsxu9XHLws8o4Twes5rBM2205SUUiJ9goAtadrN6xTGX0UDEwp/N4A==}
+
+  '@tailwindcss/oxide-android-arm64@4.3.1':
+    resolution: {integrity: sha512-SVlyf61g374l5cHyg8x9kf5xmLcOaxvOTsbsqDnSsDJaKOEFZ7GCvi84VAVGpxojYOs1+3K6M0UjXfqPU8vmOQ==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [android]
+
+  '@tailwindcss/oxide-darwin-arm64@4.3.1':
+    resolution: {integrity: sha512-hVnWLwv+e/l7c4WKyVtHVrIPvYdqWHjRB3MDIqARynzFtnQg85kmQEFCbV9Ja0VVx4xXTIiDWY60Y7iz/iNoDA==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-darwin-x64@4.3.1':
+    resolution: {integrity: sha512-Cf7abu0WVgbhU7ANgPUnSAvm7nCvMweusHb8FnaHlLfv/Caq4GYaEZg7ZImzzmjx4lIAfuS8q+eLIS7A7IzxIg==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-freebsd-x64@4.3.1':
+    resolution: {integrity: sha512-ZZqzX2Y+GXtXXfqSfpJhDm60OoZfvLHLCgm+J7NVqgHHJjG/m9ugZI77RwTsVd4fnBJuCFP6Ae6kTJb71UdS8g==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.1':
+    resolution: {integrity: sha512-/Ah/xik0LaMYfv9DZ0S/t4pBlBNYOcqtRwusjgovHkvT8ixueWCLyJjsaF5kQIckjb4IT8Q6K6p/iPmZMixYgg==}
+    engines: {node: '>= 20'}
+    cpu: [arm]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.3.1':
+    resolution: {integrity: sha512-gqdFoVJlw444GvpnheZLHmvTzSxI/cOUUh2KSNejQjTcYkW062SVD+En0rUgD+QV91bz1XGIGtt1HJd48xUGbQ==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.3.1':
+    resolution: {integrity: sha512-Bwv9KwOvE0VKa86xPFif9b9c3Y1NxOV1P0gLti/IYaWEsQYZXDlxfGEtA8mdDZ7SG3wyNXAWYT5SIn3giL57oA==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.3.1':
+    resolution: {integrity: sha512-Ymi8O8T15HYQdOUWUtTI6ldN0neHP85FC+Qz32xTcZ7iJXtem/x8ITev0o1e9e5rkqj4lONZfTRLvkmin1+tKg==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-x64-musl@4.3.1':
+    resolution: {integrity: sha512-M+P/91qJ6uILLw4k2G93GMDRAXj61SMvFQYt39AqvUqYgExXpLL5aepfns7sj4HiAQeolirQF9E0lzRvdf4zPQ==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [linux]
+
+  '@tailwindcss/oxide-wasm32-wasi@4.3.1':
+    resolution: {integrity: sha512-zsM8uOeqvVGHsAXsJxsT28ttosFahLJKCLOTUBqRAtKnVgGSRitds9T432QiT8b77Yga7JIBkulIRRlJPtYhRA==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+    bundledDependencies:
+      - '@napi-rs/wasm-runtime'
+      - '@emnapi/core'
+      - '@emnapi/runtime'
+      - '@tybys/wasm-util'
+      - '@emnapi/wasi-threads'
+      - tslib
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.3.1':
+    resolution: {integrity: sha512-aiNvSq9BsVk8V513lDKlrCFAgf8qBMPZTpgEhInL+NwQqs97mYmupVMrPrgBBSL8Pv/0zXu9MrMF9rMun1ZeNg==}
+    engines: {node: '>= 20'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.3.1':
+    resolution: {integrity: sha512-xDEyu1rg290472FEGaKHnzyDyh5QH+AlWvsU5hMoMtPpzmKlRI0jaYKCgSHDYtaQWZOYbMaduSyCwFwY4n1HmA==}
+    engines: {node: '>= 20'}
+    cpu: [x64]
+    os: [win32]
+
+  '@tailwindcss/oxide@4.3.1':
+    resolution: {integrity: sha512-yVPyo8RNkabVr3O2EhHEE0Rewu7YKzc1DhIqfL46LKveFrmu9XbDazNOJY7/GRuvw1h6u3utWnR29H/p5JPlgA==}
+    engines: {node: '>= 20'}
+
+  '@tailwindcss/postcss@4.3.1':
+    resolution: {integrity: sha512-dNJuNbdEJT/SWRuXTYP1WSamelsz3ztkUsdtWQPjrexysrTpaEPM40P/71knXiXLYEojqPOEGitVLLpPMS5T6A==}
+
+  '@ts-morph/common@0.27.0':
+    resolution: {integrity: sha512-Wf29UqxWDpc+i61k3oIOzcUfQt79PIT9y/MWfAGlrkjg6lBC1hwDECLXPVJAhWjiGbfBCxZd65F/LIZF3+jeJQ==}
+
+  '@tsconfig/node18@1.0.3':
+    resolution: {integrity: sha512-RbwvSJQsuN9TB04AQbGULYfOGE/RnSFk/FLQ5b0NmDf5Kx2q/lABZbHQPKCO1vZ6Fiwkplu+yb9pGdLy1iGseQ==}
+
+  '@tybys/wasm-util@0.10.2':
+    resolution: {integrity: sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==}
+
+  '@types/estree@1.0.9':
+    resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
+
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
+  '@types/json5@0.0.29':
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+
+  '@types/node-fetch@2.6.13':
+    resolution: {integrity: sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==}
+
+  '@types/node@18.19.130':
+    resolution: {integrity: sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==}
+
+  '@types/node@25.9.3':
+    resolution: {integrity: sha512-603BddQMv3pUcr4U2dhujk83N2tTDVr/34wII2B6bJy6g+8WD6yUb11jszNs0gdi4PesVWl7ABt8nYMVpnLUcg==}
+
+  '@types/react-dom@19.2.3':
+    resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
+    peerDependencies:
+      '@types/react': ^19.2.0
+
+  '@types/react@19.2.17':
+    resolution: {integrity: sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==}
+
+  '@types/set-cookie-parser@2.4.10':
+    resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==}
+
+  '@types/statuses@2.0.6':
+    resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==}
+
+  '@types/validate-npm-package-name@4.0.2':
+    resolution: {integrity: sha512-lrpDziQipxCEeK5kWxvljWYhUvOiB2A9izZd9B2AFarYAkqZshb4lPbRs7zKEic6eGtH8V/2qJW+dPp9OtF6bw==}
+
+  '@typescript-eslint/eslint-plugin@8.61.0':
+    resolution: {integrity: sha512-bFNvl9ZczlVb+wR2Akszf3gHfKVj/8WanXaGJ3UstTA7brNKg0cNdk6X1Psu5V7MZ2oQtzZKOEzIUehaoxbDGw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^8.61.0
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/parser@8.61.0':
+    resolution: {integrity: sha512-5B7PfA2e1NQGCnDHd/0lW7W3gvp3d59Ryw54FYO8Uswxo9f6ikw3AZV+Xj/TvpImmpsiYyUqAfhC6kJID1jF6w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/project-service@8.61.0':
+    resolution: {integrity: sha512-DV42F7MLJO6Rax7SK1yg43tcnEfGUrurSpSxKuVX+a3RCTzBlH3fuxprrOJXKCJGAaw82xXocikJ0uQaqwXgGA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/scope-manager@8.61.0':
+    resolution: {integrity: sha512-IWdXFHFSb6mlC3HPc7QsLDm5zYEbUla6trDEHf32D3/dnuUyXd87plScSNXSbm0/RxMvObpI17sv/EDTGrGZkA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/tsconfig-utils@8.61.0':
+    resolution: {integrity: sha512-O5Amvdv9ztMpxpf+vmFULGG78IE6Qwdr3bCGvqwG4nwc9H2qXkOYJJnRbRHyMkQTjv1d03olqwwwzHLMqpFePQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/type-utils@8.61.0':
+    resolution: {integrity: sha512-TuBiQYIkd97yBfInHCTKVYMbX4kvEmpOEuixIuzCU9p8BGT1SfyyO0d0IfDMbPIHcjn/hWnusUX5e8v5Xg+X8A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/types@8.61.0':
+    resolution: {integrity: sha512-9QTQpZ5Iin4CdIodfbDQFSeiSJKidgYJYug1P9CC2xWgUTvlmixViqDZNciMjwLBZyJnG4tGmPl97rVAFb1AJg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/typescript-estree@8.61.0':
+    resolution: {integrity: sha512-42zatd5qSvvcV1JdDBCLxYRznvP4eIHpPoZXdkPFnAmanA4FuZ5dibSnCBggY8hQnqajPpoGjXFdZ7fIJKQnlA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/utils@8.61.0':
+    resolution: {integrity: sha512-3bzFt7ImFMW/jVYwJamDoe/dMOdFLSC6pom6rRjdh4SZJEYupyMzem8e7vKZLclLfpHjlwSAXOUxtKxGXUiLqA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/visitor-keys@8.61.0':
+    resolution: {integrity: sha512-QVLZu3ZPQEE+HICQyAMZ2yLQhxf0meY/wx6Hx14YcTNj13JB3qHlX3lJ02L3fLGHgERRH71kvYDwiXIguT3AjQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@unrs/resolver-binding-android-arm-eabi@1.12.2':
+    resolution: {integrity: sha512-g5T90pqg1bo/7mytQx6F4iBNC0Wsh9cu+z9veDbFjc7HjpesJFWD7QMS0NGStXM075+7dJPPVvBbpZlnrdpi/w==}
+    cpu: [arm]
+    os: [android]
+
+  '@unrs/resolver-binding-android-arm64@1.12.2':
+    resolution: {integrity: sha512-YGCRZv/9GLhwmz6mYDeTsm/92BAyR28l6c2ReweVW5pWgfsitWLY8upvfRlGdoyD8HjeTHSYJWyZGD4KJA/nFQ==}
+    cpu: [arm64]
+    os: [android]
+
+  '@unrs/resolver-binding-darwin-arm64@1.12.2':
+    resolution: {integrity: sha512-u9DiNT1auQMO20A9SyTuG3wUgQWB9Z7KjAg0uFuCDR1FsAY8A0CG2S6JpHS1xwm/w1G08bjXZDcyOCjv1WAm2w==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@unrs/resolver-binding-darwin-x64@1.12.2':
+    resolution: {integrity: sha512-f7rPLi/T1HVKZu/u6t87lroib16n8vrSzcyxI7lg4BGO9UF26KhQL44sd9eOUgrTYhvRXtWOIZT5PejdPyJfUA==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@unrs/resolver-binding-freebsd-x64@1.12.2':
+    resolution: {integrity: sha512-BpcOjWCJub6nRZUS2zA20pmLvjtqAtGejETaIyRLiZiQf++cbrjltLA5NN/xaXfqeOBOSlMFbemIl5/S5tljmg==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@unrs/resolver-binding-linux-arm-gnueabihf@1.12.2':
+    resolution: {integrity: sha512-vZTDvdSISZjJx66OzJqtsOhzifbqRjbmI1Mnu49fQDwog5GtDI4QidRiEAYbZCRj9C8YZEW+3ZjqsyS9GR4k2A==}
+    cpu: [arm]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-arm-musleabihf@1.12.2':
+    resolution: {integrity: sha512-BiPI+IrIlwcW4nLLMM21+B1dFPzd55yAVgVGrdgDjNef+ch03GdxrcyaIz8X9SsQirh/kCQ7mviyWlMxdh2D7g==}
+    cpu: [arm]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-arm64-gnu@1.12.2':
+    resolution: {integrity: sha512-zJc0H99FEPoFfSrNpa91HYfxzfAJCr502oxNK1cfdC9hlaFI43RT+JFCann9JUgZmLzzntChHyn13Sgn9ljHNg==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-arm64-musl@1.12.2':
+    resolution: {integrity: sha512-KQ3Lki6l+Pz1k/eBipN41ES+YUK30beLGb9YqcB1O542cyLCNE6GaxrfcY3T6EezmGGk84wb5XyO9loTM9tkcA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-loong64-gnu@1.12.2':
+    resolution: {integrity: sha512-3SJGEh1DborhG6pyxvhPzCT4bbSIVihsvgJc13P1bHG7KLdNDaF9T3gsTwFc7Jw/5Y5/iWOjkEx7Zy0NvCGX3Q==}
+    cpu: [loong64]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-loong64-musl@1.12.2':
+    resolution: {integrity: sha512-jiuG/Obbel7uw1PwHNFfrkiKhLAF6mnyZ6aWlOAVN9WqKm8v0OFGnciJIHu8+CMvXLQ8AD51LPzAoUfT21D5Ew==}
+    cpu: [loong64]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-ppc64-gnu@1.12.2':
+    resolution: {integrity: sha512-q7xRvVpmcfeL+LlZg8Pbbo6QaTZwDU5BaGZbwfhkEsXJn3Was8xYfE0RBH266xZt0rM6B7i8xAYIvjthuUIWHg==}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-riscv64-gnu@1.12.2':
+    resolution: {integrity: sha512-0CVdx6lcnT3Q9inOH8tsMIOJ6ImndllMjqJHg8RLVdB7Vq4SfkEXl9mCSsVNuNA4MCYycRicCUxPCabVHJRr6A==}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-riscv64-musl@1.12.2':
+    resolution: {integrity: sha512-iOwlRo9vnp6R6ohHQS11n0NnfdXx/omhkocmIfaPRpQhKZ+3BDMkkdRVh53qjkFkpPddf+FETA28NwGN7l5l+w==}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-s390x-gnu@1.12.2':
+    resolution: {integrity: sha512-HYJtLfXq94q8iZNFT1lknx258wlkkWhZeUXJRqzKBBUJ00CvZ+N33zgbCqimLjsyw5Va6uUxhVa12mI+kaveEw==}
+    cpu: [s390x]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-x64-gnu@1.12.2':
+    resolution: {integrity: sha512-mPsUhunKKDih5O96Y6enDQyHc1SqBPlY1E/SfMWDM3EdJ95Z9CArPeCVwCCqbP45ljvivdEk8Fxn+SIb1rDAJQ==}
+    cpu: [x64]
+    os: [linux]
+
+  '@unrs/resolver-binding-linux-x64-musl@1.12.2':
+    resolution: {integrity: sha512-azrt6+5ydLd8Vt210AAFis/lZevSfPw93EJRIJG+xPu4WCJ8K0kppCTpMyLPcKT7H15M4Jnt2tMp5bOvCkRC6A==}
+    cpu: [x64]
+    os: [linux]
+
+  '@unrs/resolver-binding-openharmony-arm64@1.12.2':
+    resolution: {integrity: sha512-YZ9hP4O0X9PQb8eO980qmLNGH4zT3I9+SZTdt0Pr0YyuGQhYKoOZkV02VzrzyOZJ5xIJ3UFIenKkUkGg8GjgWQ==}
+    cpu: [arm64]
+    os: [openharmony]
+
+  '@unrs/resolver-binding-wasm32-wasi@1.12.2':
+    resolution: {integrity: sha512-tYFDIkMxSflfEc/h92ZWNsZlHSwgimbNHSO3PL2JWQHfCuC2q316jMyYU9TIWZsFK2bQwyK5VAdYgn8ygPj69A==}
+    engines: {node: '>=14.0.0'}
+    cpu: [wasm32]
+
+  '@unrs/resolver-binding-win32-arm64-msvc@1.12.2':
+    resolution: {integrity: sha512-qzNyg3xL0VPQmCaUh+N5jSitce6k+uCBfMDesWRnlULOZaqUkaJ0ybdT+UqlAWJoQjuqfIU/0Ptx9bteN4D82g==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@unrs/resolver-binding-win32-ia32-msvc@1.12.2':
+    resolution: {integrity: sha512-WD9sY00OfpHVGfsnHZoA8jVT+esS/Bg8z8jzxp5BnDCjjwsuKsPQrzswwpFy4J1AUJbXPRfkpcX0mXrzeXW79g==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@unrs/resolver-binding-win32-x64-msvc@1.12.2':
+    resolution: {integrity: sha512-nAB74NfSNKknqQ1RrYj6uz8FcXEomu/MATJZxh/x+BArzN2U3JbOYC0APYzUIGhVY3m5hRxA8VPNdPBoG8txlA==}
+    cpu: [x64]
+    os: [win32]
+
+  abort-controller@3.0.0:
+    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
+    engines: {node: '>=6.5'}
+
+  accepts@2.0.0:
+    resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
+    engines: {node: '>= 0.6'}
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn@8.17.0:
+    resolution: {integrity: sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  agent-base@7.1.4:
+    resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
+    engines: {node: '>= 14'}
+
+  agentkeepalive@4.6.0:
+    resolution: {integrity: sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==}
+    engines: {node: '>= 8.0.0'}
+
+  ajv-formats@3.0.1:
+    resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
+  ajv@6.15.0:
+    resolution: {integrity: sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==}
+
+  ajv@8.20.0:
+    resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==}
+
+  ansi-colors@4.1.3:
+    resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
+    engines: {node: '>=6'}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-regex@6.2.2:
+    resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==}
+    engines: {node: '>=12'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  ansi-styles@6.2.3:
+    resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
+    engines: {node: '>=12'}
+
+  ansis@4.3.1:
+    resolution: {integrity: sha512-BJ8/l4R5LRE7hW9WdSuGYrLSHi2ynxeFpDFbH0K/CgNeY/tyhk+vO6TYxXC5r5CpUhNVX310xzPsN/H9lCdfOA==}
+    engines: {node: '>=14'}
+
+  anynum@1.0.0:
+    resolution: {integrity: sha512-xjR9/zBVnUOP6ztMIIgShjsxui80nQUQH+5xJnvrYLs+90bF25/KJqaAi8mk+B4RDtX1Nspi6fmp4YTEts8SfA==}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  aria-query@5.3.2:
+    resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
+    engines: {node: '>= 0.4'}
+
+  array-buffer-byte-length@1.0.2:
+    resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==}
+    engines: {node: '>= 0.4'}
+
+  array-includes@3.1.9:
+    resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==}
+    engines: {node: '>= 0.4'}
+
+  array-timsort@1.0.3:
+    resolution: {integrity: sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==}
+
+  array.prototype.findlast@1.2.5:
+    resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.findlastindex@1.2.6:
+    resolution: {integrity: sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flat@1.3.3:
+    resolution: {integrity: sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flatmap@1.3.3:
+    resolution: {integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.tosorted@1.1.4:
+    resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
+    engines: {node: '>= 0.4'}
+
+  arraybuffer.prototype.slice@1.0.4:
+    resolution: {integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==}
+    engines: {node: '>= 0.4'}
+
+  ast-types-flow@0.0.8:
+    resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}
+
+  ast-types@0.16.1:
+    resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
+    engines: {node: '>=4'}
+
+  async-function@1.0.0:
+    resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
+    engines: {node: '>= 0.4'}
+
+  asynckit@0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+
+  available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+
+  aws4fetch@1.0.20:
+    resolution: {integrity: sha512-/djoAN709iY65ETD6LKCtyyEI04XIBP5xVvfmNxsEP0uJB5tyaGBztSryRr4HqMStr9R06PisQE7m9zDTXKu6g==}
+
+  axe-core@4.12.1:
+    resolution: {integrity: sha512-s7iGf5GaVMxEG0ENN9x+xTr7GFZCb1ZP/1uATUpCEK2X78nDB3RwbtFCo9pGAf9ru+VwoQ464DkaLEeRM08wJA==}
+    engines: {node: '>=4'}
+
+  axobject-query@4.1.0:
+    resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
+    engines: {node: '>= 0.4'}
+
+  babel-plugin-react-compiler@1.0.0:
+    resolution: {integrity: sha512-Ixm8tFfoKKIPYdCCKYTsqv+Fd4IJ0DQqMyEimo+pxUOMUR9cVPlwTrFt9Avu+3cb6Zp3mAzl+t1MrG2fxxKsxw==}
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  balanced-match@4.0.4:
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
+
+  baseline-browser-mapping@2.10.37:
+    resolution: {integrity: sha512-girxaJ7WZssDOFhzCGZTDKoTa1gk6A1TbflaYTpykLJ4UU9Fz9kx1aREM8JCuoVHbL8X8T/mJg7w2oYSq72Oig==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  birecord@0.1.1:
+    resolution: {integrity: sha512-VUpsf/qykW0heRlC8LooCq28Kxn3mAqKohhDG/49rrsQ1dT1CXyj/pgXS+5BSRzFTR/3DyIBOqQOrGyZOh71Aw==}
+
+  blake3-wasm@2.1.5:
+    resolution: {integrity: sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==}
+
+  body-parser@2.2.2:
+    resolution: {integrity: sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==}
+    engines: {node: '>=18'}
+
+  bowser@2.14.1:
+    resolution: {integrity: sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==}
+
+  brace-expansion@1.1.15:
+    resolution: {integrity: sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==}
+
+  brace-expansion@2.1.1:
+    resolution: {integrity: sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==}
+
+  brace-expansion@5.0.6:
+    resolution: {integrity: sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==}
+    engines: {node: 18 || 20 || >=22}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  browserslist@4.28.2:
+    resolution: {integrity: sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
+  bundle-name@4.1.0:
+    resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
+    engines: {node: '>=18'}
+
+  bytes@3.1.2:
+    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
+    engines: {node: '>= 0.8'}
+
+  call-bind-apply-helpers@1.0.2:
+    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
+    engines: {node: '>= 0.4'}
+
+  call-bind@1.0.9:
+    resolution: {integrity: sha512-a/hy+pNsFUTR+Iz8TCJvXudKVLAnz/DyeSUo10I5yvFDQJBFU2s9uqQpoSrJlroHUKoKqzg+epxyP9lqFdzfBQ==}
+    engines: {node: '>= 0.4'}
+
+  call-bound@1.0.4:
+    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
+    engines: {node: '>= 0.4'}
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  caniuse-lite@1.0.30001799:
+    resolution: {integrity: sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  chalk@5.6.2:
+    resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
+  ci-info@4.4.0:
+    resolution: {integrity: sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==}
+    engines: {node: '>=8'}
+
+  class-variance-authority@0.7.1:
+    resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
+
+  cli-cursor@5.0.0:
+    resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
+    engines: {node: '>=18'}
+
+  cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+    engines: {node: '>=6'}
+
+  cli-width@4.1.0:
+    resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==}
+    engines: {node: '>= 12'}
+
+  client-only@0.0.1:
+    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
+
+  cliui@8.0.1:
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
+
+  cliui@9.0.1:
+    resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==}
+    engines: {node: '>=20'}
+
+  cloudflare@4.5.0:
+    resolution: {integrity: sha512-fPcbPKx4zF45jBvQ0z7PCdgejVAPBBCZxwqk1k7krQNfpM07Cfj97/Q6wBzvYqlWXx/zt1S9+m8vnfCe06umbQ==}
+
+  clsx@2.1.1:
+    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
+    engines: {node: '>=6'}
+
+  code-block-writer@13.0.3:
+    resolution: {integrity: sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  combined-stream@1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
+
+  commander@11.1.0:
+    resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
+    engines: {node: '>=16'}
+
+  commander@12.1.0:
+    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
+    engines: {node: '>=18'}
+
+  commander@14.0.3:
+    resolution: {integrity: sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==}
+    engines: {node: '>=20'}
+
+  commander@2.20.3:
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+
+  comment-json@4.6.2:
+    resolution: {integrity: sha512-R2rze/hDX30uul4NZoIZ76ImSJLFxn/1/ZxtKC1L77y2X1k+yYu1joKbAtMA2Fg3hZrTOiw0I5mwVMo0cf250w==}
+    engines: {node: '>= 6'}
+
+  compare-versions@6.1.1:
+    resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  content-disposition@1.1.0:
+    resolution: {integrity: sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g==}
+    engines: {node: '>=18'}
+
+  content-type@1.0.5:
+    resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
+    engines: {node: '>= 0.6'}
+
+  content-type@2.0.0:
+    resolution: {integrity: sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==}
+    engines: {node: '>=18'}
+
+  convert-source-map@2.0.0:
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
+
+  cookie-signature@1.2.2:
+    resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==}
+    engines: {node: '>=6.6.0'}
+
+  cookie@0.7.2:
+    resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==}
+    engines: {node: '>= 0.6'}
+
+  cookie@1.1.1:
+    resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==}
+    engines: {node: '>=18'}
+
+  cors@2.8.6:
+    resolution: {integrity: sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==}
+    engines: {node: '>= 0.10'}
+
+  cosmiconfig@9.0.2:
+    resolution: {integrity: sha512-gtTZxTDau1wL7Y7zifc2dd8jHSK/k6BTx/2Xp/BpdlAdnlYWFVt7qhJqgwi7637yRwRQ3qL4ZidbB4I8tA5VOg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      typescript: '>=4.9.5'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
+
+  cssesc@3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  csstype@3.2.3:
+    resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
+
+  damerau-levenshtein@1.0.8:
+    resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
+
+  data-uri-to-buffer@4.0.1:
+    resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
+    engines: {node: '>= 12'}
+
+  data-view-buffer@1.0.2:
+    resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-length@1.0.2:
+    resolution: {integrity: sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-offset@1.0.1:
+    resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
+    engines: {node: '>= 0.4'}
+
+  debug@3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  dedent@1.7.2:
+    resolution: {integrity: sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==}
+    peerDependencies:
+      babel-plugin-macros: ^3.1.0
+    peerDependenciesMeta:
+      babel-plugin-macros:
+        optional: true
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  deepmerge@4.3.1:
+    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
+    engines: {node: '>=0.10.0'}
+
+  default-browser-id@5.0.1:
+    resolution: {integrity: sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==}
+    engines: {node: '>=18'}
+
+  default-browser@5.5.0:
+    resolution: {integrity: sha512-H9LMLr5zwIbSxrmvikGuI/5KGhZ8E2zH3stkMgM5LpOWDutGM2JZaj460Udnf1a+946zc7YBgrqEWwbk7zHvGw==}
+    engines: {node: '>=18'}
+
+  define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+
+  define-lazy-prop@3.0.0:
+    resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}
+    engines: {node: '>=12'}
+
+  define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+
+  delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+
+  depd@2.0.0:
+    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
+    engines: {node: '>= 0.8'}
+
+  detect-libc@2.1.2:
+    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
+    engines: {node: '>=8'}
+
+  diff@8.0.4:
+    resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==}
+    engines: {node: '>=0.3.1'}
+
+  doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+
+  dotenv@16.6.1:
+    resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}
+    engines: {node: '>=12'}
+
+  dotenv@17.4.2:
+    resolution: {integrity: sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==}
+    engines: {node: '>=12'}
+
+  dunder-proto@1.0.1:
+    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
+    engines: {node: '>= 0.4'}
+
+  duplexer@0.1.2:
+    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
+
+  eciesjs@0.4.18:
+    resolution: {integrity: sha512-wG99Zcfcys9fZux7Cft8BAX/YrOJLJSZ3jyYPfhZHqN2E+Ffx+QXBDsv3gubEgPtV6dTzJMSQUwk1H98/t/0wQ==}
+    engines: {bun: '>=1', deno: '>=2', node: '>=16'}
+
+  ee-first@1.1.1:
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
+
+  electron-to-chromium@1.5.372:
+    resolution: {integrity: sha512-M3yhbAlilnwqC8D21t28UCDGHyitShTmmLRU/H+b74P6Ski16Nb9HONYEaVpMj/pwC7BEo5B95FpjODLCWbtfA==}
+
+  emoji-regex@10.6.0:
+    resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==}
+
+  emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  emoji-regex@9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+
+  encodeurl@2.0.0:
+    resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
+    engines: {node: '>= 0.8'}
+
+  enhanced-resolve@5.21.6:
+    resolution: {integrity: sha512-aNnGCvbJ/RIyWo1IuhNdVjnNF+EjH9wpzpNHt+ci/m9He9LJvUN8wrCcXjp9cWsGNAuvSpVFTx/vraAFQ8qGjQ==}
+    engines: {node: '>=10.13.0'}
+
+  enquirer@2.4.1:
+    resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==}
+    engines: {node: '>=8.6'}
+
+  env-paths@2.2.1:
+    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
+    engines: {node: '>=6'}
+
+  error-ex@1.3.4:
+    resolution: {integrity: sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==}
+
+  error-stack-parser-es@1.0.5:
+    resolution: {integrity: sha512-5qucVt2XcuGMcEGgWI7i+yZpmpByQ8J1lHhcL7PwqCwu9FPP3VUXzT4ltHe5i2z9dePwEHcDVOAfSnHsOlCXRA==}
+
+  es-abstract@1.24.2:
+    resolution: {integrity: sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg==}
+    engines: {node: '>= 0.4'}
+
+  es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
+  es-iterator-helpers@1.3.3:
+    resolution: {integrity: sha512-0PuBxFi+4uPanB97iDxCLWuHeYud2FALrw5HFZGtAF38UpJDbDC8frwp2cnDyae692CQ0dou60UwWfhgsa4U/g==}
+    engines: {node: '>= 0.4'}
+
+  es-object-atoms@1.1.2:
+    resolution: {integrity: sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.1.0:
+    resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
+    engines: {node: '>= 0.4'}
+
+  es-shim-unscopables@1.1.0:
+    resolution: {integrity: sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==}
+    engines: {node: '>= 0.4'}
+
+  es-to-primitive@1.3.0:
+    resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
+    engines: {node: '>= 0.4'}
+
+  esbuild@0.25.4:
+    resolution: {integrity: sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  esbuild@0.27.3:
+    resolution: {integrity: sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
+
+  escape-html@1.0.3:
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  eslint-config-next@16.2.9:
+    resolution: {integrity: sha512-olGtBrs07bQchpaJWeqbk9GaMoU0oGmN/pYNEBXSbfgKngb5uHnPe37X6tVeh6DJfaWFQildvinGEOrolo5fmw==}
+    peerDependencies:
+      eslint: '>=9.0.0'
+      typescript: '>=3.3.1'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  eslint-config-prettier@10.1.8:
+    resolution: {integrity: sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+
+  eslint-import-resolver-node@0.3.10:
+    resolution: {integrity: sha512-tRrKqFyCaKict5hOd244sL6EQFNycnMQnBe+j8uqGNXYzsImGbGUU4ibtoaBmv5FLwJwcFJNeg1GeVjQfbMrDQ==}
+
+  eslint-import-resolver-typescript@3.10.1:
+    resolution: {integrity: sha512-A1rHYb06zjMGAxdLSkN2fXPBwuSaQ0iO5M/hdyS0Ajj1VBaRp0sPD3dn1FhME3c/JluGFbwSxyCfqdSbtQLAHQ==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      eslint-plugin-import: '*'
+      eslint-plugin-import-x: '*'
+    peerDependenciesMeta:
+      eslint-plugin-import:
+        optional: true
+      eslint-plugin-import-x:
+        optional: true
+
+  eslint-module-utils@2.13.0:
+    resolution: {integrity: sha512-bLohSkT6469rRs8czj0tLTD8vaeIS/whvPRJVjDr7IuoTT1k5DYDERlNycjDj/HkOlvQdYurmfZ/g3fG5bgeLQ==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
+  eslint-plugin-import@2.32.0:
+    resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+
+  eslint-plugin-jsx-a11y@6.10.2:
+    resolution: {integrity: sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
+
+  eslint-plugin-react-dom@2.13.0:
+    resolution: {integrity: sha512-+2IZzQ1WEFYOWatW+xvNUqmZn55YBCufzKA7hX3XQ/8eu85Mp4vnlOyNvdVHEOGhUnGuC6+9+zLK+IlEHKdKLQ==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  eslint-plugin-react-hooks-extra@2.13.0:
+    resolution: {integrity: sha512-qIbha1nzuyhXM9SbEfrcGVqmyvQu7GAOB2sy9Y4Qo5S8nCqw4fSBxq+8lSce5Tk5Y7XzIkgHOhNyXEvUHRWFMQ==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  eslint-plugin-react-hooks@7.1.1:
+    resolution: {integrity: sha512-f2I7Gw6JbvCexzIInuSbZpfdQ44D7iqdWX01FKLvrPgqxoE7oMj8clOfto8U6vYiz4yd5oKu39rRSVOe1zRu0g==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 || ^10.0.0
+
+  eslint-plugin-react-naming-convention@2.13.0:
+    resolution: {integrity: sha512-uSd25JzSg2R4p81s3Wqck0AdwRlO9Yc+cZqTEXv7vW8exGGAM3mWnF6hgrgdqVJqBEGJIbS/Vx1r5BdKcY/MHA==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  eslint-plugin-react-rsc@2.13.0:
+    resolution: {integrity: sha512-RaftgITDLQm1zIgYyvR51sBdy4FlVaXFts5VISBaKbSUB0oqXyzOPxMHasfr9BCSjPLKus9zYe+G/Hr6rjFLXQ==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  eslint-plugin-react-web-api@2.13.0:
+    resolution: {integrity: sha512-nmJbzIAte7PeAkp22CwcKEASkKi49MshSdiDGO1XuN3f4N4/8sBfDcWbQuLPde6JiuzDT/0+l7Gi8wwTHtR1kg==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  eslint-plugin-react-x@2.13.0:
+    resolution: {integrity: sha512-cMNX0+ws/fWTgVxn52qAQbaFF2rqvaDAtjrPUzY6XOzPjY0rJQdR2tSlWJttz43r2yBfqu+LGvHlGpWL2wfpTQ==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.0.0'
+
+  eslint-plugin-react-you-might-not-need-an-effect@0.9.3:
+    resolution: {integrity: sha512-44cce7LndBnpDRWBTQ8p7ircIdl2rJBP5+V9Ik64E935UB47uA9ZMU1Uv160lAMhtvoPYqXBjQ+tojr5JF3mFQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      eslint: '>=8.40.0'
+
+  eslint-plugin-react@7.37.5:
+    resolution: {integrity: sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
+
+  eslint-scope@8.4.0:
+    resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@4.2.1:
+    resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint-visitor-keys@5.0.1:
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
+
+  eslint@9.39.4:
+    resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    hasBin: true
+    peerDependencies:
+      jiti: '*'
+    peerDependenciesMeta:
+      jiti:
+        optional: true
+
+  espree@10.4.0:
+    resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  esquery@1.7.0:
+    resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  etag@1.8.1:
+    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
+    engines: {node: '>= 0.6'}
+
+  event-target-shim@5.0.1:
+    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
+    engines: {node: '>=6'}
+
+  eventsource-parser@3.1.0:
+    resolution: {integrity: sha512-kJezFj9YFAMLeORyi7aCLxLbD5/qWMQnoMVlVPyHIll7lgRJCc3JVln9Vgl9nwQi0YkMnhdGTMNn7CkRRAptMg==}
+    engines: {node: '>=18.0.0'}
+
+  eventsource@3.0.7:
+    resolution: {integrity: sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==}
+    engines: {node: '>=18.0.0'}
+
+  execa@5.1.1:
+    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
+    engines: {node: '>=10'}
+
+  execa@9.6.1:
+    resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==}
+    engines: {node: ^18.19.0 || >=20.5.0}
+
+  express-rate-limit@7.5.1:
+    resolution: {integrity: sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==}
+    engines: {node: '>= 16'}
+    peerDependencies:
+      express: '>= 4.11'
+
+  express-rate-limit@8.5.2:
+    resolution: {integrity: sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==}
+    engines: {node: '>= 16'}
+    peerDependencies:
+      express: '>= 4.11'
+
+  express@5.2.1:
+    resolution: {integrity: sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==}
+    engines: {node: '>= 18'}
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-glob@3.3.1:
+    resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==}
+    engines: {node: '>=8.6.0'}
+
+  fast-glob@3.3.3:
+    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
+    engines: {node: '>=8.6.0'}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fast-string-truncated-width@3.0.3:
+    resolution: {integrity: sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==}
+
+  fast-string-width@3.0.2:
+    resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==}
+
+  fast-uri@3.1.2:
+    resolution: {integrity: sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==}
+
+  fast-wrap-ansi@0.2.2:
+    resolution: {integrity: sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==}
+
+  fast-xml-builder@1.2.0:
+    resolution: {integrity: sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==}
+
+  fast-xml-parser@5.7.3:
+    resolution: {integrity: sha512-C0AaNuC+mscy6vrAQKAc/rMq+zAPHodfHGZu4sGVehvAQt/JLG1O5zEcYcXSY5zSqr4YVgxsB+pHXTq0i7eDlg==}
+    hasBin: true
+
+  fastq@1.20.1:
+    resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
+
+  fdir@6.5.0:
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  fetch-blob@3.2.0:
+    resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
+    engines: {node: ^12.20 || >= 14.13}
+
+  figures@6.1.0:
+    resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==}
+    engines: {node: '>=18'}
+
+  file-entry-cache@8.0.0:
+    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
+    engines: {node: '>=16.0.0'}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  finalhandler@2.1.1:
+    resolution: {integrity: sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==}
+    engines: {node: '>= 18.0.0'}
+
+  find-process@2.0.0:
+    resolution: {integrity: sha512-YUBQnteWGASJoEVVsOXy6XtKAY2O1FCsWnnvQ8y0YwgY1rZiKeVptnFvMu6RSELZAJOGklqseTnUGGs5D0bKmg==}
+    hasBin: true
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  flat-cache@4.0.1:
+    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
+    engines: {node: '>=16'}
+
+  flatted@3.4.2:
+    resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}
+
+  for-each@0.3.5:
+    resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
+    engines: {node: '>= 0.4'}
+
+  foreground-child@3.3.1:
+    resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
+    engines: {node: '>=14'}
+
+  form-data-encoder@1.7.2:
+    resolution: {integrity: sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==}
+
+  form-data@4.0.6:
+    resolution: {integrity: sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==}
+    engines: {node: '>= 6'}
+
+  formdata-node@4.4.1:
+    resolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==}
+    engines: {node: '>= 12.20'}
+
+  formdata-polyfill@4.0.10:
+    resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
+    engines: {node: '>=12.20.0'}
+
+  forwarded@0.2.0:
+    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
+    engines: {node: '>= 0.6'}
+
+  framer-motion@12.40.0:
+    resolution: {integrity: sha512-uaBd3qC1v3KQqBEjwTUd183K6PbS+j0yR9w9VmEOLWA/tnUcSn8Xa3uck7t4dgpDoUss8xQTcj8W2L07lrnLFg==}
+    peerDependencies:
+      '@emotion/is-prop-valid': '*'
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/is-prop-valid':
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+
+  fresh@2.0.0:
+    resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
+    engines: {node: '>= 0.8'}
+
+  fs-extra@11.3.5:
+    resolution: {integrity: sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==}
+    engines: {node: '>=14.14'}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  function.prototype.name@1.2.0:
+    resolution: {integrity: sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew==}
+    engines: {node: '>= 0.4'}
+
+  functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+
+  fuzzysort@3.1.0:
+    resolution: {integrity: sha512-sR9BNCjBg6LNgwvxlBd0sBABvQitkLzoVY9MYYROQVX/FvfJ4Mai9LsGhDgd8qYdds0bY77VzYd5iuB+v5rwQQ==}
+
+  fzf@0.5.2:
+    resolution: {integrity: sha512-Tt4kuxLXFKHy8KT40zwsUPUkg1CrsgY25FxA2U/j/0WgEDCk3ddc/zLTCCcbSHX9FcKtLuVaDGtGE/STWC+j3Q==}
+
+  generator-function@2.0.1:
+    resolution: {integrity: sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==}
+    engines: {node: '>= 0.4'}
+
+  gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  get-east-asian-width@1.6.0:
+    resolution: {integrity: sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==}
+    engines: {node: '>=18'}
+
+  get-intrinsic@1.3.0:
+    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
+    engines: {node: '>= 0.4'}
+
+  get-own-enumerable-keys@1.0.0:
+    resolution: {integrity: sha512-PKsK2FSrQCyxcGHsGrLDcK0lx+0Ke+6e8KFFozA9/fIQLhQzPaRvJFdcz7+Axg3jUH/Mq+NI4xa5u/UT2tQskA==}
+    engines: {node: '>=14.16'}
+
+  get-proto@1.0.1:
+    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
+    engines: {node: '>= 0.4'}
+
+  get-stream@6.0.1:
+    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
+    engines: {node: '>=10'}
+
+  get-stream@9.0.1:
+    resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
+    engines: {node: '>=18'}
+
+  get-symbol-description@1.1.0:
+    resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==}
+    engines: {node: '>= 0.4'}
+
+  get-tsconfig@4.14.0:
+    resolution: {integrity: sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==}
+
+  glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+
+  glob@12.0.0:
+    resolution: {integrity: sha512-5Qcll1z7IKgHr5g485ePDdHcNQY0k2dtv/bjYy0iuyGxQw2qSOiiXUXJ+AYQpg3HNoUMHqAruX478Jeev7UULw==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
+  glob@9.3.5:
+    resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
+
+  globals@14.0.0:
+    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+    engines: {node: '>=18'}
+
+  globals@16.4.0:
+    resolution: {integrity: sha512-ob/2LcVVaVGCYN+r14cnwnoDPUufjiYgSqRhiFD0Q1iI4Odora5RE8Iv1D24hAz5oMophRGkGz+yuvQmmUMnMw==}
+    engines: {node: '>=18'}
+
+  globals@16.5.0:
+    resolution: {integrity: sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==}
+    engines: {node: '>=18'}
+
+  globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
+
+  gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  graphql@16.14.2:
+    resolution: {integrity: sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==}
+    engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
+
+  gzip-size@6.0.0:
+    resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}
+    engines: {node: '>=10'}
+
+  has-bigints@1.1.0:
+    resolution: {integrity: sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==}
+    engines: {node: '>= 0.4'}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+
+  has-proto@1.2.0:
+    resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==}
+    engines: {node: '>= 0.4'}
+
+  has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
+  hasown@2.0.4:
+    resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}
+    engines: {node: '>= 0.4'}
+
+  headers-polyfill@5.0.1:
+    resolution: {integrity: sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==}
+
+  hermes-estree@0.25.1:
+    resolution: {integrity: sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==}
+
+  hermes-parser@0.25.1:
+    resolution: {integrity: sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==}
+
+  hono@4.12.25:
+    resolution: {integrity: sha512-2NFaIyNVgJmBs/ecmtGzlmluTFs5cHEWGTdu0t1HBwYzoGXOL5nUQBRMXsXWla5i4KkG//QMzVP88m1+I3fdAQ==}
+    engines: {node: '>=16.9.0'}
+
+  http-errors@2.0.1:
+    resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
+    engines: {node: '>= 0.8'}
+
+  https-proxy-agent@7.0.6:
+    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
+    engines: {node: '>= 14'}
+
+  human-signals@2.1.0:
+    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
+    engines: {node: '>=10.17.0'}
+
+  human-signals@8.0.1:
+    resolution: {integrity: sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ==}
+    engines: {node: '>=18.18.0'}
+
+  humanize-ms@1.2.1:
+    resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
+
+  iconv-lite@0.7.2:
+    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
+    engines: {node: '>=0.10.0'}
+
+  ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
+
+  ignore@7.0.5:
+    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+    engines: {node: '>= 4'}
+
+  import-fresh@3.3.1:
+    resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
+    engines: {node: '>=6'}
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  internal-slot@1.1.0:
+    resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
+    engines: {node: '>= 0.4'}
+
+  ip-address@10.2.0:
+    resolution: {integrity: sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==}
+    engines: {node: '>= 12'}
+
+  ipaddr.js@1.9.1:
+    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
+    engines: {node: '>= 0.10'}
+
+  is-array-buffer@3.0.5:
+    resolution: {integrity: sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==}
+    engines: {node: '>= 0.4'}
+
+  is-arrayish@0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+
+  is-async-function@2.1.1:
+    resolution: {integrity: sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==}
+    engines: {node: '>= 0.4'}
+
+  is-bigint@1.1.0:
+    resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==}
+    engines: {node: '>= 0.4'}
+
+  is-boolean-object@1.2.2:
+    resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==}
+    engines: {node: '>= 0.4'}
+
+  is-bun-module@2.0.0:
+    resolution: {integrity: sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==}
+
+  is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+
+  is-core-module@2.16.2:
+    resolution: {integrity: sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==}
+    engines: {node: '>= 0.4'}
+
+  is-data-view@1.0.2:
+    resolution: {integrity: sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==}
+    engines: {node: '>= 0.4'}
+
+  is-date-object@1.1.0:
+    resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==}
+    engines: {node: '>= 0.4'}
+
+  is-docker@3.0.0:
+    resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    hasBin: true
+
+  is-document.all@1.0.0:
+    resolution: {integrity: sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g==}
+    engines: {node: '>= 0.4'}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-finalizationregistry@1.1.1:
+    resolution: {integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==}
+    engines: {node: '>= 0.4'}
+
+  is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  is-generator-function@1.1.2:
+    resolution: {integrity: sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==}
+    engines: {node: '>= 0.4'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-immutable-type@5.0.4:
+    resolution: {integrity: sha512-tDf0vB9dJJt/1USS2nvHJb8UsIAhs+pF6z8UZLNdhrzB+PKMrdcN45je9jhuFpaJOjJpoRhueFmFrRs5g/TNMA==}
+    peerDependencies:
+      eslint: '*'
+      typescript: '>=4.7.4'
+
+  is-in-ssh@1.0.0:
+    resolution: {integrity: sha512-jYa6Q9rH90kR1vKB6NM7qqd1mge3Fx4Dhw5TVlK1MUBqhEOuCagrEHMevNuCcbECmXZ0ThXkRm+Ymr51HwEPAw==}
+    engines: {node: '>=20'}
+
+  is-inside-container@1.0.0:
+    resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==}
+    engines: {node: '>=14.16'}
+    hasBin: true
+
+  is-interactive@2.0.0:
+    resolution: {integrity: sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==}
+    engines: {node: '>=12'}
+
+  is-map@2.0.3:
+    resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
+    engines: {node: '>= 0.4'}
+
+  is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
+  is-node-process@1.2.0:
+    resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==}
+
+  is-number-object@1.1.1:
+    resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==}
+    engines: {node: '>= 0.4'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-obj@3.0.0:
+    resolution: {integrity: sha512-IlsXEHOjtKhpN8r/tRFj2nDyTmHvcfNeu/nrRIcXE17ROeatXchkojffa1SpdqW4cr/Fj6QkEf/Gn4zf6KKvEQ==}
+    engines: {node: '>=12'}
+
+  is-plain-obj@4.1.0:
+    resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
+    engines: {node: '>=12'}
+
+  is-promise@4.0.0:
+    resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
+
+  is-regex@1.2.1:
+    resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==}
+    engines: {node: '>= 0.4'}
+
+  is-regexp@3.1.0:
+    resolution: {integrity: sha512-rbku49cWloU5bSMI+zaRaXdQHXnthP6DZ/vLnfdSKyL4zUzuWnomtOEiZZOd+ioQ+avFo/qau3KPTc7Fjy1uPA==}
+    engines: {node: '>=12'}
+
+  is-set@2.0.3:
+    resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==}
+    engines: {node: '>= 0.4'}
+
+  is-shared-array-buffer@1.0.4:
+    resolution: {integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==}
+    engines: {node: '>= 0.4'}
+
+  is-stream@2.0.1:
+    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
+    engines: {node: '>=8'}
+
+  is-stream@4.0.1:
+    resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==}
+    engines: {node: '>=18'}
+
+  is-string@1.1.1:
+    resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==}
+    engines: {node: '>= 0.4'}
+
+  is-symbol@1.1.1:
+    resolution: {integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==}
+    engines: {node: '>= 0.4'}
+
+  is-typed-array@1.1.15:
+    resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
+    engines: {node: '>= 0.4'}
+
+  is-unicode-supported@1.3.0:
+    resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==}
+    engines: {node: '>=12'}
+
+  is-unicode-supported@2.1.0:
+    resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==}
+    engines: {node: '>=18'}
+
+  is-weakmap@2.0.2:
+    resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
+    engines: {node: '>= 0.4'}
+
+  is-weakref@1.1.1:
+    resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==}
+    engines: {node: '>= 0.4'}
+
+  is-weakset@2.0.4:
+    resolution: {integrity: sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==}
+    engines: {node: '>= 0.4'}
+
+  is-wsl@3.1.1:
+    resolution: {integrity: sha512-e6rvdUCiQCAuumZslxRJWR/Doq4VpPR82kqclvcS0efgt430SlGIk05vdCN58+VrzgtIcfNODjozVielycD4Sw==}
+    engines: {node: '>=16'}
+
+  isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  isexe@3.1.5:
+    resolution: {integrity: sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==}
+    engines: {node: '>=18'}
+
+  iterator.prototype@1.1.5:
+    resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==}
+    engines: {node: '>= 0.4'}
+
+  jackspeak@4.2.3:
+    resolution: {integrity: sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg==}
+    engines: {node: 20 || >=22}
+
+  jiti@2.7.0:
+    resolution: {integrity: sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==}
+    hasBin: true
+
+  jose@6.2.3:
+    resolution: {integrity: sha512-YYVDInQKFJfR/xa3ojUTl8c2KoTwiL1R5Wg9YCydwH0x0B9grbzlg5HC7mMjCtUJjbQ/YnGEZIhI5tCgfTb4Hw==}
+
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  js-yaml@4.2.0:
+    resolution: {integrity: sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==}
+    hasBin: true
+
+  jsesc@3.1.0:
+    resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+
+  json-parse-even-better-errors@2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
+  json-schema-typed@8.0.2:
+    resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==}
+
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
+  json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
+
+  json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  jsonfile@6.2.1:
+    resolution: {integrity: sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==}
+
+  jsx-ast-utils@3.3.5:
+    resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
+    engines: {node: '>=4.0'}
+
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+
+  kleur@3.0.3:
+    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
+    engines: {node: '>=6'}
+
+  kleur@4.1.5:
+    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
+    engines: {node: '>=6'}
+
+  language-subtag-registry@0.3.23:
+    resolution: {integrity: sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==}
+
+  language-tags@1.0.9:
+    resolution: {integrity: sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==}
+    engines: {node: '>=0.10'}
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  lightningcss-android-arm64@1.32.0:
+    resolution: {integrity: sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [android]
+
+  lightningcss-darwin-arm64@1.32.0:
+    resolution: {integrity: sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  lightningcss-darwin-x64@1.32.0:
+    resolution: {integrity: sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  lightningcss-freebsd-x64@1.32.0:
+    resolution: {integrity: sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  lightningcss-linux-arm-gnueabihf@1.32.0:
+    resolution: {integrity: sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  lightningcss-linux-arm64-gnu@1.32.0:
+    resolution: {integrity: sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  lightningcss-linux-arm64-musl@1.32.0:
+    resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  lightningcss-linux-x64-gnu@1.32.0:
+    resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  lightningcss-linux-x64-musl@1.32.0:
+    resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+
+  lightningcss-win32-arm64-msvc@1.32.0:
+    resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  lightningcss-win32-x64-msvc@1.32.0:
+    resolution: {integrity: sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  lightningcss@1.32.0:
+    resolution: {integrity: sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==}
+    engines: {node: '>= 12.0.0'}
+
+  lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
+  log-symbols@6.0.0:
+    resolution: {integrity: sha512-i24m8rpwhmPIS4zscNzK6MSEhk0DUWa/8iYQWxhffV8jkI4Phvs3F+quL5xvS0gdQR0FyTCMMH33Y78dDTzzIw==}
+    engines: {node: '>=18'}
+
+  loglevel@1.9.2:
+    resolution: {integrity: sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==}
+    engines: {node: '>= 0.6.0'}
+
+  loose-envify@1.4.0:
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+    hasBin: true
+
+  lru-cache@10.4.3:
+    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+
+  lru-cache@11.5.1:
+    resolution: {integrity: sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==}
+    engines: {node: 20 || >=22}
+
+  lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+
+  lucide-react@0.574.0:
+    resolution: {integrity: sha512-dJ8xb5juiZVIbdSn3HTyHsjjIwUwZ4FNwV0RtYDScOyySOeie1oXZTymST6YPJ4Qwt3Po8g4quhYl4OxtACiuQ==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  magic-string@0.30.21:
+    resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
+
+  math-intrinsics@1.1.0:
+    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
+    engines: {node: '>= 0.4'}
+
+  media-typer@1.1.0:
+    resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
+    engines: {node: '>= 0.8'}
+
+  merge-descriptors@2.0.0:
+    resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==}
+    engines: {node: '>=18'}
+
+  merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+
+  merge2@1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+
+  mime-db@1.54.0:
+    resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@3.0.2:
+    resolution: {integrity: sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==}
+    engines: {node: '>=18'}
+
+  mimic-fn@2.1.0:
+    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
+    engines: {node: '>=6'}
+
+  mimic-function@5.0.1:
+    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
+    engines: {node: '>=18'}
+
+  miniflare@4.20260611.0:
+    resolution: {integrity: sha512-i+JwEo8vN96naz1WL3ntFgFyRluBDYL408zwhHKvR2jefJ464KsZ/gCmJAQ5k+oaWeb5Ug+s7yne5AyiAEswjg==}
+    engines: {node: '>=22.0.0'}
+    hasBin: true
+
+  minimatch@10.2.5:
+    resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
+    engines: {node: 18 || 20 || >=22}
+
+  minimatch@3.1.5:
+    resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
+
+  minimatch@8.0.7:
+    resolution: {integrity: sha512-V+1uQNdzybxa14e/p00HZnQNNcTjnRJjDxg2V8wtkjFctq4M7hXFws4oekyTP0Jebeq7QYtpFyOeBAjc88zvYg==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
+  minipass@4.2.8:
+    resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
+    engines: {node: '>=8'}
+
+  minipass@7.1.3:
+    resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  mkdirp@1.0.4:
+    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  mnemonist@0.38.3:
+    resolution: {integrity: sha512-2K9QYubXx/NAjv4VLq1d1Ly8pWNC5L3BrixtdkyTegXWJIqY+zLNDhhX/A+ZwWt70tB1S8H4BE8FLYEFyNoOBw==}
+
+  motion-dom@12.40.0:
+    resolution: {integrity: sha512-HxU3ZaBwNPVQUBQf1xxgq+7JrPNZvjLVxgbpEZL7RrWJnsxOf0/OM+yrHG9ogLQ31Do/r57Oz2gQWPK+6q62mg==}
+
+  motion-utils@12.39.0:
+    resolution: {integrity: sha512-8nadJAJjTtqRkmRF36FoJTrywK9nnFmnPwnSMyxaOCU7GDjN9RTMJIxx9De8ErM+vpPhMccr/6fo5WciyQLnMQ==}
+
+  motion@12.40.0:
+    resolution: {integrity: sha512-yjrHUrBFW6kQvjJwRsoiPSAhC5tRwRqNGJWmiJ4CrGnbKp0V88AdzkhBmDoqIsIPfarOe0Uddd37Xq43/gIocA==}
+    peerDependencies:
+      '@emotion/is-prop-valid': '*'
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@emotion/is-prop-valid':
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  msw@2.14.6:
+    resolution: {integrity: sha512-ALe+N10S72cyx94cMcy3Zs4HhXCj35sgeAL4c+WTvKi0zWnbd8/h0lcFqv0mb2P+aSgAdD7p9HzvA0DiUPxsyg==}
+    engines: {node: '>=18'}
+    hasBin: true
+    peerDependencies:
+      typescript: '>= 4.8.x'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  mute-stream@3.0.0:
+    resolution: {integrity: sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==}
+    engines: {node: ^20.17.0 || >=22.9.0}
+
+  nanoid@3.3.12:
+    resolution: {integrity: sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  napi-postinstall@0.3.4:
+    resolution: {integrity: sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==}
+    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
+    hasBin: true
+
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  negotiator@1.0.0:
+    resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
+    engines: {node: '>= 0.6'}
+
+  next-devtools-mcp@0.3.10:
+    resolution: {integrity: sha512-r7SvHCiS6glEuN98x0HpW+RMbRNaTO7ni8cR+GO1Ww4P83IIwDgKUDdRwvvwtk5WXf4wiq6Qd1xDCvsTm9oDSw==}
+    hasBin: true
+
+  next-themes@0.4.6:
+    resolution: {integrity: sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA==}
+    peerDependencies:
+      react: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
+
+  next@16.2.9:
+    resolution: {integrity: sha512-MEOJiq/UvuezAdqVSceHbqDgZt1kDw2tpGVOlsdIoJsQdbN2JY2hpVG4xnXGkbdJUOEWhnRfiu/O4Hpc9Juwww==}
+    engines: {node: '>=20.9.0'}
+    hasBin: true
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+      '@playwright/test': ^1.51.1
+      babel-plugin-react-compiler: '*'
+      react: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
+      react-dom: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
+      sass: ^1.3.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      '@playwright/test':
+        optional: true
+      babel-plugin-react-compiler:
+        optional: true
+      sass:
+        optional: true
+
+  node-domexception@1.0.0:
+    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
+    engines: {node: '>=10.5.0'}
+    deprecated: Use your platform's native DOMException instead
+
+  node-exports-info@1.6.0:
+    resolution: {integrity: sha512-pyFS63ptit/P5WqUkt+UUfe+4oevH+bFeIiPPdfb0pFeYEu/1ELnJu5l+5EcTKYL5M7zaAa7S8ddywgXypqKCw==}
+    engines: {node: '>= 0.4'}
+
+  node-fetch@2.7.0:
+    resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+
+  node-fetch@3.3.2:
+    resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  node-releases@2.0.47:
+    resolution: {integrity: sha512-Uzmd6LXpouKo8EUK68IjH4+E01w/hXyV3R3g/geCJo+rXLNfh1xucB+LOzYEOQPSiUK3h/xZf0cQGcSsmyL2Og==}
+    engines: {node: '>=18'}
+
+  npm-run-path@4.0.1:
+    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
+    engines: {node: '>=8'}
+
+  npm-run-path@6.0.0:
+    resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==}
+    engines: {node: '>=18'}
+
+  object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  object-inspect@1.13.4:
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
+    engines: {node: '>= 0.4'}
+
+  object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+
+  object-treeify@1.1.33:
+    resolution: {integrity: sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==}
+    engines: {node: '>= 10'}
+
+  object.assign@4.1.7:
+    resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==}
+    engines: {node: '>= 0.4'}
+
+  object.entries@1.1.9:
+    resolution: {integrity: sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==}
+    engines: {node: '>= 0.4'}
+
+  object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
+    engines: {node: '>= 0.4'}
+
+  object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
+
+  object.values@1.2.1:
+    resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==}
+    engines: {node: '>= 0.4'}
+
+  obliterator@1.6.1:
+    resolution: {integrity: sha512-9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig==}
+
+  on-finished@2.4.1:
+    resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
+    engines: {node: '>= 0.8'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  onetime@5.1.2:
+    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
+    engines: {node: '>=6'}
+
+  onetime@7.0.0:
+    resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
+    engines: {node: '>=18'}
+
+  open@11.0.0:
+    resolution: {integrity: sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw==}
+    engines: {node: '>=20'}
+
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
+
+  ora@8.2.0:
+    resolution: {integrity: sha512-weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==}
+    engines: {node: '>=18'}
+
+  outvariant@1.4.3:
+    resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==}
+
+  own-keys@1.0.1:
+    resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
+    engines: {node: '>= 0.4'}
+
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+
+  package-json-from-dist@1.0.1:
+    resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
+
+  package-manager-detector@1.6.0:
+    resolution: {integrity: sha512-61A5ThoTiDG/C8s8UMZwSorAGwMJ0ERVGj2OjoW5pAalsNOg15+iQiPzrLJ4jhZ1HJzmC2PIHT2oEiH3R5fzNA==}
+
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+
+  parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+
+  parse-ms@4.0.0:
+    resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==}
+    engines: {node: '>=18'}
+
+  parseurl@1.3.3:
+    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
+    engines: {node: '>= 0.8'}
+
+  path-browserify@1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  path-expression-matcher@1.5.0:
+    resolution: {integrity: sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==}
+    engines: {node: '>=14.0.0'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+
+  path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+
+  path-scurry@1.11.1:
+    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
+    engines: {node: '>=16 || 14 >=14.18'}
+
+  path-scurry@2.0.2:
+    resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==}
+    engines: {node: 18 || 20 || >=22}
+
+  path-to-regexp@6.3.0:
+    resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==}
+
+  path-to-regexp@8.4.2:
+    resolution: {integrity: sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA==}
+
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@2.3.2:
+    resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==}
+    engines: {node: '>=8.6'}
+
+  picomatch@4.0.4:
+    resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
+    engines: {node: '>=12'}
+
+  pid-port@2.0.0:
+    resolution: {integrity: sha512-EDmfRxLl6lkhPjDI+19l5pkII89xVsiCP3aGjS808f7M16DyCKSXEWthD/hjyDLn5I4gKqTVw7hSgdvdXRJDTw==}
+    engines: {node: '>=20'}
+
+  pkce-challenge@5.0.1:
+    resolution: {integrity: sha512-wQ0b/W4Fr01qtpHlqSqspcj3EhBvimsdh0KlHhH8HRZnMsEa0ea2fTULOXOS9ccQr3om+GcGRk4e+isrZWV8qQ==}
+    engines: {node: '>=16.20.0'}
+
+  possible-typed-array-names@1.1.0:
+    resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
+    engines: {node: '>= 0.4'}
+
+  postcss-selector-parser@7.1.4:
+    resolution: {integrity: sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==}
+    engines: {node: '>=4'}
+
+  postcss@8.4.31:
+    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postcss@8.5.15:
+    resolution: {integrity: sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  powershell-utils@0.1.0:
+    resolution: {integrity: sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==}
+    engines: {node: '>=20'}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
+  prettier-plugin-organize-imports@4.3.0:
+    resolution: {integrity: sha512-FxFz0qFhyBsGdIsb697f/EkvHzi5SZOhWAjxcx2dLt+Q532bAlhswcXGYB1yzjZ69kW8UoadFBw7TyNwlq96Iw==}
+    peerDependencies:
+      prettier: '>=2.0'
+      typescript: '>=2.9'
+      vue-tsc: ^2.1.0 || 3
+    peerDependenciesMeta:
+      vue-tsc:
+        optional: true
+
+  prettier-plugin-tailwindcss@0.7.4:
+    resolution: {integrity: sha512-UKii4RjY05SNt/WQi6/NcOn/LsT0/ILLXsxygjbRg5/YZelsSu5jTqorYHPDGq4nZy5q5hpCu+XdGZ1xaJEQgw==}
+    engines: {node: '>=20.19'}
+    peerDependencies:
+      '@ianvs/prettier-plugin-sort-imports': '*'
+      '@prettier/plugin-hermes': '*'
+      '@prettier/plugin-oxc': '*'
+      '@prettier/plugin-pug': '*'
+      '@shopify/prettier-plugin-liquid': '*'
+      '@trivago/prettier-plugin-sort-imports': '*'
+      '@zackad/prettier-plugin-twig': '*'
+      prettier: ^3.0
+      prettier-plugin-astro: '*'
+      prettier-plugin-css-order: '*'
+      prettier-plugin-jsdoc: '*'
+      prettier-plugin-marko: '*'
+      prettier-plugin-multiline-arrays: '*'
+      prettier-plugin-organize-attributes: '*'
+      prettier-plugin-organize-imports: '*'
+      prettier-plugin-sort-imports: '*'
+      prettier-plugin-svelte: '*'
+    peerDependenciesMeta:
+      '@ianvs/prettier-plugin-sort-imports':
+        optional: true
+      '@prettier/plugin-hermes':
+        optional: true
+      '@prettier/plugin-oxc':
+        optional: true
+      '@prettier/plugin-pug':
+        optional: true
+      '@shopify/prettier-plugin-liquid':
+        optional: true
+      '@trivago/prettier-plugin-sort-imports':
+        optional: true
+      '@zackad/prettier-plugin-twig':
+        optional: true
+      prettier-plugin-astro:
+        optional: true
+      prettier-plugin-css-order:
+        optional: true
+      prettier-plugin-jsdoc:
+        optional: true
+      prettier-plugin-marko:
+        optional: true
+      prettier-plugin-multiline-arrays:
+        optional: true
+      prettier-plugin-organize-attributes:
+        optional: true
+      prettier-plugin-organize-imports:
+        optional: true
+      prettier-plugin-sort-imports:
+        optional: true
+      prettier-plugin-svelte:
+        optional: true
+
+  prettier@3.8.4:
+    resolution: {integrity: sha512-N2MylSdi48+5N/6S5j+maeHbUSIzzZ5uOcX5Hm4QpV8Dkb1HFjfAKTKX6yNPJQD9AhcT3ifHNB66tWTTJDi11Q==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  pretty-ms@9.3.0:
+    resolution: {integrity: sha512-gjVS5hOP+M3wMm5nmNOucbIrqudzs9v/57bWRHQWLYklXqoXKrVfYW2W9+glfGsqtPgpiz5WwyEEB+ksXIx3gQ==}
+    engines: {node: '>=18'}
+
+  prompts@2.4.2:
+    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
+    engines: {node: '>= 6'}
+
+  prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+
+  proxy-addr@2.0.7:
+    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
+    engines: {node: '>= 0.10'}
+
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
+  qs@6.15.2:
+    resolution: {integrity: sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==}
+    engines: {node: '>=0.6'}
+
+  queue-microtask@1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+
+  range-parser@1.2.1:
+    resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
+    engines: {node: '>= 0.6'}
+
+  raw-body@3.0.2:
+    resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==}
+    engines: {node: '>= 0.10'}
+
+  react-dom@19.2.7:
+    resolution: {integrity: sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==}
+    peerDependencies:
+      react: ^19.2.7
+
+  react-icons@5.6.0:
+    resolution: {integrity: sha512-RH93p5ki6LfOiIt0UtDyNg/cee+HLVR6cHHtW3wALfo+eOHTp8RnU2kRkI6E+H19zMIs03DyxUG/GfZMOGvmiA==}
+    peerDependencies:
+      react: '*'
+
+  react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+
+  react@19.2.7:
+    resolution: {integrity: sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==}
+    engines: {node: '>=0.10.0'}
+
+  recast@0.23.11:
+    resolution: {integrity: sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==}
+    engines: {node: '>= 4'}
+
+  reflect.getprototypeof@1.0.10:
+    resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
+    engines: {node: '>= 0.4'}
+
+  regexp.prototype.flags@1.5.4:
+    resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
+    engines: {node: '>= 0.4'}
+
+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
+  reselect@5.2.0:
+    resolution: {integrity: sha512-AgZ3UOZm3YndfrJ4OYjgrT7bmCm/1iqkjvEfH/oYjzh6PD2qw4QuT3jjnXIrpdt4MTpMXclMT3lXbmRY+XRakw==}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+
+  resolve-pkg-maps@1.0.0:
+    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
+
+  resolve@2.0.0-next.7:
+    resolution: {integrity: sha512-tqt+NBWwyaMgw3zDsnygx4CByWjQEJHOPMdslYhppaQSJUtL/D4JO9CcBBlhPoI8lz9oJIDXkwXfhF4aWqP8xQ==}
+    engines: {node: '>= 0.4'}
+    hasBin: true
+
+  restore-cursor@5.1.0:
+    resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
+    engines: {node: '>=18'}
+
+  rettime@0.11.11:
+    resolution: {integrity: sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==}
+
+  reusify@1.1.0:
+    resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+
+  router@2.2.0:
+    resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==}
+    engines: {node: '>= 18'}
+
+  run-applescript@7.1.0:
+    resolution: {integrity: sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==}
+    engines: {node: '>=18'}
+
+  run-parallel@1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+
+  safe-array-concat@1.1.4:
+    resolution: {integrity: sha512-wtZlHyOje6OZTGqAoaDKxFkgRtkF9CnHAVnCHKfuj200wAgL+bSJhdsCD2l0Qx/2ekEXjPWcyKkfGb5CPboslg==}
+    engines: {node: '>=0.4'}
+
+  safe-push-apply@1.0.0:
+    resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==}
+    engines: {node: '>= 0.4'}
+
+  safe-regex-test@1.1.0:
+    resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
+    engines: {node: '>= 0.4'}
+
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
+  scheduler@0.27.0:
+    resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
+
+  semver@6.3.1:
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
+    hasBin: true
+
+  semver@7.8.4:
+    resolution: {integrity: sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  send@1.2.1:
+    resolution: {integrity: sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==}
+    engines: {node: '>= 18'}
+
+  serve-static@2.2.1:
+    resolution: {integrity: sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==}
+    engines: {node: '>= 18'}
+
+  set-cookie-parser@3.1.0:
+    resolution: {integrity: sha512-kjnC1DXBHcxaOaOXBHBeRtltsDG2nUiUni+jP92M9gYdW12rsmx92UsfpH7o5tDRs7I1ZZPSQJQGv3UaRfCiuw==}
+
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+
+  set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
+
+  set-proto@1.0.0:
+    resolution: {integrity: sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==}
+    engines: {node: '>= 0.4'}
+
+  setprototypeof@1.2.0:
+    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
+
+  shadcn@3.8.5:
+    resolution: {integrity: sha512-jPRx44e+eyeV7xwY3BLJXcfrks00+M0h5BGB9l6DdcBW4BpAj4x3lVmVy0TXPEs2iHEisxejr62sZAAw6B1EVA==}
+    hasBin: true
+
+  sharp@0.34.5:
+    resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  side-channel-list@1.0.1:
+    resolution: {integrity: sha512-mjn/0bi/oUURjc5Xl7IaWi/OJJJumuoJFQJfDDyO46+hBWsfaVM65TBHq2eoZBhzl9EchxOijpkbRC8SVBQU0w==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-map@1.0.1:
+    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-weakmap@1.0.2:
+    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
+    engines: {node: '>= 0.4'}
+
+  side-channel@1.1.1:
+    resolution: {integrity: sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==}
+    engines: {node: '>= 0.4'}
+
+  signal-exit@3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
+
+  sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+
+  sonner@2.0.7:
+    resolution: {integrity: sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==}
+    peerDependencies:
+      react: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+      react-dom: ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-support@0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
+  stable-hash@0.0.5:
+    resolution: {integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==}
+
+  statuses@2.0.2:
+    resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
+    engines: {node: '>= 0.8'}
+
+  stdin-discarder@0.2.2:
+    resolution: {integrity: sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==}
+    engines: {node: '>=18'}
+
+  stop-iteration-iterator@1.1.0:
+    resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
+    engines: {node: '>= 0.4'}
+
+  strict-event-emitter@0.5.1:
+    resolution: {integrity: sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==}
+
+  string-ts@2.3.1:
+    resolution: {integrity: sha512-xSJq+BS52SaFFAVxuStmx6n5aYZU571uYUnUrPXkPFCfdHyZMMlbP2v2Wx5sNBnAVzq/2+0+mcBLBa3Xa5ubYw==}
+
+  string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+
+  string-width@7.2.0:
+    resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
+    engines: {node: '>=18'}
+
+  string.prototype.includes@2.0.1:
+    resolution: {integrity: sha512-o7+c9bW6zpAdJHTtujeePODAhkuicdAryFsfVKwA+wGw89wJ4GTY484WTucM9hLtDEOpOvI+aHnzqnC5lHp4Rg==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.matchall@4.0.12:
+    resolution: {integrity: sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.repeat@1.0.0:
+    resolution: {integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==}
+
+  string.prototype.trim@1.2.11:
+    resolution: {integrity: sha512-PwvK7BU+CMTJGYQCTZb5RWXIML92lftJLhQz1tBzgKiqGxJaMlBAa48POXaNAC2s4y8jr3EFqrkF9+44neS46w==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimend@1.0.10:
+    resolution: {integrity: sha512-2+3aDAOmPTmuFwjDnmJG2ctEkQKVki7vOSqaxkv42Mowj1V6PnvuwFCRrR5lChUux1TBskPjfkeTOhqczDMxTw==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+
+  stringify-object@5.0.0:
+    resolution: {integrity: sha512-zaJYxz2FtcMb4f+g60KsRNFOpVMUyuJgA51Zi5Z1DOTC3S59+OQiVOzE9GZt0x72uBGWKsQIuBKeF9iusmKFsg==}
+    engines: {node: '>=14.16'}
+
+  strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+
+  strip-ansi@7.2.0:
+    resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==}
+    engines: {node: '>=12'}
+
+  strip-bom@3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
+
+  strip-final-newline@2.0.0:
+    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
+    engines: {node: '>=6'}
+
+  strip-final-newline@4.0.0:
+    resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
+    engines: {node: '>=18'}
+
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  strnum@2.4.0:
+    resolution: {integrity: sha512-sHrVyWWdq28RbhjuJdZsA1SnGRJV6NiXbk6AXBxDOsgAcA+lmpUZCYjOdLBxkXMwis6RRe7dlZt4VlIWFVzkmg==}
+
+  styled-jsx@5.1.6:
+    resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==}
+    engines: {node: '>= 12.0.0'}
+    peerDependencies:
+      '@babel/core': '*'
+      babel-plugin-macros: '*'
+      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      babel-plugin-macros:
+        optional: true
+
+  supports-color@10.2.2:
+    resolution: {integrity: sha512-SS+jx45GF1QjgEXQx4NJZV9ImqmO2NPz5FNsIHrsDjh2YsHnawpan7SNQ1o8NuhrbHZy9AZhIoCUiCeaW/C80g==}
+    engines: {node: '>=18'}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
+  tagged-tag@1.0.0:
+    resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}
+    engines: {node: '>=20'}
+
+  tailwind-merge@3.6.0:
+    resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==}
+
+  tailwindcss@4.3.1:
+    resolution: {integrity: sha512-hk+TB1m+K8CYNrP6rjQaq/Y+4Zylwpa87mLYBKCunwnnQ9p+fHb7kmSfGqyEJoxF/O6CDyABWVFEafNSYKll+Q==}
+
+  tapable@2.3.3:
+    resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==}
+    engines: {node: '>=6'}
+
+  terser@5.16.9:
+    resolution: {integrity: sha512-HPa/FdTB9XGI2H1/keLFZHxl6WNvAI4YalHGtDQTlMnJcoqSab1UwL4l1hGEhs6/GmLHBZIg/YgB++jcbzoOEg==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  tiny-invariant@1.3.3:
+    resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
+
+  tinyexec@1.2.4:
+    resolution: {integrity: sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==}
+    engines: {node: '>=18'}
+
+  tinyglobby@0.2.17:
+    resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==}
+    engines: {node: '>=12.0.0'}
+
+  tldts-core@7.4.2:
+    resolution: {integrity: sha512-nwEyF4vl4RSJjwSjBUmOSxc3BFPoIFdlRthJ6e+5v9P3bHNsoD06UjuqMUspqp7vsEZ1beaHi1km+optiE17yA==}
+
+  tldts@7.4.2:
+    resolution: {integrity: sha512-kCwffuaH8ntKtygnWe1b4BJKWiCUH30n5KfoTr6IchcXOwR7chAOFJxFrH3vjANafUYrIA4a7SDL+nn7SiR4Sw==}
+    hasBin: true
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  toidentifier@1.0.1:
+    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
+    engines: {node: '>=0.6'}
+
+  tough-cookie@6.0.1:
+    resolution: {integrity: sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==}
+    engines: {node: '>=16'}
+
+  tr46@0.0.3:
+    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+
+  ts-api-utils@2.5.0:
+    resolution: {integrity: sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==}
+    engines: {node: '>=18.12'}
+    peerDependencies:
+      typescript: '>=4.8.4'
+
+  ts-declaration-location@1.0.7:
+    resolution: {integrity: sha512-EDyGAwH1gO0Ausm9gV6T2nUvBgXT5kGoCMJPllOaooZ+4VvJiKBdZE7wK18N1deEowhcUptS+5GXZK8U/fvpwA==}
+    peerDependencies:
+      typescript: '>=4.0.0'
+
+  ts-morph@26.0.0:
+    resolution: {integrity: sha512-ztMO++owQnz8c/gIENcM9XfCEzgoGphTv+nKpYNM1bgsdOVC/jRZuEBf6N+mLLDNg68Kl+GgUZfOySaRiG1/Ug==}
+
+  ts-pattern@5.9.0:
+    resolution: {integrity: sha512-6s5V71mX8qBUmlgbrfL33xDUwO0fq48rxAu2LBE11WBeGdpCPOsXksQbZJHvHwhrd3QjUusd3mAOM5Gg0mFBLg==}
+
+  ts-tqdm@0.8.6:
+    resolution: {integrity: sha512-3X3M1PZcHtgQbnwizL+xU8CAgbYbeLHrrDwL9xxcZZrV5J+e7loJm1XrXozHjSkl44J0Zg0SgA8rXbh83kCkcQ==}
+
+  tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+
+  tsconfig-paths@4.2.0:
+    resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
+    engines: {node: '>=6'}
+
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+
+  tw-animate-css@1.4.0:
+    resolution: {integrity: sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==}
+
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
+  type-fest@5.7.0:
+    resolution: {integrity: sha512-1URUxUqfHFM1c+zfSPsa3gnkO7Aq21qyH75SIduNYz4SzY964rn1X2vCMQaHSHhktiw+0kPa2iyb6PUpXqB6Vg==}
+    engines: {node: '>=20'}
+
+  type-is@2.1.0:
+    resolution: {integrity: sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==}
+    engines: {node: '>= 18'}
+
+  typed-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-length@1.0.3:
+    resolution: {integrity: sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-offset@1.0.4:
+    resolution: {integrity: sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-length@1.0.8:
+    resolution: {integrity: sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g==}
+    engines: {node: '>= 0.4'}
+
+  typescript-eslint@8.61.0:
+    resolution: {integrity: sha512-8y31Rd0eGTrDKqhy6vT0HtzhN+YLjQizwX3aA3hPXP/ynSfnrBXcQY5IzsP9/DM7+klX4IUncZZjkchP0z+rUw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+      typescript: '>=4.8.4 <6.1.0'
+
+  typescript@5.9.3:
+    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  unbox-primitive@1.1.0:
+    resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
+    engines: {node: '>= 0.4'}
+
+  undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+
+  undici-types@7.24.6:
+    resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==}
+
+  undici@7.16.0:
+    resolution: {integrity: sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==}
+    engines: {node: '>=20.18.1'}
+
+  undici@7.24.8:
+    resolution: {integrity: sha512-6KQ/+QxK49Z/p3HO6E5ZCZWNnCasyZLa5ExaVYyvPxUwKtbCPMKELJOqh7EqOle0t9cH/7d2TaaTRRa6Nhs4YQ==}
+    engines: {node: '>=20.18.1'}
+
+  unenv@2.0.0-rc.24:
+    resolution: {integrity: sha512-i7qRCmY42zmCwnYlh9H2SvLEypEFGye5iRmEMKjcGi7zk9UquigRjFtTLz0TYqr0ZGLZhaMHl/foy1bZR+Cwlw==}
+
+  unicorn-magic@0.3.0:
+    resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==}
+    engines: {node: '>=18'}
+
+  universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
+
+  unpipe@1.0.0:
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
+    engines: {node: '>= 0.8'}
+
+  unrs-resolver@1.12.2:
+    resolution: {integrity: sha512-dmlRxBJJayXjqTwC+JtF1HhJmgf3ftQ3YejFcZrf4+KKtJv0qDsK1pjqaaVjG7wJ5NJ6UVP1OqRMQ71Z4C3rxQ==}
+
+  until-async@3.0.2:
+    resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==}
+
+  update-browserslist-db@1.2.3:
+    resolution: {integrity: sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
+  urlpattern-polyfill@10.1.0:
+    resolution: {integrity: sha512-IGjKp/o0NL3Bso1PymYURCJxMPNAf/ILOpendP9f5B6e1rTJgdgiOvgfoT8VxCAdY+Wisb9uhGaJJf3yZ2V9nw==}
+
+  use-sync-external-store@1.6.0:
+    resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  validate-npm-package-name@7.0.2:
+    resolution: {integrity: sha512-hVDIBwsRruT73PbK7uP5ebUt+ezEtCmzZz3F59BSr2F6OVFnJ/6h8liuvdLrQ88Xmnk6/+xGGuq+pG9WwTuy3A==}
+    engines: {node: ^20.17.0 || >=22.9.0}
+
+  vary@1.1.2:
+    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
+    engines: {node: '>= 0.8'}
+
+  web-streams-polyfill@3.3.3:
+    resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
+    engines: {node: '>= 8'}
+
+  web-streams-polyfill@4.0.0-beta.3:
+    resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}
+    engines: {node: '>= 14'}
+
+  webidl-conversions@3.0.1:
+    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+
+  whatwg-url@5.0.0:
+    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
+
+  which-boxed-primitive@1.1.1:
+    resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
+    engines: {node: '>= 0.4'}
+
+  which-builtin-type@1.2.1:
+    resolution: {integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==}
+    engines: {node: '>= 0.4'}
+
+  which-collection@1.0.2:
+    resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
+    engines: {node: '>= 0.4'}
+
+  which-typed-array@1.1.22:
+    resolution: {integrity: sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==}
+    engines: {node: '>= 0.4'}
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  which@4.0.0:
+    resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==}
+    engines: {node: ^16.13.0 || >=18.0.0}
+    hasBin: true
+
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
+  workerd@1.20260611.1:
+    resolution: {integrity: sha512-CS/640T7pIJ2HYX6x2DwKFGbcSckAWN3tgcdq+ptB6SaqjWUhlzIgA/YhPuwIU+/NnMnGpqOFX/hC18Oyge63w==}
+    engines: {node: '>=16'}
+    hasBin: true
+
+  wrangler@4.100.0:
+    resolution: {integrity: sha512-dSQO7DO+mD6XDzkVWIWBoGLO3yw+lacWSc/KhFvd7pgfpth+kX98qb5SGRHZN8ACCDhhfwzDLXwB6qHsIHhfBg==}
+    engines: {node: '>=22.0.0'}
+    hasBin: true
+    peerDependencies:
+      '@cloudflare/workers-types': ^4.20260611.1
+    peerDependenciesMeta:
+      '@cloudflare/workers-types':
+        optional: true
+
+  wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+
+  wrap-ansi@9.0.2:
+    resolution: {integrity: sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==}
+    engines: {node: '>=18'}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  ws@8.20.1:
+    resolution: {integrity: sha512-It4dO0K5v//JtTXuPkfEOaI3uUN87iYPnqo/ZzqCoG3g8uhA66QUMs/SrM0YK7/NAu+r4LMh/9dq2A7k+rHs+w==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  wsl-utils@0.3.1:
+    resolution: {integrity: sha512-g/eziiSUNBSsdDJtCLB8bdYEUMj4jR7AGeUo96p/3dTafgjHhpF4RiCFPiRILwjQoDXx5MqkBr4fwWtR3Ky4Wg==}
+    engines: {node: '>=20'}
+
+  xml-naming@0.1.0:
+    resolution: {integrity: sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==}
+    engines: {node: '>=16.0.0'}
+
+  y18n@5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
+
+  yallist@3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+
+  yaml@2.9.0:
+    resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}
+    engines: {node: '>= 14.6'}
+    hasBin: true
+
+  yargs-parser@21.1.1:
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
+
+  yargs-parser@22.0.0:
+    resolution: {integrity: sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=23}
+
+  yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
+
+  yargs@18.0.0:
+    resolution: {integrity: sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=23}
+
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
+  yocto-spinner@1.2.0:
+    resolution: {integrity: sha512-Yw0hUB6UA3o4YUgKy3oSe9a4cxoaZ9sBfYDw+JSxo6Id0KoJGoxzPA24qqUXYKBWABs/zDSGTz9kww7t3F0XGw==}
+    engines: {node: '>=18.19'}
+
+  yoctocolors@2.1.2:
+    resolution: {integrity: sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==}
+    engines: {node: '>=18'}
+
+  youch-core@0.3.3:
+    resolution: {integrity: sha512-ho7XuGjLaJ2hWHoK8yFnsUGy2Y5uDpqSTq1FkHLK4/oqKtyUU1AFbOOxY4IpC9f0fTLjwYbslUz0Po5BpD1wrA==}
+
+  youch@4.1.0-beta.10:
+    resolution: {integrity: sha512-rLfVLB4FgQneDr0dv1oddCVZmKjcJ6yX6mS4pU82Mq/Dt9a3cLZQ62pDBL4AUO+uVrCvtWz3ZFUL2HFAFJ/BXQ==}
+
+  zod-to-json-schema@3.25.2:
+    resolution: {integrity: sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==}
+    peerDependencies:
+      zod: ^3.25.28 || ^4
+
+  zod-validation-error@4.0.2:
+    resolution: {integrity: sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      zod: ^3.25.0 || ^4.0.0
+
+  zod@3.25.76:
+    resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
+
+  zod@4.4.3:
+    resolution: {integrity: sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==}
+
+snapshots:
+
+  '@alloc/quick-lru@5.2.0': {}
+
+  '@antfu/ni@25.0.0':
+    dependencies:
+      ansis: 4.3.1
+      fzf: 0.5.2
+      package-manager-detector: 1.6.0
+      tinyexec: 1.2.4
+
+  '@ast-grep/napi-darwin-arm64@0.40.5':
+    optional: true
+
+  '@ast-grep/napi-darwin-x64@0.40.5':
+    optional: true
+
+  '@ast-grep/napi-linux-arm64-gnu@0.40.5':
+    optional: true
+
+  '@ast-grep/napi-linux-arm64-musl@0.40.5':
+    optional: true
+
+  '@ast-grep/napi-linux-x64-gnu@0.40.5':
+    optional: true
+
+  '@ast-grep/napi-linux-x64-musl@0.40.5':
+    optional: true
+
+  '@ast-grep/napi-win32-arm64-msvc@0.40.5':
+    optional: true
+
+  '@ast-grep/napi-win32-ia32-msvc@0.40.5':
+    optional: true
+
+  '@ast-grep/napi-win32-x64-msvc@0.40.5':
+    optional: true
+
+  '@ast-grep/napi@0.40.5':
+    optionalDependencies:
+      '@ast-grep/napi-darwin-arm64': 0.40.5
+      '@ast-grep/napi-darwin-x64': 0.40.5
+      '@ast-grep/napi-linux-arm64-gnu': 0.40.5
+      '@ast-grep/napi-linux-arm64-musl': 0.40.5
+      '@ast-grep/napi-linux-x64-gnu': 0.40.5
+      '@ast-grep/napi-linux-x64-musl': 0.40.5
+      '@ast-grep/napi-win32-arm64-msvc': 0.40.5
+      '@ast-grep/napi-win32-ia32-msvc': 0.40.5
+      '@ast-grep/napi-win32-x64-msvc': 0.40.5
+
+  '@aws-crypto/crc32@5.2.0':
+    dependencies:
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.973.12
+      tslib: 2.8.1
+
+  '@aws-crypto/crc32c@5.2.0':
+    dependencies:
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.973.12
+      tslib: 2.8.1
+
+  '@aws-crypto/sha1-browser@5.2.0':
+    dependencies:
+      '@aws-crypto/supports-web-crypto': 5.2.0
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.973.12
+      '@aws-sdk/util-locate-window': 3.965.7
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.8.1
+
+  '@aws-crypto/sha256-browser@5.2.0':
+    dependencies:
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-crypto/supports-web-crypto': 5.2.0
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.973.12
+      '@aws-sdk/util-locate-window': 3.965.7
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.8.1
+
+  '@aws-crypto/sha256-js@5.2.0':
+    dependencies:
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.973.12
+      tslib: 2.8.1
+
+  '@aws-crypto/supports-web-crypto@5.2.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@aws-crypto/util@5.2.0':
+    dependencies:
+      '@aws-sdk/types': 3.973.12
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.8.1
+
+  '@aws-sdk/checksums@3.1000.5':
+    dependencies:
+      '@aws-crypto/crc32': 5.2.0
+      '@aws-crypto/crc32c': 5.2.0
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/client-cloudfront@3.984.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/credential-provider-node': 3.972.55
+      '@aws-sdk/middleware-host-header': 3.972.21
+      '@aws-sdk/middleware-logger': 3.972.20
+      '@aws-sdk/middleware-recursion-detection': 3.972.22
+      '@aws-sdk/middleware-user-agent': 3.972.50
+      '@aws-sdk/region-config-resolver': 3.972.24
+      '@aws-sdk/types': 3.973.12
+      '@aws-sdk/util-endpoints': 3.984.0
+      '@aws-sdk/util-user-agent-browser': 3.972.21
+      '@aws-sdk/util-user-agent-node': 3.973.36
+      '@smithy/config-resolver': 4.5.7
+      '@smithy/core': 3.24.7
+      '@smithy/fetch-http-handler': 5.4.7
+      '@smithy/hash-node': 4.3.7
+      '@smithy/invalid-dependency': 4.3.7
+      '@smithy/middleware-content-length': 4.3.7
+      '@smithy/middleware-endpoint': 4.5.7
+      '@smithy/middleware-retry': 4.6.7
+      '@smithy/middleware-serde': 4.3.7
+      '@smithy/middleware-stack': 4.3.7
+      '@smithy/node-config-provider': 4.4.7
+      '@smithy/node-http-handler': 4.7.8
+      '@smithy/protocol-http': 5.4.7
+      '@smithy/smithy-client': 4.13.7
+      '@smithy/types': 4.14.4
+      '@smithy/url-parser': 4.3.7
+      '@smithy/util-base64': 4.4.7
+      '@smithy/util-body-length-browser': 4.3.7
+      '@smithy/util-body-length-node': 4.3.7
+      '@smithy/util-defaults-mode-browser': 4.4.7
+      '@smithy/util-defaults-mode-node': 4.3.7
+      '@smithy/util-endpoints': 3.5.7
+      '@smithy/util-middleware': 4.3.7
+      '@smithy/util-retry': 4.4.7
+      '@smithy/util-stream': 4.6.7
+      '@smithy/util-utf8': 4.3.7
+      '@smithy/util-waiter': 4.4.7
+      tslib: 2.8.1
+
+  '@aws-sdk/client-dynamodb@3.984.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/credential-provider-node': 3.972.55
+      '@aws-sdk/dynamodb-codec': 3.973.20
+      '@aws-sdk/middleware-endpoint-discovery': 3.972.18
+      '@aws-sdk/middleware-host-header': 3.972.21
+      '@aws-sdk/middleware-logger': 3.972.20
+      '@aws-sdk/middleware-recursion-detection': 3.972.22
+      '@aws-sdk/middleware-user-agent': 3.972.50
+      '@aws-sdk/region-config-resolver': 3.972.24
+      '@aws-sdk/types': 3.973.12
+      '@aws-sdk/util-endpoints': 3.984.0
+      '@aws-sdk/util-user-agent-browser': 3.972.21
+      '@aws-sdk/util-user-agent-node': 3.973.36
+      '@smithy/config-resolver': 4.5.7
+      '@smithy/core': 3.24.7
+      '@smithy/fetch-http-handler': 5.4.7
+      '@smithy/hash-node': 4.3.7
+      '@smithy/invalid-dependency': 4.3.7
+      '@smithy/middleware-content-length': 4.3.7
+      '@smithy/middleware-endpoint': 4.5.7
+      '@smithy/middleware-retry': 4.6.7
+      '@smithy/middleware-serde': 4.3.7
+      '@smithy/middleware-stack': 4.3.7
+      '@smithy/node-config-provider': 4.4.7
+      '@smithy/node-http-handler': 4.7.8
+      '@smithy/protocol-http': 5.4.7
+      '@smithy/smithy-client': 4.13.7
+      '@smithy/types': 4.14.4
+      '@smithy/url-parser': 4.3.7
+      '@smithy/util-base64': 4.4.7
+      '@smithy/util-body-length-browser': 4.3.7
+      '@smithy/util-body-length-node': 4.3.7
+      '@smithy/util-defaults-mode-browser': 4.4.7
+      '@smithy/util-defaults-mode-node': 4.3.7
+      '@smithy/util-endpoints': 3.5.7
+      '@smithy/util-middleware': 4.3.7
+      '@smithy/util-retry': 4.4.7
+      '@smithy/util-utf8': 4.3.7
+      '@smithy/util-waiter': 4.4.7
+      tslib: 2.8.1
+
+  '@aws-sdk/client-lambda@3.984.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/credential-provider-node': 3.972.55
+      '@aws-sdk/middleware-host-header': 3.972.21
+      '@aws-sdk/middleware-logger': 3.972.20
+      '@aws-sdk/middleware-recursion-detection': 3.972.22
+      '@aws-sdk/middleware-user-agent': 3.972.50
+      '@aws-sdk/region-config-resolver': 3.972.24
+      '@aws-sdk/types': 3.973.12
+      '@aws-sdk/util-endpoints': 3.984.0
+      '@aws-sdk/util-user-agent-browser': 3.972.21
+      '@aws-sdk/util-user-agent-node': 3.973.36
+      '@smithy/config-resolver': 4.5.7
+      '@smithy/core': 3.24.7
+      '@smithy/eventstream-serde-browser': 4.3.7
+      '@smithy/eventstream-serde-config-resolver': 4.4.7
+      '@smithy/eventstream-serde-node': 4.3.7
+      '@smithy/fetch-http-handler': 5.4.7
+      '@smithy/hash-node': 4.3.7
+      '@smithy/invalid-dependency': 4.3.7
+      '@smithy/middleware-content-length': 4.3.7
+      '@smithy/middleware-endpoint': 4.5.7
+      '@smithy/middleware-retry': 4.6.7
+      '@smithy/middleware-serde': 4.3.7
+      '@smithy/middleware-stack': 4.3.7
+      '@smithy/node-config-provider': 4.4.7
+      '@smithy/node-http-handler': 4.7.8
+      '@smithy/protocol-http': 5.4.7
+      '@smithy/smithy-client': 4.13.7
+      '@smithy/types': 4.14.4
+      '@smithy/url-parser': 4.3.7
+      '@smithy/util-base64': 4.4.7
+      '@smithy/util-body-length-browser': 4.3.7
+      '@smithy/util-body-length-node': 4.3.7
+      '@smithy/util-defaults-mode-browser': 4.4.7
+      '@smithy/util-defaults-mode-node': 4.3.7
+      '@smithy/util-endpoints': 3.5.7
+      '@smithy/util-middleware': 4.3.7
+      '@smithy/util-retry': 4.4.7
+      '@smithy/util-stream': 4.6.7
+      '@smithy/util-utf8': 4.3.7
+      '@smithy/util-waiter': 4.4.7
+      tslib: 2.8.1
+
+  '@aws-sdk/client-s3@3.984.0':
+    dependencies:
+      '@aws-crypto/sha1-browser': 5.2.0
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/credential-provider-node': 3.972.55
+      '@aws-sdk/middleware-bucket-endpoint': 3.972.24
+      '@aws-sdk/middleware-expect-continue': 3.972.20
+      '@aws-sdk/middleware-flexible-checksums': 3.974.30
+      '@aws-sdk/middleware-host-header': 3.972.21
+      '@aws-sdk/middleware-location-constraint': 3.972.17
+      '@aws-sdk/middleware-logger': 3.972.20
+      '@aws-sdk/middleware-recursion-detection': 3.972.22
+      '@aws-sdk/middleware-sdk-s3': 3.972.51
+      '@aws-sdk/middleware-ssec': 3.972.17
+      '@aws-sdk/middleware-user-agent': 3.972.50
+      '@aws-sdk/region-config-resolver': 3.972.24
+      '@aws-sdk/signature-v4-multi-region': 3.984.0
+      '@aws-sdk/types': 3.973.12
+      '@aws-sdk/util-endpoints': 3.984.0
+      '@aws-sdk/util-user-agent-browser': 3.972.21
+      '@aws-sdk/util-user-agent-node': 3.973.36
+      '@smithy/config-resolver': 4.5.7
+      '@smithy/core': 3.24.7
+      '@smithy/eventstream-serde-browser': 4.3.7
+      '@smithy/eventstream-serde-config-resolver': 4.4.7
+      '@smithy/eventstream-serde-node': 4.3.7
+      '@smithy/fetch-http-handler': 5.4.7
+      '@smithy/hash-blob-browser': 4.3.7
+      '@smithy/hash-node': 4.3.7
+      '@smithy/hash-stream-node': 4.3.7
+      '@smithy/invalid-dependency': 4.3.7
+      '@smithy/md5-js': 4.3.7
+      '@smithy/middleware-content-length': 4.3.7
+      '@smithy/middleware-endpoint': 4.5.7
+      '@smithy/middleware-retry': 4.6.7
+      '@smithy/middleware-serde': 4.3.7
+      '@smithy/middleware-stack': 4.3.7
+      '@smithy/node-config-provider': 4.4.7
+      '@smithy/node-http-handler': 4.7.8
+      '@smithy/protocol-http': 5.4.7
+      '@smithy/smithy-client': 4.13.7
+      '@smithy/types': 4.14.4
+      '@smithy/url-parser': 4.3.7
+      '@smithy/util-base64': 4.4.7
+      '@smithy/util-body-length-browser': 4.3.7
+      '@smithy/util-body-length-node': 4.3.7
+      '@smithy/util-defaults-mode-browser': 4.4.7
+      '@smithy/util-defaults-mode-node': 4.3.7
+      '@smithy/util-endpoints': 3.5.7
+      '@smithy/util-middleware': 4.3.7
+      '@smithy/util-retry': 4.4.7
+      '@smithy/util-stream': 4.6.7
+      '@smithy/util-utf8': 4.3.7
+      '@smithy/util-waiter': 4.4.7
+      tslib: 2.8.1
+
+  '@aws-sdk/client-sqs@3.984.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/credential-provider-node': 3.972.55
+      '@aws-sdk/middleware-host-header': 3.972.21
+      '@aws-sdk/middleware-logger': 3.972.20
+      '@aws-sdk/middleware-recursion-detection': 3.972.22
+      '@aws-sdk/middleware-sdk-sqs': 3.972.30
+      '@aws-sdk/middleware-user-agent': 3.972.50
+      '@aws-sdk/region-config-resolver': 3.972.24
+      '@aws-sdk/types': 3.973.12
+      '@aws-sdk/util-endpoints': 3.984.0
+      '@aws-sdk/util-user-agent-browser': 3.972.21
+      '@aws-sdk/util-user-agent-node': 3.973.36
+      '@smithy/config-resolver': 4.5.7
+      '@smithy/core': 3.24.7
+      '@smithy/fetch-http-handler': 5.4.7
+      '@smithy/hash-node': 4.3.7
+      '@smithy/invalid-dependency': 4.3.7
+      '@smithy/md5-js': 4.3.7
+      '@smithy/middleware-content-length': 4.3.7
+      '@smithy/middleware-endpoint': 4.5.7
+      '@smithy/middleware-retry': 4.6.7
+      '@smithy/middleware-serde': 4.3.7
+      '@smithy/middleware-stack': 4.3.7
+      '@smithy/node-config-provider': 4.4.7
+      '@smithy/node-http-handler': 4.7.8
+      '@smithy/protocol-http': 5.4.7
+      '@smithy/smithy-client': 4.13.7
+      '@smithy/types': 4.14.4
+      '@smithy/url-parser': 4.3.7
+      '@smithy/util-base64': 4.4.7
+      '@smithy/util-body-length-browser': 4.3.7
+      '@smithy/util-body-length-node': 4.3.7
+      '@smithy/util-defaults-mode-browser': 4.4.7
+      '@smithy/util-defaults-mode-node': 4.3.7
+      '@smithy/util-endpoints': 3.5.7
+      '@smithy/util-middleware': 4.3.7
+      '@smithy/util-retry': 4.4.7
+      '@smithy/util-utf8': 4.3.7
+      tslib: 2.8.1
+
+  '@aws-sdk/core@3.974.20':
+    dependencies:
+      '@aws-sdk/types': 3.973.12
+      '@aws-sdk/xml-builder': 3.972.29
+      '@aws/lambda-invoke-store': 0.2.4
+      '@smithy/core': 3.24.7
+      '@smithy/signature-v4': 5.4.7
+      '@smithy/types': 4.14.4
+      bowser: 2.14.1
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-env@3.972.46':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-http@3.972.48':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/fetch-http-handler': 5.4.7
+      '@smithy/node-http-handler': 4.7.8
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-ini@3.972.53':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/credential-provider-env': 3.972.46
+      '@aws-sdk/credential-provider-http': 3.972.48
+      '@aws-sdk/credential-provider-login': 3.972.52
+      '@aws-sdk/credential-provider-process': 3.972.46
+      '@aws-sdk/credential-provider-sso': 3.972.52
+      '@aws-sdk/credential-provider-web-identity': 3.972.52
+      '@aws-sdk/nested-clients': 3.997.20
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/credential-provider-imds': 4.3.9
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-login@3.972.52':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/nested-clients': 3.997.20
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-node@3.972.55':
+    dependencies:
+      '@aws-sdk/credential-provider-env': 3.972.46
+      '@aws-sdk/credential-provider-http': 3.972.48
+      '@aws-sdk/credential-provider-ini': 3.972.53
+      '@aws-sdk/credential-provider-process': 3.972.46
+      '@aws-sdk/credential-provider-sso': 3.972.52
+      '@aws-sdk/credential-provider-web-identity': 3.972.52
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/credential-provider-imds': 4.3.9
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-process@3.972.46':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-sso@3.972.52':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/nested-clients': 3.997.20
+      '@aws-sdk/token-providers': 3.1066.0
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-web-identity@3.972.52':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/nested-clients': 3.997.20
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/dynamodb-codec@3.973.20':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/endpoint-cache@3.972.7':
+    dependencies:
+      mnemonist: 0.38.3
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-bucket-endpoint@3.972.24':
+    dependencies:
+      '@aws-sdk/middleware-sdk-s3': 3.972.51
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-endpoint-discovery@3.972.18':
+    dependencies:
+      '@aws-sdk/endpoint-cache': 3.972.7
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-expect-continue@3.972.20':
+    dependencies:
+      '@aws-sdk/middleware-sdk-s3': 3.972.51
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-flexible-checksums@3.974.30':
+    dependencies:
+      '@aws-sdk/checksums': 3.1000.5
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-host-header@3.972.21':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-location-constraint@3.972.17':
+    dependencies:
+      '@aws-sdk/middleware-sdk-s3': 3.972.51
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-logger@3.972.20':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-recursion-detection@3.972.22':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-sdk-s3@3.972.51':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/signature-v4-multi-region': 3.996.34
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-sdk-sqs@3.972.30':
+    dependencies:
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-ssec@3.972.17':
+    dependencies:
+      '@aws-sdk/middleware-sdk-s3': 3.972.51
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-user-agent@3.972.50':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      tslib: 2.8.1
+
+  '@aws-sdk/nested-clients@3.997.20':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/signature-v4-multi-region': 3.996.34
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/fetch-http-handler': 5.4.7
+      '@smithy/node-http-handler': 4.7.8
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/region-config-resolver@3.972.24':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      tslib: 2.8.1
+
+  '@aws-sdk/signature-v4-multi-region@3.984.0':
+    dependencies:
+      '@aws-sdk/middleware-sdk-s3': 3.972.51
+      '@aws-sdk/types': 3.973.12
+      '@smithy/protocol-http': 5.4.7
+      '@smithy/signature-v4': 5.4.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/signature-v4-multi-region@3.996.34':
+    dependencies:
+      '@aws-sdk/types': 3.973.12
+      '@smithy/signature-v4': 5.4.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/token-providers@3.1066.0':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      '@aws-sdk/nested-clients': 3.997.20
+      '@aws-sdk/types': 3.973.12
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/types@3.973.12':
+    dependencies:
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@aws-sdk/util-endpoints@3.984.0':
+    dependencies:
+      '@aws-sdk/types': 3.973.12
+      '@smithy/types': 4.14.4
+      '@smithy/url-parser': 4.3.7
+      '@smithy/util-endpoints': 3.5.7
+      tslib: 2.8.1
+
+  '@aws-sdk/util-locate-window@3.965.7':
+    dependencies:
+      tslib: 2.8.1
+
+  '@aws-sdk/util-user-agent-browser@3.972.21':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      tslib: 2.8.1
+
+  '@aws-sdk/util-user-agent-node@3.973.36':
+    dependencies:
+      '@aws-sdk/core': 3.974.20
+      tslib: 2.8.1
+
+  '@aws-sdk/xml-builder@3.972.29':
+    dependencies:
+      '@smithy/types': 4.14.4
+      fast-xml-parser: 5.7.3
+      tslib: 2.8.1
+
+  '@aws/lambda-invoke-store@0.2.4': {}
+
+  '@babel/code-frame@7.29.7':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.29.7
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
+  '@babel/compat-data@7.29.7': {}
+
+  '@babel/core@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-compilation-targets': 7.29.7
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helpers': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+      '@jridgewell/remapping': 2.3.5
+      convert-source-map: 2.0.0
+      debug: 4.4.3
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/generator@7.29.7':
+    dependencies:
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+      jsesc: 3.1.0
+
+  '@babel/helper-annotate-as-pure@7.29.7':
+    dependencies:
+      '@babel/types': 7.29.7
+
+  '@babel/helper-compilation-targets@7.29.7':
+    dependencies:
+      '@babel/compat-data': 7.29.7
+      '@babel/helper-validator-option': 7.29.7
+      browserslist: 4.28.2
+      lru-cache: 5.1.1
+      semver: 6.3.1
+
+  '@babel/helper-create-class-features-plugin@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-annotate-as-pure': 7.29.7
+      '@babel/helper-member-expression-to-functions': 7.29.7
+      '@babel/helper-optimise-call-expression': 7.29.7
+      '@babel/helper-replace-supers': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
+      '@babel/traverse': 7.29.7
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-globals@7.29.7': {}
+
+  '@babel/helper-member-expression-to-functions@7.29.7':
+    dependencies:
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-imports@7.29.7':
+    dependencies:
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-module-transforms@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-module-imports': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-optimise-call-expression@7.29.7':
+    dependencies:
+      '@babel/types': 7.29.7
+
+  '@babel/helper-plugin-utils@7.29.7': {}
+
+  '@babel/helper-replace-supers@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-member-expression-to-functions': 7.29.7
+      '@babel/helper-optimise-call-expression': 7.29.7
+      '@babel/traverse': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.29.7':
+    dependencies:
+      '@babel/traverse': 7.29.7
+      '@babel/types': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-string-parser@7.29.7': {}
+
+  '@babel/helper-validator-identifier@7.29.7': {}
+
+  '@babel/helper-validator-option@7.29.7': {}
+
+  '@babel/helpers@7.29.7':
+    dependencies:
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+
+  '@babel/parser@7.29.7':
+    dependencies:
+      '@babel/types': 7.29.7
+
+  '@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-modules-commonjs@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-module-transforms': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-typescript@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-annotate-as-pure': 7.29.7
+      '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7)
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-skip-transparent-expression-wrappers': 7.29.7
+      '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/preset-typescript@7.29.7(@babel/core@7.29.7)':
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/helper-plugin-utils': 7.29.7
+      '@babel/helper-validator-option': 7.29.7
+      '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-modules-commonjs': 7.29.7(@babel/core@7.29.7)
+      '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/runtime@7.29.7': {}
+
+  '@babel/template@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/types': 7.29.7
+
+  '@babel/traverse@7.29.7':
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      '@babel/generator': 7.29.7
+      '@babel/helper-globals': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/template': 7.29.7
+      '@babel/types': 7.29.7
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/types@7.29.7':
+    dependencies:
+      '@babel/helper-string-parser': 7.29.7
+      '@babel/helper-validator-identifier': 7.29.7
+
+  '@base-ui/react@1.5.0(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+    dependencies:
+      '@babel/runtime': 7.29.7
+      '@base-ui/utils': 0.2.9(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
+      use-sync-external-store: 1.6.0(react@19.2.7)
+    optionalDependencies:
+      '@types/react': 19.2.17
+
+  '@base-ui/utils@0.2.9(@types/react@19.2.17)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+    dependencies:
+      '@babel/runtime': 7.29.7
+      '@floating-ui/utils': 0.2.11
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
+      reselect: 5.2.0
+      use-sync-external-store: 1.6.0(react@19.2.7)
+    optionalDependencies:
+      '@types/react': 19.2.17
+
+  '@cloudflare/kv-asset-handler@0.5.0': {}
+
+  '@cloudflare/unenv-preset@2.16.1(unenv@2.0.0-rc.24)(workerd@1.20260611.1)':
+    dependencies:
+      unenv: 2.0.0-rc.24
+    optionalDependencies:
+      workerd: 1.20260611.1
+
+  '@cloudflare/workerd-darwin-64@1.20260611.1':
+    optional: true
+
+  '@cloudflare/workerd-darwin-arm64@1.20260611.1':
+    optional: true
+
+  '@cloudflare/workerd-linux-64@1.20260611.1':
+    optional: true
+
+  '@cloudflare/workerd-linux-arm64@1.20260611.1':
+    optional: true
+
+  '@cloudflare/workerd-windows-64@1.20260611.1':
+    optional: true
+
+  '@cspotcode/source-map-support@0.8.1':
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.9
+
+  '@dotenvx/dotenvx@1.31.0':
+    dependencies:
+      commander: 11.1.0
+      dotenv: 16.6.1
+      eciesjs: 0.4.18
+      execa: 5.1.1
+      fdir: 6.5.0(picomatch@4.0.4)
+      ignore: 5.3.2
+      object-treeify: 1.1.33
+      picomatch: 4.0.4
+      which: 4.0.0
+
+  '@dotenvx/dotenvx@1.71.3':
+    dependencies:
+      commander: 11.1.0
+      dotenv: 17.4.2
+      eciesjs: 0.4.18
+      enquirer: 2.4.1
+      execa: 5.1.1
+      fdir: 6.5.0(picomatch@4.0.4)
+      ignore: 5.3.2
+      object-treeify: 1.1.33
+      picomatch: 4.0.4
+      which: 4.0.0
+      yocto-spinner: 1.2.0
+
+  '@ecies/ciphers@0.2.6(@noble/ciphers@1.3.0)':
+    dependencies:
+      '@noble/ciphers': 1.3.0
+
+  '@emnapi/core@1.10.0':
+    dependencies:
+      '@emnapi/wasi-threads': 1.2.1
+      tslib: 2.8.1
+    optional: true
+
+  '@emnapi/runtime@1.10.0':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@emnapi/runtime@1.11.1':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@emnapi/wasi-threads@1.2.1':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@esbuild/aix-ppc64@0.25.4':
+    optional: true
+
+  '@esbuild/aix-ppc64@0.27.3':
+    optional: true
+
+  '@esbuild/android-arm64@0.25.4':
+    optional: true
+
+  '@esbuild/android-arm64@0.27.3':
+    optional: true
+
+  '@esbuild/android-arm@0.25.4':
+    optional: true
+
+  '@esbuild/android-arm@0.27.3':
+    optional: true
+
+  '@esbuild/android-x64@0.25.4':
+    optional: true
+
+  '@esbuild/android-x64@0.27.3':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.25.4':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.27.3':
+    optional: true
+
+  '@esbuild/darwin-x64@0.25.4':
+    optional: true
+
+  '@esbuild/darwin-x64@0.27.3':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.25.4':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.27.3':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.25.4':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.27.3':
+    optional: true
+
+  '@esbuild/linux-arm64@0.25.4':
+    optional: true
+
+  '@esbuild/linux-arm64@0.27.3':
+    optional: true
+
+  '@esbuild/linux-arm@0.25.4':
+    optional: true
+
+  '@esbuild/linux-arm@0.27.3':
+    optional: true
+
+  '@esbuild/linux-ia32@0.25.4':
+    optional: true
+
+  '@esbuild/linux-ia32@0.27.3':
+    optional: true
+
+  '@esbuild/linux-loong64@0.25.4':
+    optional: true
+
+  '@esbuild/linux-loong64@0.27.3':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.25.4':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.27.3':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.25.4':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.27.3':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.25.4':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.27.3':
+    optional: true
+
+  '@esbuild/linux-s390x@0.25.4':
+    optional: true
+
+  '@esbuild/linux-s390x@0.27.3':
+    optional: true
+
+  '@esbuild/linux-x64@0.25.4':
+    optional: true
+
+  '@esbuild/linux-x64@0.27.3':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.25.4':
+    optional: true
+
+  '@esbuild/netbsd-arm64@0.27.3':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.25.4':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.27.3':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.25.4':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.27.3':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.25.4':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.27.3':
+    optional: true
+
+  '@esbuild/openharmony-arm64@0.27.3':
+    optional: true
+
+  '@esbuild/sunos-x64@0.25.4':
+    optional: true
+
+  '@esbuild/sunos-x64@0.27.3':
+    optional: true
+
+  '@esbuild/win32-arm64@0.25.4':
+    optional: true
+
+  '@esbuild/win32-arm64@0.27.3':
+    optional: true
+
+  '@esbuild/win32-ia32@0.25.4':
+    optional: true
+
+  '@esbuild/win32-ia32@0.27.3':
+    optional: true
+
+  '@esbuild/win32-x64@0.25.4':
+    optional: true
+
+  '@esbuild/win32-x64@0.27.3':
+    optional: true
+
+  '@eslint-community/eslint-utils@4.9.1(eslint@9.39.4(jiti@2.7.0))':
+    dependencies:
+      eslint: 9.39.4(jiti@2.7.0)
+      eslint-visitor-keys: 3.4.3
+
+  '@eslint-community/regexpp@4.12.2': {}
+
+  '@eslint-react/ast@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-react/eff': 2.13.0
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/typescript-estree': 8.61.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      string-ts: 2.3.1
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint-react/core@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-react/ast': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/eff': 2.13.0
+      '@eslint-react/shared': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/var': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      ts-pattern: 5.9.0
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint-react/eff@2.13.0': {}
+
+  '@eslint-react/eslint-plugin@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-react/eff': 2.13.0
+      '@eslint-react/shared': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/type-utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      eslint-plugin-react-dom: 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint-plugin-react-hooks-extra: 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint-plugin-react-naming-convention: 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint-plugin-react-rsc: 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint-plugin-react-web-api: 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint-plugin-react-x: 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      ts-api-utils: 2.5.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint-react/shared@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-react/eff': 2.13.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      ts-pattern: 5.9.0
+      typescript: 5.9.3
+      zod: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint-react/var@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-react/ast': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/eff': 2.13.0
+      '@eslint-react/shared': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      ts-pattern: 5.9.0
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/config-array@0.21.2':
+    dependencies:
+      '@eslint/object-schema': 2.1.7
+      debug: 4.4.3
+      minimatch: 3.1.5
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/config-helpers@0.4.2':
+    dependencies:
+      '@eslint/core': 0.17.0
+
+  '@eslint/core@0.17.0':
+    dependencies:
+      '@types/json-schema': 7.0.15
+
+  '@eslint/eslintrc@3.3.5':
+    dependencies:
+      ajv: 6.15.0
+      debug: 4.4.3
+      espree: 10.4.0
+      globals: 14.0.0
+      ignore: 5.3.2
+      import-fresh: 3.3.1
+      js-yaml: 4.2.0
+      minimatch: 3.1.5
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/js@9.39.4': {}
+
+  '@eslint/object-schema@2.1.7': {}
+
+  '@eslint/plugin-kit@0.4.1':
+    dependencies:
+      '@eslint/core': 0.17.0
+      levn: 0.4.1
+
+  '@floating-ui/core@1.7.5':
+    dependencies:
+      '@floating-ui/utils': 0.2.11
+
+  '@floating-ui/dom@1.7.6':
+    dependencies:
+      '@floating-ui/core': 1.7.5
+      '@floating-ui/utils': 0.2.11
+
+  '@floating-ui/react-dom@2.1.8(react-dom@19.2.7(react@19.2.7))(react@19.2.7)':
+    dependencies:
+      '@floating-ui/dom': 1.7.6
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
+
+  '@floating-ui/utils@0.2.11': {}
+
+  '@hono/node-server@1.19.14(hono@4.12.25)':
+    dependencies:
+      hono: 4.12.25
+
+  '@humanfs/core@0.19.2':
+    dependencies:
+      '@humanfs/types': 0.15.0
+
+  '@humanfs/node@0.16.8':
+    dependencies:
+      '@humanfs/core': 0.19.2
+      '@humanfs/types': 0.15.0
+      '@humanwhocodes/retry': 0.4.3
+
+  '@humanfs/types@0.15.0': {}
+
+  '@humanwhocodes/module-importer@1.0.1': {}
+
+  '@humanwhocodes/retry@0.4.3': {}
+
+  '@img/colour@1.1.0': {}
+
+  '@img/sharp-darwin-arm64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.2.4
+    optional: true
+
+  '@img/sharp-darwin-x64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.2.4
+    optional: true
+
+  '@img/sharp-libvips-darwin-arm64@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-darwin-x64@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm64@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-ppc64@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-riscv64@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-s390x@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-x64@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-x64@1.2.4':
+    optional: true
+
+  '@img/sharp-linux-arm64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.2.4
+    optional: true
+
+  '@img/sharp-linux-arm@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.2.4
+    optional: true
+
+  '@img/sharp-linux-ppc64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-ppc64': 1.2.4
+    optional: true
+
+  '@img/sharp-linux-riscv64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-riscv64': 1.2.4
+    optional: true
+
+  '@img/sharp-linux-s390x@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.2.4
+    optional: true
+
+  '@img/sharp-linux-x64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.2.4
+    optional: true
+
+  '@img/sharp-linuxmusl-arm64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
+    optional: true
+
+  '@img/sharp-linuxmusl-x64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
+    optional: true
+
+  '@img/sharp-wasm32@0.34.5':
+    dependencies:
+      '@emnapi/runtime': 1.11.1
+    optional: true
+
+  '@img/sharp-win32-arm64@0.34.5':
+    optional: true
+
+  '@img/sharp-win32-ia32@0.34.5':
+    optional: true
+
+  '@img/sharp-win32-x64@0.34.5':
+    optional: true
+
+  '@inquirer/ansi@2.0.7': {}
+
+  '@inquirer/confirm@6.1.1(@types/node@25.9.3)':
+    dependencies:
+      '@inquirer/core': 11.2.1(@types/node@25.9.3)
+      '@inquirer/type': 4.0.7(@types/node@25.9.3)
+    optionalDependencies:
+      '@types/node': 25.9.3
+
+  '@inquirer/core@11.2.1(@types/node@25.9.3)':
+    dependencies:
+      '@inquirer/ansi': 2.0.7
+      '@inquirer/figures': 2.0.7
+      '@inquirer/type': 4.0.7(@types/node@25.9.3)
+      cli-width: 4.1.0
+      fast-wrap-ansi: 0.2.2
+      mute-stream: 3.0.0
+      signal-exit: 4.1.0
+    optionalDependencies:
+      '@types/node': 25.9.3
+
+  '@inquirer/figures@2.0.7': {}
+
+  '@inquirer/type@4.0.7(@types/node@25.9.3)':
+    optionalDependencies:
+      '@types/node': 25.9.3
+
+  '@isaacs/cliui@9.0.0': {}
+
+  '@jridgewell/gen-mapping@0.3.13':
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/remapping@2.3.5':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/source-map@0.3.11':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.13
+      '@jridgewell/trace-mapping': 0.3.31
+
+  '@jridgewell/sourcemap-codec@1.5.5': {}
+
+  '@jridgewell/trace-mapping@0.3.31':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  '@jridgewell/trace-mapping@0.3.9':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  '@modelcontextprotocol/sdk@1.24.3(zod@3.25.76)':
+    dependencies:
+      ajv: 8.20.0
+      ajv-formats: 3.0.1(ajv@8.20.0)
+      content-type: 1.0.5
+      cors: 2.8.6
+      cross-spawn: 7.0.6
+      eventsource: 3.0.7
+      eventsource-parser: 3.1.0
+      express: 5.2.1
+      express-rate-limit: 7.5.1(express@5.2.1)
+      jose: 6.2.3
+      pkce-challenge: 5.0.1
+      raw-body: 3.0.2
+      zod: 3.25.76
+      zod-to-json-schema: 3.25.2(zod@3.25.76)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@modelcontextprotocol/sdk@1.29.0(zod@3.25.76)':
+    dependencies:
+      '@hono/node-server': 1.19.14(hono@4.12.25)
+      ajv: 8.20.0
+      ajv-formats: 3.0.1(ajv@8.20.0)
+      content-type: 1.0.5
+      cors: 2.8.6
+      cross-spawn: 7.0.6
+      eventsource: 3.0.7
+      eventsource-parser: 3.1.0
+      express: 5.2.1
+      express-rate-limit: 8.5.2(express@5.2.1)
+      hono: 4.12.25
+      jose: 6.2.3
+      json-schema-typed: 8.0.2
+      pkce-challenge: 5.0.1
+      raw-body: 3.0.2
+      zod: 3.25.76
+      zod-to-json-schema: 3.25.2(zod@3.25.76)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@mswjs/interceptors@0.41.9':
+    dependencies:
+      '@open-draft/deferred-promise': 2.2.0
+      '@open-draft/logger': 0.3.0
+      '@open-draft/until': 2.1.0
+      is-node-process: 1.2.0
+      outvariant: 1.4.3
+      strict-event-emitter: 0.5.1
+
+  '@napi-rs/wasm-runtime@1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
+    dependencies:
+      '@emnapi/core': 1.10.0
+      '@emnapi/runtime': 1.10.0
+      '@tybys/wasm-util': 0.10.2
+    optional: true
+
+  '@next/env@16.2.9': {}
+
+  '@next/eslint-plugin-next@16.2.9':
+    dependencies:
+      fast-glob: 3.3.1
+
+  '@next/swc-darwin-arm64@16.2.9':
+    optional: true
+
+  '@next/swc-darwin-x64@16.2.9':
+    optional: true
+
+  '@next/swc-linux-arm64-gnu@16.2.9':
+    optional: true
+
+  '@next/swc-linux-arm64-musl@16.2.9':
+    optional: true
+
+  '@next/swc-linux-x64-gnu@16.2.9':
+    optional: true
+
+  '@next/swc-linux-x64-musl@16.2.9':
+    optional: true
+
+  '@next/swc-win32-arm64-msvc@16.2.9':
+    optional: true
+
+  '@next/swc-win32-x64-msvc@16.2.9':
+    optional: true
+
+  '@noble/ciphers@1.3.0': {}
+
+  '@noble/curves@1.9.7':
+    dependencies:
+      '@noble/hashes': 1.8.0
+
+  '@noble/hashes@1.8.0': {}
+
+  '@nodable/entities@2.2.0': {}
+
+  '@node-minify/core@8.0.6':
+    dependencies:
+      '@node-minify/utils': 8.0.6
+      glob: 9.3.5
+      mkdirp: 1.0.4
+
+  '@node-minify/terser@8.0.6':
+    dependencies:
+      '@node-minify/utils': 8.0.6
+      terser: 5.16.9
+
+  '@node-minify/utils@8.0.6':
+    dependencies:
+      gzip-size: 6.0.0
+
+  '@nodelib/fs.scandir@2.1.5':
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      run-parallel: 1.2.0
+
+  '@nodelib/fs.stat@2.0.5': {}
+
+  '@nodelib/fs.walk@1.2.8':
+    dependencies:
+      '@nodelib/fs.scandir': 2.1.5
+      fastq: 1.20.1
+
+  '@nolyfill/is-core-module@1.0.39': {}
+
+  '@open-draft/deferred-promise@2.2.0': {}
+
+  '@open-draft/deferred-promise@3.0.0': {}
+
+  '@open-draft/logger@0.3.0':
+    dependencies:
+      is-node-process: 1.2.0
+      outvariant: 1.4.3
+
+  '@open-draft/until@2.1.0': {}
+
+  '@opennextjs/aws@4.0.2(next@16.2.9(@babel/core@7.29.7)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))':
+    dependencies:
+      '@ast-grep/napi': 0.40.5
+      '@aws-sdk/client-cloudfront': 3.984.0
+      '@aws-sdk/client-dynamodb': 3.984.0
+      '@aws-sdk/client-lambda': 3.984.0
+      '@aws-sdk/client-s3': 3.984.0
+      '@aws-sdk/client-sqs': 3.984.0
+      '@node-minify/core': 8.0.6
+      '@node-minify/terser': 8.0.6
+      '@tsconfig/node18': 1.0.3
+      aws4fetch: 1.0.20
+      chalk: 5.6.2
+      cookie: 1.1.1
+      esbuild: 0.25.4
+      express: 5.2.1
+      next: 16.2.9(@babel/core@7.29.7)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      path-to-regexp: 6.3.0
+      urlpattern-polyfill: 10.1.0
+      yaml: 2.9.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opennextjs/cloudflare@1.19.11(next@16.2.9(@babel/core@7.29.7)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))(wrangler@4.100.0)':
+    dependencies:
+      '@ast-grep/napi': 0.40.5
+      '@dotenvx/dotenvx': 1.31.0
+      '@opennextjs/aws': 4.0.2(next@16.2.9(@babel/core@7.29.7)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7))
+      ci-info: 4.4.0
+      cloudflare: 4.5.0
+      comment-json: 4.6.2
+      enquirer: 2.4.1
+      glob: 12.0.0
+      next: 16.2.9(@babel/core@7.29.7)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      ts-tqdm: 0.8.6
+      wrangler: 4.100.0
+      yargs: 18.0.0
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@poppinss/colors@4.1.6':
+    dependencies:
+      kleur: 4.1.5
+
+  '@poppinss/dumper@0.6.5':
+    dependencies:
+      '@poppinss/colors': 4.1.6
+      '@sindresorhus/is': 7.2.0
+      supports-color: 10.2.2
+
+  '@poppinss/exception@1.2.3': {}
+
+  '@rtsao/scc@1.1.0': {}
+
+  '@sec-ant/readable-stream@0.4.1': {}
+
+  '@sindresorhus/is@7.2.0': {}
+
+  '@sindresorhus/merge-streams@4.0.0': {}
+
+  '@smithy/config-resolver@4.5.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/core@3.24.7':
+    dependencies:
+      '@aws-crypto/crc32': 5.2.0
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@smithy/credential-provider-imds@4.3.9':
+    dependencies:
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@smithy/eventstream-serde-browser@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/eventstream-serde-config-resolver@4.4.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/eventstream-serde-node@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/fetch-http-handler@5.4.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@smithy/hash-blob-browser@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/hash-node@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/hash-stream-node@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/invalid-dependency@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/is-array-buffer@2.2.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@smithy/md5-js@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/middleware-content-length@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/middleware-endpoint@4.5.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/middleware-retry@4.6.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/middleware-serde@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/middleware-stack@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/node-config-provider@4.4.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/node-http-handler@4.7.8':
+    dependencies:
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@smithy/protocol-http@5.4.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/signature-v4@5.4.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@smithy/smithy-client@4.13.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      '@smithy/types': 4.14.4
+      tslib: 2.8.1
+
+  '@smithy/types@4.14.4':
+    dependencies:
+      tslib: 2.8.1
+
+  '@smithy/url-parser@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-base64@4.4.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-body-length-browser@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-body-length-node@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-buffer-from@2.2.0':
+    dependencies:
+      '@smithy/is-array-buffer': 2.2.0
+      tslib: 2.8.1
+
+  '@smithy/util-defaults-mode-browser@4.4.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-defaults-mode-node@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-endpoints@3.5.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-middleware@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-retry@4.4.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-stream@4.6.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-utf8@2.3.0':
+    dependencies:
+      '@smithy/util-buffer-from': 2.2.0
+      tslib: 2.8.1
+
+  '@smithy/util-utf8@4.3.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@smithy/util-waiter@4.4.7':
+    dependencies:
+      '@smithy/core': 3.24.7
+      tslib: 2.8.1
+
+  '@speed-highlight/core@1.2.17': {}
+
+  '@swc/helpers@0.5.15':
+    dependencies:
+      tslib: 2.8.1
+
+  '@tailwindcss/node@4.3.1':
+    dependencies:
+      '@jridgewell/remapping': 2.3.5
+      enhanced-resolve: 5.21.6
+      jiti: 2.7.0
+      lightningcss: 1.32.0
+      magic-string: 0.30.21
+      source-map-js: 1.2.1
+      tailwindcss: 4.3.1
+
+  '@tailwindcss/oxide-android-arm64@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-arm64@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-darwin-x64@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-freebsd-x64@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-musl@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-wasm32-wasi@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.3.1':
+    optional: true
+
+  '@tailwindcss/oxide@4.3.1':
+    optionalDependencies:
+      '@tailwindcss/oxide-android-arm64': 4.3.1
+      '@tailwindcss/oxide-darwin-arm64': 4.3.1
+      '@tailwindcss/oxide-darwin-x64': 4.3.1
+      '@tailwindcss/oxide-freebsd-x64': 4.3.1
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.3.1
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.3.1
+      '@tailwindcss/oxide-linux-arm64-musl': 4.3.1
+      '@tailwindcss/oxide-linux-x64-gnu': 4.3.1
+      '@tailwindcss/oxide-linux-x64-musl': 4.3.1
+      '@tailwindcss/oxide-wasm32-wasi': 4.3.1
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.3.1
+      '@tailwindcss/oxide-win32-x64-msvc': 4.3.1
+
+  '@tailwindcss/postcss@4.3.1':
+    dependencies:
+      '@alloc/quick-lru': 5.2.0
+      '@tailwindcss/node': 4.3.1
+      '@tailwindcss/oxide': 4.3.1
+      postcss: 8.5.15
+      tailwindcss: 4.3.1
+
+  '@ts-morph/common@0.27.0':
+    dependencies:
+      fast-glob: 3.3.3
+      minimatch: 10.2.5
+      path-browserify: 1.0.1
+
+  '@tsconfig/node18@1.0.3': {}
+
+  '@tybys/wasm-util@0.10.2':
+    dependencies:
+      tslib: 2.8.1
+    optional: true
+
+  '@types/estree@1.0.9': {}
+
+  '@types/json-schema@7.0.15': {}
+
+  '@types/json5@0.0.29': {}
+
+  '@types/node-fetch@2.6.13':
+    dependencies:
+      '@types/node': 25.9.3
+      form-data: 4.0.6
+
+  '@types/node@18.19.130':
+    dependencies:
+      undici-types: 5.26.5
+
+  '@types/node@25.9.3':
+    dependencies:
+      undici-types: 7.24.6
+
+  '@types/react-dom@19.2.3(@types/react@19.2.17)':
+    dependencies:
+      '@types/react': 19.2.17
+
+  '@types/react@19.2.17':
+    dependencies:
+      csstype: 3.2.3
+
+  '@types/set-cookie-parser@2.4.10':
+    dependencies:
+      '@types/node': 25.9.3
+
+  '@types/statuses@2.0.6': {}
+
+  '@types/validate-npm-package-name@4.0.2': {}
+
+  '@typescript-eslint/eslint-plugin@8.61.0(@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3))(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-community/regexpp': 4.12.2
+      '@typescript-eslint/parser': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/type-utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.61.0
+      eslint: 9.39.4(jiti@2.7.0)
+      ignore: 7.0.5
+      natural-compare: 1.4.0
+      ts-api-utils: 2.5.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/typescript-estree': 8.61.0(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.61.0
+      debug: 4.4.3
+      eslint: 9.39.4(jiti@2.7.0)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/project-service@8.61.0(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.61.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.61.0
+      debug: 4.4.3
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/scope-manager@8.61.0':
+    dependencies:
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/visitor-keys': 8.61.0
+
+  '@typescript-eslint/tsconfig-utils@8.61.0(typescript@5.9.3)':
+    dependencies:
+      typescript: 5.9.3
+
+  '@typescript-eslint/type-utils@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/typescript-estree': 8.61.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      debug: 4.4.3
+      eslint: 9.39.4(jiti@2.7.0)
+      ts-api-utils: 2.5.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/types@8.61.0': {}
+
+  '@typescript-eslint/typescript-estree@8.61.0(typescript@5.9.3)':
+    dependencies:
+      '@typescript-eslint/project-service': 8.61.0(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.61.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/visitor-keys': 8.61.0
+      debug: 4.4.3
+      minimatch: 10.2.5
+      semver: 7.8.4
+      tinyglobby: 0.2.17
+      ts-api-utils: 2.5.0(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/utils@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)':
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4(jiti@2.7.0))
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/typescript-estree': 8.61.0(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/visitor-keys@8.61.0':
+    dependencies:
+      '@typescript-eslint/types': 8.61.0
+      eslint-visitor-keys: 5.0.1
+
+  '@unrs/resolver-binding-android-arm-eabi@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-android-arm64@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-darwin-arm64@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-darwin-x64@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-freebsd-x64@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-arm-gnueabihf@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-arm-musleabihf@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-arm64-gnu@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-arm64-musl@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-loong64-gnu@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-loong64-musl@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-ppc64-gnu@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-riscv64-gnu@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-riscv64-musl@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-s390x-gnu@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-x64-gnu@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-linux-x64-musl@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-openharmony-arm64@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-wasm32-wasi@1.12.2':
+    dependencies:
+      '@emnapi/core': 1.10.0
+      '@emnapi/runtime': 1.10.0
+      '@napi-rs/wasm-runtime': 1.1.5(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
+    optional: true
+
+  '@unrs/resolver-binding-win32-arm64-msvc@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-win32-ia32-msvc@1.12.2':
+    optional: true
+
+  '@unrs/resolver-binding-win32-x64-msvc@1.12.2':
+    optional: true
+
+  abort-controller@3.0.0:
+    dependencies:
+      event-target-shim: 5.0.1
+
+  accepts@2.0.0:
+    dependencies:
+      mime-types: 3.0.2
+      negotiator: 1.0.0
+
+  acorn-jsx@5.3.2(acorn@8.17.0):
+    dependencies:
+      acorn: 8.17.0
+
+  acorn@8.17.0: {}
+
+  agent-base@7.1.4: {}
+
+  agentkeepalive@4.6.0:
+    dependencies:
+      humanize-ms: 1.2.1
+
+  ajv-formats@3.0.1(ajv@8.20.0):
+    optionalDependencies:
+      ajv: 8.20.0
+
+  ajv@6.15.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-json-stable-stringify: 2.1.0
+      json-schema-traverse: 0.4.1
+      uri-js: 4.4.1
+
+  ajv@8.20.0:
+    dependencies:
+      fast-deep-equal: 3.1.3
+      fast-uri: 3.1.2
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+
+  ansi-colors@4.1.3: {}
+
+  ansi-regex@5.0.1: {}
+
+  ansi-regex@6.2.2: {}
+
+  ansi-styles@4.3.0:
+    dependencies:
+      color-convert: 2.0.1
+
+  ansi-styles@6.2.3: {}
+
+  ansis@4.3.1: {}
+
+  anynum@1.0.0: {}
+
+  argparse@2.0.1: {}
+
+  aria-query@5.3.2: {}
+
+  array-buffer-byte-length@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      is-array-buffer: 3.0.5
+
+  array-includes@3.1.9:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-object-atoms: 1.1.2
+      get-intrinsic: 1.3.0
+      is-string: 1.1.1
+      math-intrinsics: 1.1.0
+
+  array-timsort@1.0.3: {}
+
+  array.prototype.findlast@1.2.5:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.2
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.findlastindex@1.2.6:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.2
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.flat@1.3.3:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.flatmap@1.3.3:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-shim-unscopables: 1.1.0
+
+  array.prototype.tosorted@1.1.4:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-errors: 1.3.0
+      es-shim-unscopables: 1.1.0
+
+  arraybuffer.prototype.slice@1.0.4:
+    dependencies:
+      array-buffer-byte-length: 1.0.2
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      is-array-buffer: 3.0.5
+
+  ast-types-flow@0.0.8: {}
+
+  ast-types@0.16.1:
+    dependencies:
+      tslib: 2.8.1
+
+  async-function@1.0.0: {}
+
+  asynckit@0.4.0: {}
+
+  available-typed-arrays@1.0.7:
+    dependencies:
+      possible-typed-array-names: 1.1.0
+
+  aws4fetch@1.0.20: {}
+
+  axe-core@4.12.1: {}
+
+  axobject-query@4.1.0: {}
+
+  babel-plugin-react-compiler@1.0.0:
+    dependencies:
+      '@babel/types': 7.29.7
+
+  balanced-match@1.0.2: {}
+
+  balanced-match@4.0.4: {}
+
+  baseline-browser-mapping@2.10.37: {}
+
+  birecord@0.1.1: {}
+
+  blake3-wasm@2.1.5: {}
+
+  body-parser@2.2.2:
+    dependencies:
+      bytes: 3.1.2
+      content-type: 1.0.5
+      debug: 4.4.3
+      http-errors: 2.0.1
+      iconv-lite: 0.7.2
+      on-finished: 2.4.1
+      qs: 6.15.2
+      raw-body: 3.0.2
+      type-is: 2.1.0
+    transitivePeerDependencies:
+      - supports-color
+
+  bowser@2.14.1: {}
+
+  brace-expansion@1.1.15:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  brace-expansion@2.1.1:
+    dependencies:
+      balanced-match: 1.0.2
+
+  brace-expansion@5.0.6:
+    dependencies:
+      balanced-match: 4.0.4
+
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+
+  browserslist@4.28.2:
+    dependencies:
+      baseline-browser-mapping: 2.10.37
+      caniuse-lite: 1.0.30001799
+      electron-to-chromium: 1.5.372
+      node-releases: 2.0.47
+      update-browserslist-db: 1.2.3(browserslist@4.28.2)
+
+  buffer-from@1.1.2: {}
+
+  bundle-name@4.1.0:
+    dependencies:
+      run-applescript: 7.1.0
+
+  bytes@3.1.2: {}
+
+  call-bind-apply-helpers@1.0.2:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+
+  call-bind@1.0.9:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      get-intrinsic: 1.3.0
+      set-function-length: 1.2.2
+
+  call-bound@1.0.4:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      get-intrinsic: 1.3.0
+
+  callsites@3.1.0: {}
+
+  caniuse-lite@1.0.30001799: {}
+
+  chalk@4.1.2:
+    dependencies:
+      ansi-styles: 4.3.0
+      supports-color: 7.2.0
+
+  chalk@5.6.2: {}
+
+  ci-info@4.4.0: {}
+
+  class-variance-authority@0.7.1:
+    dependencies:
+      clsx: 2.1.1
+
+  cli-cursor@5.0.0:
+    dependencies:
+      restore-cursor: 5.1.0
+
+  cli-spinners@2.9.2: {}
+
+  cli-width@4.1.0: {}
+
+  client-only@0.0.1: {}
+
+  cliui@8.0.1:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 7.0.0
+
+  cliui@9.0.1:
+    dependencies:
+      string-width: 7.2.0
+      strip-ansi: 7.2.0
+      wrap-ansi: 9.0.2
+
+  cloudflare@4.5.0:
+    dependencies:
+      '@types/node': 18.19.130
+      '@types/node-fetch': 2.6.13
+      abort-controller: 3.0.0
+      agentkeepalive: 4.6.0
+      form-data-encoder: 1.7.2
+      formdata-node: 4.4.1
+      node-fetch: 2.7.0
+    transitivePeerDependencies:
+      - encoding
+
+  clsx@2.1.1: {}
+
+  code-block-writer@13.0.3: {}
+
+  color-convert@2.0.1:
+    dependencies:
+      color-name: 1.1.4
+
+  color-name@1.1.4: {}
+
+  combined-stream@1.0.8:
+    dependencies:
+      delayed-stream: 1.0.0
+
+  commander@11.1.0: {}
+
+  commander@12.1.0: {}
+
+  commander@14.0.3: {}
+
+  commander@2.20.3: {}
+
+  comment-json@4.6.2:
+    dependencies:
+      array-timsort: 1.0.3
+      esprima: 4.0.1
+
+  compare-versions@6.1.1: {}
+
+  concat-map@0.0.1: {}
+
+  content-disposition@1.1.0: {}
+
+  content-type@1.0.5: {}
+
+  content-type@2.0.0: {}
+
+  convert-source-map@2.0.0: {}
+
+  cookie-signature@1.2.2: {}
+
+  cookie@0.7.2: {}
+
+  cookie@1.1.1: {}
+
+  cors@2.8.6:
+    dependencies:
+      object-assign: 4.1.1
+      vary: 1.1.2
+
+  cosmiconfig@9.0.2(typescript@5.9.3):
+    dependencies:
+      env-paths: 2.2.1
+      import-fresh: 3.3.1
+      js-yaml: 4.2.0
+      parse-json: 5.2.0
+    optionalDependencies:
+      typescript: 5.9.3
+
+  cross-spawn@7.0.6:
+    dependencies:
+      path-key: 3.1.1
+      shebang-command: 2.0.0
+      which: 2.0.2
+
+  cssesc@3.0.0: {}
+
+  csstype@3.2.3: {}
+
+  damerau-levenshtein@1.0.8: {}
+
+  data-uri-to-buffer@4.0.1: {}
+
+  data-view-buffer@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-data-view: 1.0.2
+
+  data-view-byte-length@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-data-view: 1.0.2
+
+  data-view-byte-offset@1.0.1:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-data-view: 1.0.2
+
+  debug@3.2.7:
+    dependencies:
+      ms: 2.1.3
+
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
+  dedent@1.7.2: {}
+
+  deep-is@0.1.4: {}
+
+  deepmerge@4.3.1: {}
+
+  default-browser-id@5.0.1: {}
+
+  default-browser@5.5.0:
+    dependencies:
+      bundle-name: 4.1.0
+      default-browser-id: 5.0.1
+
+  define-data-property@1.1.4:
+    dependencies:
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
+  define-lazy-prop@3.0.0: {}
+
+  define-properties@1.2.1:
+    dependencies:
+      define-data-property: 1.1.4
+      has-property-descriptors: 1.0.2
+      object-keys: 1.1.1
+
+  delayed-stream@1.0.0: {}
+
+  depd@2.0.0: {}
+
+  detect-libc@2.1.2: {}
+
+  diff@8.0.4: {}
+
+  doctrine@2.1.0:
+    dependencies:
+      esutils: 2.0.3
+
+  dotenv@16.6.1: {}
+
+  dotenv@17.4.2: {}
+
+  dunder-proto@1.0.1:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-errors: 1.3.0
+      gopd: 1.2.0
+
+  duplexer@0.1.2: {}
+
+  eciesjs@0.4.18:
+    dependencies:
+      '@ecies/ciphers': 0.2.6(@noble/ciphers@1.3.0)
+      '@noble/ciphers': 1.3.0
+      '@noble/curves': 1.9.7
+      '@noble/hashes': 1.8.0
+
+  ee-first@1.1.1: {}
+
+  electron-to-chromium@1.5.372: {}
+
+  emoji-regex@10.6.0: {}
+
+  emoji-regex@8.0.0: {}
+
+  emoji-regex@9.2.2: {}
+
+  encodeurl@2.0.0: {}
+
+  enhanced-resolve@5.21.6:
+    dependencies:
+      graceful-fs: 4.2.11
+      tapable: 2.3.3
+
+  enquirer@2.4.1:
+    dependencies:
+      ansi-colors: 4.1.3
+      strip-ansi: 6.0.1
+
+  env-paths@2.2.1: {}
+
+  error-ex@1.3.4:
+    dependencies:
+      is-arrayish: 0.2.1
+
+  error-stack-parser-es@1.0.5: {}
+
+  es-abstract@1.24.2:
+    dependencies:
+      array-buffer-byte-length: 1.0.2
+      arraybuffer.prototype.slice: 1.0.4
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      data-view-buffer: 1.0.2
+      data-view-byte-length: 1.0.2
+      data-view-byte-offset: 1.0.1
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.2
+      es-set-tostringtag: 2.1.0
+      es-to-primitive: 1.3.0
+      function.prototype.name: 1.2.0
+      get-intrinsic: 1.3.0
+      get-proto: 1.0.1
+      get-symbol-description: 1.1.0
+      globalthis: 1.0.4
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.4
+      internal-slot: 1.1.0
+      is-array-buffer: 3.0.5
+      is-callable: 1.2.7
+      is-data-view: 1.0.2
+      is-negative-zero: 2.0.3
+      is-regex: 1.2.1
+      is-set: 2.0.3
+      is-shared-array-buffer: 1.0.4
+      is-string: 1.1.1
+      is-typed-array: 1.1.15
+      is-weakref: 1.1.1
+      math-intrinsics: 1.1.0
+      object-inspect: 1.13.4
+      object-keys: 1.1.1
+      object.assign: 4.1.7
+      own-keys: 1.0.1
+      regexp.prototype.flags: 1.5.4
+      safe-array-concat: 1.1.4
+      safe-push-apply: 1.0.0
+      safe-regex-test: 1.1.0
+      set-proto: 1.0.0
+      stop-iteration-iterator: 1.1.0
+      string.prototype.trim: 1.2.11
+      string.prototype.trimend: 1.0.10
+      string.prototype.trimstart: 1.0.8
+      typed-array-buffer: 1.0.3
+      typed-array-byte-length: 1.0.3
+      typed-array-byte-offset: 1.0.4
+      typed-array-length: 1.0.8
+      unbox-primitive: 1.1.0
+      which-typed-array: 1.1.22
+
+  es-define-property@1.0.1: {}
+
+  es-errors@1.3.0: {}
+
+  es-iterator-helpers@1.3.3:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-errors: 1.3.0
+      es-set-tostringtag: 2.1.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.3.0
+      globalthis: 1.0.4
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+      has-proto: 1.2.0
+      has-symbols: 1.1.0
+      internal-slot: 1.1.0
+      iterator.prototype: 1.1.5
+      math-intrinsics: 1.1.0
+
+  es-object-atoms@1.1.2:
+    dependencies:
+      es-errors: 1.3.0
+
+  es-set-tostringtag@2.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      has-tostringtag: 1.0.2
+      hasown: 2.0.4
+
+  es-shim-unscopables@1.1.0:
+    dependencies:
+      hasown: 2.0.4
+
+  es-to-primitive@1.3.0:
+    dependencies:
+      is-callable: 1.2.7
+      is-date-object: 1.1.0
+      is-symbol: 1.1.1
+
+  esbuild@0.25.4:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.25.4
+      '@esbuild/android-arm': 0.25.4
+      '@esbuild/android-arm64': 0.25.4
+      '@esbuild/android-x64': 0.25.4
+      '@esbuild/darwin-arm64': 0.25.4
+      '@esbuild/darwin-x64': 0.25.4
+      '@esbuild/freebsd-arm64': 0.25.4
+      '@esbuild/freebsd-x64': 0.25.4
+      '@esbuild/linux-arm': 0.25.4
+      '@esbuild/linux-arm64': 0.25.4
+      '@esbuild/linux-ia32': 0.25.4
+      '@esbuild/linux-loong64': 0.25.4
+      '@esbuild/linux-mips64el': 0.25.4
+      '@esbuild/linux-ppc64': 0.25.4
+      '@esbuild/linux-riscv64': 0.25.4
+      '@esbuild/linux-s390x': 0.25.4
+      '@esbuild/linux-x64': 0.25.4
+      '@esbuild/netbsd-arm64': 0.25.4
+      '@esbuild/netbsd-x64': 0.25.4
+      '@esbuild/openbsd-arm64': 0.25.4
+      '@esbuild/openbsd-x64': 0.25.4
+      '@esbuild/sunos-x64': 0.25.4
+      '@esbuild/win32-arm64': 0.25.4
+      '@esbuild/win32-ia32': 0.25.4
+      '@esbuild/win32-x64': 0.25.4
+
+  esbuild@0.27.3:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.27.3
+      '@esbuild/android-arm': 0.27.3
+      '@esbuild/android-arm64': 0.27.3
+      '@esbuild/android-x64': 0.27.3
+      '@esbuild/darwin-arm64': 0.27.3
+      '@esbuild/darwin-x64': 0.27.3
+      '@esbuild/freebsd-arm64': 0.27.3
+      '@esbuild/freebsd-x64': 0.27.3
+      '@esbuild/linux-arm': 0.27.3
+      '@esbuild/linux-arm64': 0.27.3
+      '@esbuild/linux-ia32': 0.27.3
+      '@esbuild/linux-loong64': 0.27.3
+      '@esbuild/linux-mips64el': 0.27.3
+      '@esbuild/linux-ppc64': 0.27.3
+      '@esbuild/linux-riscv64': 0.27.3
+      '@esbuild/linux-s390x': 0.27.3
+      '@esbuild/linux-x64': 0.27.3
+      '@esbuild/netbsd-arm64': 0.27.3
+      '@esbuild/netbsd-x64': 0.27.3
+      '@esbuild/openbsd-arm64': 0.27.3
+      '@esbuild/openbsd-x64': 0.27.3
+      '@esbuild/openharmony-arm64': 0.27.3
+      '@esbuild/sunos-x64': 0.27.3
+      '@esbuild/win32-arm64': 0.27.3
+      '@esbuild/win32-ia32': 0.27.3
+      '@esbuild/win32-x64': 0.27.3
+
+  escalade@3.2.0: {}
+
+  escape-html@1.0.3: {}
+
+  escape-string-regexp@4.0.0: {}
+
+  eslint-config-next@16.2.9(@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3))(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3):
+    dependencies:
+      '@next/eslint-plugin-next': 16.2.9
+      eslint: 9.39.4(jiti@2.7.0)
+      eslint-import-resolver-node: 0.3.10
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@9.39.4(jiti@2.7.0))
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4(jiti@2.7.0))
+      eslint-plugin-jsx-a11y: 6.10.2(eslint@9.39.4(jiti@2.7.0))
+      eslint-plugin-react: 7.37.5(eslint@9.39.4(jiti@2.7.0))
+      eslint-plugin-react-hooks: 7.1.1(eslint@9.39.4(jiti@2.7.0))
+      globals: 16.4.0
+      typescript-eslint: 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+    optionalDependencies:
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - '@typescript-eslint/parser'
+      - eslint-import-resolver-webpack
+      - eslint-plugin-import-x
+      - supports-color
+
+  eslint-config-prettier@10.1.8(eslint@9.39.4(jiti@2.7.0)):
+    dependencies:
+      eslint: 9.39.4(jiti@2.7.0)
+
+  eslint-import-resolver-node@0.3.10:
+    dependencies:
+      debug: 3.2.7
+      is-core-module: 2.16.2
+      resolve: 2.0.0-next.7
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-import-resolver-typescript@3.10.1(eslint-plugin-import@2.32.0)(eslint@9.39.4(jiti@2.7.0)):
+    dependencies:
+      '@nolyfill/is-core-module': 1.0.39
+      debug: 4.4.3
+      eslint: 9.39.4(jiti@2.7.0)
+      get-tsconfig: 4.14.0
+      is-bun-module: 2.0.0
+      stable-hash: 0.0.5
+      tinyglobby: 0.2.17
+      unrs-resolver: 1.12.2
+    optionalDependencies:
+      eslint-plugin-import: 2.32.0(@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4(jiti@2.7.0))
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-module-utils@2.13.0(@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.10)(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4(jiti@2.7.0)):
+    dependencies:
+      debug: 3.2.7
+    optionalDependencies:
+      '@typescript-eslint/parser': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      eslint-import-resolver-node: 0.3.10
+      eslint-import-resolver-typescript: 3.10.1(eslint-plugin-import@2.32.0)(eslint@9.39.4(jiti@2.7.0))
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-import@2.32.0(@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3))(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4(jiti@2.7.0)):
+    dependencies:
+      '@rtsao/scc': 1.1.0
+      array-includes: 3.1.9
+      array.prototype.findlastindex: 1.2.6
+      array.prototype.flat: 1.3.3
+      array.prototype.flatmap: 1.3.3
+      debug: 3.2.7
+      doctrine: 2.1.0
+      eslint: 9.39.4(jiti@2.7.0)
+      eslint-import-resolver-node: 0.3.10
+      eslint-module-utils: 2.13.0(@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3))(eslint-import-resolver-node@0.3.10)(eslint-import-resolver-typescript@3.10.1)(eslint@9.39.4(jiti@2.7.0))
+      hasown: 2.0.4
+      is-core-module: 2.16.2
+      is-glob: 4.0.3
+      minimatch: 3.1.5
+      object.fromentries: 2.0.8
+      object.groupby: 1.0.3
+      object.values: 1.2.1
+      semver: 6.3.1
+      string.prototype.trimend: 1.0.10
+      tsconfig-paths: 3.15.0
+    optionalDependencies:
+      '@typescript-eslint/parser': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+    transitivePeerDependencies:
+      - eslint-import-resolver-typescript
+      - eslint-import-resolver-webpack
+      - supports-color
+
+  eslint-plugin-jsx-a11y@6.10.2(eslint@9.39.4(jiti@2.7.0)):
+    dependencies:
+      aria-query: 5.3.2
+      array-includes: 3.1.9
+      array.prototype.flatmap: 1.3.3
+      ast-types-flow: 0.0.8
+      axe-core: 4.12.1
+      axobject-query: 4.1.0
+      damerau-levenshtein: 1.0.8
+      emoji-regex: 9.2.2
+      eslint: 9.39.4(jiti@2.7.0)
+      hasown: 2.0.4
+      jsx-ast-utils: 3.3.5
+      language-tags: 1.0.9
+      minimatch: 3.1.5
+      object.fromentries: 2.0.8
+      safe-regex-test: 1.1.0
+      string.prototype.includes: 2.0.1
+
+  eslint-plugin-react-dom@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3):
+    dependencies:
+      '@eslint-react/ast': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/core': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/eff': 2.13.0
+      '@eslint-react/shared': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/var': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      compare-versions: 6.1.1
+      eslint: 9.39.4(jiti@2.7.0)
+      ts-pattern: 5.9.0
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-hooks-extra@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3):
+    dependencies:
+      '@eslint-react/ast': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/core': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/eff': 2.13.0
+      '@eslint-react/shared': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/var': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/type-utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      ts-pattern: 5.9.0
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-hooks@7.1.1(eslint@9.39.4(jiti@2.7.0)):
+    dependencies:
+      '@babel/core': 7.29.7
+      '@babel/parser': 7.29.7
+      eslint: 9.39.4(jiti@2.7.0)
+      hermes-parser: 0.25.1
+      zod: 4.4.3
+      zod-validation-error: 4.0.2(zod@4.4.3)
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-naming-convention@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3):
+    dependencies:
+      '@eslint-react/ast': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/core': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/eff': 2.13.0
+      '@eslint-react/shared': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/var': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/type-utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      compare-versions: 6.1.1
+      eslint: 9.39.4(jiti@2.7.0)
+      string-ts: 2.3.1
+      ts-pattern: 5.9.0
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-rsc@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3):
+    dependencies:
+      '@eslint-react/ast': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/shared': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/var': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      ts-pattern: 5.9.0
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-web-api@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3):
+    dependencies:
+      '@eslint-react/ast': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/core': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/eff': 2.13.0
+      '@eslint-react/shared': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/var': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      birecord: 0.1.1
+      eslint: 9.39.4(jiti@2.7.0)
+      ts-pattern: 5.9.0
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-x@2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3):
+    dependencies:
+      '@eslint-react/ast': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/core': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/eff': 2.13.0
+      '@eslint-react/shared': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@eslint-react/var': 2.13.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.61.0
+      '@typescript-eslint/type-utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/types': 8.61.0
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      compare-versions: 6.1.1
+      eslint: 9.39.4(jiti@2.7.0)
+      is-immutable-type: 5.0.4(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      ts-api-utils: 2.5.0(typescript@5.9.3)
+      ts-pattern: 5.9.0
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-you-might-not-need-an-effect@0.9.3(eslint@9.39.4(jiti@2.7.0)):
+    dependencies:
+      eslint: 9.39.4(jiti@2.7.0)
+      globals: 16.5.0
+
+  eslint-plugin-react@7.37.5(eslint@9.39.4(jiti@2.7.0)):
+    dependencies:
+      array-includes: 3.1.9
+      array.prototype.findlast: 1.2.5
+      array.prototype.flatmap: 1.3.3
+      array.prototype.tosorted: 1.1.4
+      doctrine: 2.1.0
+      es-iterator-helpers: 1.3.3
+      eslint: 9.39.4(jiti@2.7.0)
+      estraverse: 5.3.0
+      hasown: 2.0.4
+      jsx-ast-utils: 3.3.5
+      minimatch: 3.1.5
+      object.entries: 1.1.9
+      object.fromentries: 2.0.8
+      object.values: 1.2.1
+      prop-types: 15.8.1
+      resolve: 2.0.0-next.7
+      semver: 6.3.1
+      string.prototype.matchall: 4.0.12
+      string.prototype.repeat: 1.0.0
+
+  eslint-scope@8.4.0:
+    dependencies:
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
+
+  eslint-visitor-keys@3.4.3: {}
+
+  eslint-visitor-keys@4.2.1: {}
+
+  eslint-visitor-keys@5.0.1: {}
+
+  eslint@9.39.4(jiti@2.7.0):
+    dependencies:
+      '@eslint-community/eslint-utils': 4.9.1(eslint@9.39.4(jiti@2.7.0))
+      '@eslint-community/regexpp': 4.12.2
+      '@eslint/config-array': 0.21.2
+      '@eslint/config-helpers': 0.4.2
+      '@eslint/core': 0.17.0
+      '@eslint/eslintrc': 3.3.5
+      '@eslint/js': 9.39.4
+      '@eslint/plugin-kit': 0.4.1
+      '@humanfs/node': 0.16.8
+      '@humanwhocodes/module-importer': 1.0.1
+      '@humanwhocodes/retry': 0.4.3
+      '@types/estree': 1.0.9
+      ajv: 6.15.0
+      chalk: 4.1.2
+      cross-spawn: 7.0.6
+      debug: 4.4.3
+      escape-string-regexp: 4.0.0
+      eslint-scope: 8.4.0
+      eslint-visitor-keys: 4.2.1
+      espree: 10.4.0
+      esquery: 1.7.0
+      esutils: 2.0.3
+      fast-deep-equal: 3.1.3
+      file-entry-cache: 8.0.0
+      find-up: 5.0.0
+      glob-parent: 6.0.2
+      ignore: 5.3.2
+      imurmurhash: 0.1.4
+      is-glob: 4.0.3
+      json-stable-stringify-without-jsonify: 1.0.1
+      lodash.merge: 4.6.2
+      minimatch: 3.1.5
+      natural-compare: 1.4.0
+      optionator: 0.9.4
+    optionalDependencies:
+      jiti: 2.7.0
+    transitivePeerDependencies:
+      - supports-color
+
+  espree@10.4.0:
+    dependencies:
+      acorn: 8.17.0
+      acorn-jsx: 5.3.2(acorn@8.17.0)
+      eslint-visitor-keys: 4.2.1
+
+  esprima@4.0.1: {}
+
+  esquery@1.7.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  esrecurse@4.3.0:
+    dependencies:
+      estraverse: 5.3.0
+
+  estraverse@5.3.0: {}
+
+  esutils@2.0.3: {}
+
+  etag@1.8.1: {}
+
+  event-target-shim@5.0.1: {}
+
+  eventsource-parser@3.1.0: {}
+
+  eventsource@3.0.7:
+    dependencies:
+      eventsource-parser: 3.1.0
+
+  execa@5.1.1:
+    dependencies:
+      cross-spawn: 7.0.6
+      get-stream: 6.0.1
+      human-signals: 2.1.0
+      is-stream: 2.0.1
+      merge-stream: 2.0.0
+      npm-run-path: 4.0.1
+      onetime: 5.1.2
+      signal-exit: 3.0.7
+      strip-final-newline: 2.0.0
+
+  execa@9.6.1:
+    dependencies:
+      '@sindresorhus/merge-streams': 4.0.0
+      cross-spawn: 7.0.6
+      figures: 6.1.0
+      get-stream: 9.0.1
+      human-signals: 8.0.1
+      is-plain-obj: 4.1.0
+      is-stream: 4.0.1
+      npm-run-path: 6.0.0
+      pretty-ms: 9.3.0
+      signal-exit: 4.1.0
+      strip-final-newline: 4.0.0
+      yoctocolors: 2.1.2
+
+  express-rate-limit@7.5.1(express@5.2.1):
+    dependencies:
+      express: 5.2.1
+
+  express-rate-limit@8.5.2(express@5.2.1):
+    dependencies:
+      express: 5.2.1
+      ip-address: 10.2.0
+
+  express@5.2.1:
+    dependencies:
+      accepts: 2.0.0
+      body-parser: 2.2.2
+      content-disposition: 1.1.0
+      content-type: 1.0.5
+      cookie: 0.7.2
+      cookie-signature: 1.2.2
+      debug: 4.4.3
+      depd: 2.0.0
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      etag: 1.8.1
+      finalhandler: 2.1.1
+      fresh: 2.0.0
+      http-errors: 2.0.1
+      merge-descriptors: 2.0.0
+      mime-types: 3.0.2
+      on-finished: 2.4.1
+      once: 1.4.0
+      parseurl: 1.3.3
+      proxy-addr: 2.0.7
+      qs: 6.15.2
+      range-parser: 1.2.1
+      router: 2.2.0
+      send: 1.2.1
+      serve-static: 2.2.1
+      statuses: 2.0.2
+      type-is: 2.1.0
+      vary: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  fast-deep-equal@3.1.3: {}
+
+  fast-glob@3.3.1:
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.8
+
+  fast-glob@3.3.3:
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      '@nodelib/fs.walk': 1.2.8
+      glob-parent: 5.1.2
+      merge2: 1.4.1
+      micromatch: 4.0.8
+
+  fast-json-stable-stringify@2.1.0: {}
+
+  fast-levenshtein@2.0.6: {}
+
+  fast-string-truncated-width@3.0.3: {}
+
+  fast-string-width@3.0.2:
+    dependencies:
+      fast-string-truncated-width: 3.0.3
+
+  fast-uri@3.1.2: {}
+
+  fast-wrap-ansi@0.2.2:
+    dependencies:
+      fast-string-width: 3.0.2
+
+  fast-xml-builder@1.2.0:
+    dependencies:
+      path-expression-matcher: 1.5.0
+      xml-naming: 0.1.0
+
+  fast-xml-parser@5.7.3:
+    dependencies:
+      '@nodable/entities': 2.2.0
+      fast-xml-builder: 1.2.0
+      path-expression-matcher: 1.5.0
+      strnum: 2.4.0
+
+  fastq@1.20.1:
+    dependencies:
+      reusify: 1.1.0
+
+  fdir@6.5.0(picomatch@4.0.4):
+    optionalDependencies:
+      picomatch: 4.0.4
+
+  fetch-blob@3.2.0:
+    dependencies:
+      node-domexception: 1.0.0
+      web-streams-polyfill: 3.3.3
+
+  figures@6.1.0:
+    dependencies:
+      is-unicode-supported: 2.1.0
+
+  file-entry-cache@8.0.0:
+    dependencies:
+      flat-cache: 4.0.1
+
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
+  finalhandler@2.1.1:
+    dependencies:
+      debug: 4.4.3
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      on-finished: 2.4.1
+      parseurl: 1.3.3
+      statuses: 2.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  find-process@2.0.0:
+    dependencies:
+      chalk: 4.1.2
+      commander: 12.1.0
+      loglevel: 1.9.2
+
+  find-up@5.0.0:
+    dependencies:
+      locate-path: 6.0.0
+      path-exists: 4.0.0
+
+  flat-cache@4.0.1:
+    dependencies:
+      flatted: 3.4.2
+      keyv: 4.5.4
+
+  flatted@3.4.2: {}
+
+  for-each@0.3.5:
+    dependencies:
+      is-callable: 1.2.7
+
+  foreground-child@3.3.1:
+    dependencies:
+      cross-spawn: 7.0.6
+      signal-exit: 4.1.0
+
+  form-data-encoder@1.7.2: {}
+
+  form-data@4.0.6:
+    dependencies:
+      asynckit: 0.4.0
+      combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
+      hasown: 2.0.4
+      mime-types: 2.1.35
+
+  formdata-node@4.4.1:
+    dependencies:
+      node-domexception: 1.0.0
+      web-streams-polyfill: 4.0.0-beta.3
+
+  formdata-polyfill@4.0.10:
+    dependencies:
+      fetch-blob: 3.2.0
+
+  forwarded@0.2.0: {}
+
+  framer-motion@12.40.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+    dependencies:
+      motion-dom: 12.40.0
+      motion-utils: 12.39.0
+      tslib: 2.8.1
+    optionalDependencies:
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
+
+  fresh@2.0.0: {}
+
+  fs-extra@11.3.5:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 6.2.1
+      universalify: 2.0.1
+
+  fs.realpath@1.0.0: {}
+
+  fsevents@2.3.3:
+    optional: true
+
+  function-bind@1.1.2: {}
+
+  function.prototype.name@1.2.0:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.2
+      hasown: 2.0.4
+      is-callable: 1.2.7
+      is-document.all: 1.0.0
+
+  functions-have-names@1.2.3: {}
+
+  fuzzysort@3.1.0: {}
+
+  fzf@0.5.2: {}
+
+  generator-function@2.0.1: {}
+
+  gensync@1.0.0-beta.2: {}
+
+  get-caller-file@2.0.5: {}
+
+  get-east-asian-width@1.6.0: {}
+
+  get-intrinsic@1.3.0:
+    dependencies:
+      call-bind-apply-helpers: 1.0.2
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.2
+      function-bind: 1.1.2
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      hasown: 2.0.4
+      math-intrinsics: 1.1.0
+
+  get-own-enumerable-keys@1.0.0: {}
+
+  get-proto@1.0.1:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-object-atoms: 1.1.2
+
+  get-stream@6.0.1: {}
+
+  get-stream@9.0.1:
+    dependencies:
+      '@sec-ant/readable-stream': 0.4.1
+      is-stream: 4.0.1
+
+  get-symbol-description@1.1.0:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+
+  get-tsconfig@4.14.0:
+    dependencies:
+      resolve-pkg-maps: 1.0.0
+
+  glob-parent@5.1.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  glob-parent@6.0.2:
+    dependencies:
+      is-glob: 4.0.3
+
+  glob@12.0.0:
+    dependencies:
+      foreground-child: 3.3.1
+      jackspeak: 4.2.3
+      minimatch: 10.2.5
+      minipass: 7.1.3
+      package-json-from-dist: 1.0.1
+      path-scurry: 2.0.2
+
+  glob@9.3.5:
+    dependencies:
+      fs.realpath: 1.0.0
+      minimatch: 8.0.7
+      minipass: 4.2.8
+      path-scurry: 1.11.1
+
+  globals@14.0.0: {}
+
+  globals@16.4.0: {}
+
+  globals@16.5.0: {}
+
+  globalthis@1.0.4:
+    dependencies:
+      define-properties: 1.2.1
+      gopd: 1.2.0
+
+  gopd@1.2.0: {}
+
+  graceful-fs@4.2.11: {}
+
+  graphql@16.14.2: {}
+
+  gzip-size@6.0.0:
+    dependencies:
+      duplexer: 0.1.2
+
+  has-bigints@1.1.0: {}
+
+  has-flag@4.0.0: {}
+
+  has-property-descriptors@1.0.2:
+    dependencies:
+      es-define-property: 1.0.1
+
+  has-proto@1.2.0:
+    dependencies:
+      dunder-proto: 1.0.1
+
+  has-symbols@1.1.0: {}
+
+  has-tostringtag@1.0.2:
+    dependencies:
+      has-symbols: 1.1.0
+
+  hasown@2.0.4:
+    dependencies:
+      function-bind: 1.1.2
+
+  headers-polyfill@5.0.1:
+    dependencies:
+      '@types/set-cookie-parser': 2.4.10
+      set-cookie-parser: 3.1.0
+
+  hermes-estree@0.25.1: {}
+
+  hermes-parser@0.25.1:
+    dependencies:
+      hermes-estree: 0.25.1
+
+  hono@4.12.25: {}
+
+  http-errors@2.0.1:
+    dependencies:
+      depd: 2.0.0
+      inherits: 2.0.4
+      setprototypeof: 1.2.0
+      statuses: 2.0.2
+      toidentifier: 1.0.1
+
+  https-proxy-agent@7.0.6:
+    dependencies:
+      agent-base: 7.1.4
+      debug: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  human-signals@2.1.0: {}
+
+  human-signals@8.0.1: {}
+
+  humanize-ms@1.2.1:
+    dependencies:
+      ms: 2.1.3
+
+  iconv-lite@0.7.2:
+    dependencies:
+      safer-buffer: 2.1.2
+
+  ignore@5.3.2: {}
+
+  ignore@7.0.5: {}
+
+  import-fresh@3.3.1:
+    dependencies:
+      parent-module: 1.0.1
+      resolve-from: 4.0.0
+
+  imurmurhash@0.1.4: {}
+
+  inherits@2.0.4: {}
+
+  internal-slot@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      hasown: 2.0.4
+      side-channel: 1.1.1
+
+  ip-address@10.2.0: {}
+
+  ipaddr.js@1.9.1: {}
+
+  is-array-buffer@3.0.5:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
+
+  is-arrayish@0.2.1: {}
+
+  is-async-function@2.1.1:
+    dependencies:
+      async-function: 1.0.0
+      call-bound: 1.0.4
+      get-proto: 1.0.1
+      has-tostringtag: 1.0.2
+      safe-regex-test: 1.1.0
+
+  is-bigint@1.1.0:
+    dependencies:
+      has-bigints: 1.1.0
+
+  is-boolean-object@1.2.2:
+    dependencies:
+      call-bound: 1.0.4
+      has-tostringtag: 1.0.2
+
+  is-bun-module@2.0.0:
+    dependencies:
+      semver: 7.8.4
+
+  is-callable@1.2.7: {}
+
+  is-core-module@2.16.2:
+    dependencies:
+      hasown: 2.0.4
+
+  is-data-view@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
+      is-typed-array: 1.1.15
+
+  is-date-object@1.1.0:
+    dependencies:
+      call-bound: 1.0.4
+      has-tostringtag: 1.0.2
+
+  is-docker@3.0.0: {}
+
+  is-document.all@1.0.0:
+    dependencies:
+      call-bound: 1.0.4
+
+  is-extglob@2.1.1: {}
+
+  is-finalizationregistry@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+
+  is-fullwidth-code-point@3.0.0: {}
+
+  is-generator-function@1.1.2:
+    dependencies:
+      call-bound: 1.0.4
+      generator-function: 2.0.1
+      get-proto: 1.0.1
+      has-tostringtag: 1.0.2
+      safe-regex-test: 1.1.0
+
+  is-glob@4.0.3:
+    dependencies:
+      is-extglob: 2.1.1
+
+  is-immutable-type@5.0.4(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3):
+    dependencies:
+      '@typescript-eslint/type-utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      ts-api-utils: 2.5.0(typescript@5.9.3)
+      ts-declaration-location: 1.0.7(typescript@5.9.3)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  is-in-ssh@1.0.0: {}
+
+  is-inside-container@1.0.0:
+    dependencies:
+      is-docker: 3.0.0
+
+  is-interactive@2.0.0: {}
+
+  is-map@2.0.3: {}
+
+  is-negative-zero@2.0.3: {}
+
+  is-node-process@1.2.0: {}
+
+  is-number-object@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+      has-tostringtag: 1.0.2
+
+  is-number@7.0.0: {}
+
+  is-obj@3.0.0: {}
+
+  is-plain-obj@4.1.0: {}
+
+  is-promise@4.0.0: {}
+
+  is-regex@1.2.1:
+    dependencies:
+      call-bound: 1.0.4
+      gopd: 1.2.0
+      has-tostringtag: 1.0.2
+      hasown: 2.0.4
+
+  is-regexp@3.1.0: {}
+
+  is-set@2.0.3: {}
+
+  is-shared-array-buffer@1.0.4:
+    dependencies:
+      call-bound: 1.0.4
+
+  is-stream@2.0.1: {}
+
+  is-stream@4.0.1: {}
+
+  is-string@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+      has-tostringtag: 1.0.2
+
+  is-symbol@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+      has-symbols: 1.1.0
+      safe-regex-test: 1.1.0
+
+  is-typed-array@1.1.15:
+    dependencies:
+      which-typed-array: 1.1.22
+
+  is-unicode-supported@1.3.0: {}
+
+  is-unicode-supported@2.1.0: {}
+
+  is-weakmap@2.0.2: {}
+
+  is-weakref@1.1.1:
+    dependencies:
+      call-bound: 1.0.4
+
+  is-weakset@2.0.4:
+    dependencies:
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
+
+  is-wsl@3.1.1:
+    dependencies:
+      is-inside-container: 1.0.0
+
+  isarray@2.0.5: {}
+
+  isexe@2.0.0: {}
+
+  isexe@3.1.5: {}
+
+  iterator.prototype@1.1.5:
+    dependencies:
+      define-data-property: 1.1.4
+      es-object-atoms: 1.1.2
+      get-intrinsic: 1.3.0
+      get-proto: 1.0.1
+      has-symbols: 1.1.0
+      set-function-name: 2.0.2
+
+  jackspeak@4.2.3:
+    dependencies:
+      '@isaacs/cliui': 9.0.0
+
+  jiti@2.7.0: {}
+
+  jose@6.2.3: {}
+
+  js-tokens@4.0.0: {}
+
+  js-yaml@4.2.0:
+    dependencies:
+      argparse: 2.0.1
+
+  jsesc@3.1.0: {}
+
+  json-buffer@3.0.1: {}
+
+  json-parse-even-better-errors@2.3.1: {}
+
+  json-schema-traverse@0.4.1: {}
+
+  json-schema-traverse@1.0.0: {}
+
+  json-schema-typed@8.0.2: {}
+
+  json-stable-stringify-without-jsonify@1.0.1: {}
+
+  json5@1.0.2:
+    dependencies:
+      minimist: 1.2.8
+
+  json5@2.2.3: {}
+
+  jsonfile@6.2.1:
+    dependencies:
+      universalify: 2.0.1
+    optionalDependencies:
+      graceful-fs: 4.2.11
+
+  jsx-ast-utils@3.3.5:
+    dependencies:
+      array-includes: 3.1.9
+      array.prototype.flat: 1.3.3
+      object.assign: 4.1.7
+      object.values: 1.2.1
+
+  keyv@4.5.4:
+    dependencies:
+      json-buffer: 3.0.1
+
+  kleur@3.0.3: {}
+
+  kleur@4.1.5: {}
+
+  language-subtag-registry@0.3.23: {}
+
+  language-tags@1.0.9:
+    dependencies:
+      language-subtag-registry: 0.3.23
+
+  levn@0.4.1:
+    dependencies:
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+
+  lightningcss-android-arm64@1.32.0:
+    optional: true
+
+  lightningcss-darwin-arm64@1.32.0:
+    optional: true
+
+  lightningcss-darwin-x64@1.32.0:
+    optional: true
+
+  lightningcss-freebsd-x64@1.32.0:
+    optional: true
+
+  lightningcss-linux-arm-gnueabihf@1.32.0:
+    optional: true
+
+  lightningcss-linux-arm64-gnu@1.32.0:
+    optional: true
+
+  lightningcss-linux-arm64-musl@1.32.0:
+    optional: true
+
+  lightningcss-linux-x64-gnu@1.32.0:
+    optional: true
+
+  lightningcss-linux-x64-musl@1.32.0:
+    optional: true
+
+  lightningcss-win32-arm64-msvc@1.32.0:
+    optional: true
+
+  lightningcss-win32-x64-msvc@1.32.0:
+    optional: true
+
+  lightningcss@1.32.0:
+    dependencies:
+      detect-libc: 2.1.2
+    optionalDependencies:
+      lightningcss-android-arm64: 1.32.0
+      lightningcss-darwin-arm64: 1.32.0
+      lightningcss-darwin-x64: 1.32.0
+      lightningcss-freebsd-x64: 1.32.0
+      lightningcss-linux-arm-gnueabihf: 1.32.0
+      lightningcss-linux-arm64-gnu: 1.32.0
+      lightningcss-linux-arm64-musl: 1.32.0
+      lightningcss-linux-x64-gnu: 1.32.0
+      lightningcss-linux-x64-musl: 1.32.0
+      lightningcss-win32-arm64-msvc: 1.32.0
+      lightningcss-win32-x64-msvc: 1.32.0
+
+  lines-and-columns@1.2.4: {}
+
+  locate-path@6.0.0:
+    dependencies:
+      p-locate: 5.0.0
+
+  lodash.merge@4.6.2: {}
+
+  log-symbols@6.0.0:
+    dependencies:
+      chalk: 5.6.2
+      is-unicode-supported: 1.3.0
+
+  loglevel@1.9.2: {}
+
+  loose-envify@1.4.0:
+    dependencies:
+      js-tokens: 4.0.0
+
+  lru-cache@10.4.3: {}
+
+  lru-cache@11.5.1: {}
+
+  lru-cache@5.1.1:
+    dependencies:
+      yallist: 3.1.1
+
+  lucide-react@0.574.0(react@19.2.7):
+    dependencies:
+      react: 19.2.7
+
+  magic-string@0.30.21:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.5
+
+  math-intrinsics@1.1.0: {}
+
+  media-typer@1.1.0: {}
+
+  merge-descriptors@2.0.0: {}
+
+  merge-stream@2.0.0: {}
+
+  merge2@1.4.1: {}
+
+  micromatch@4.0.8:
+    dependencies:
+      braces: 3.0.3
+      picomatch: 2.3.2
+
+  mime-db@1.52.0: {}
+
+  mime-db@1.54.0: {}
+
+  mime-types@2.1.35:
+    dependencies:
+      mime-db: 1.52.0
+
+  mime-types@3.0.2:
+    dependencies:
+      mime-db: 1.54.0
+
+  mimic-fn@2.1.0: {}
+
+  mimic-function@5.0.1: {}
+
+  miniflare@4.20260611.0:
+    dependencies:
+      '@cspotcode/source-map-support': 0.8.1
+      sharp: 0.34.5
+      undici: 7.24.8
+      workerd: 1.20260611.1
+      ws: 8.20.1
+      youch: 4.1.0-beta.10
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  minimatch@10.2.5:
+    dependencies:
+      brace-expansion: 5.0.6
+
+  minimatch@3.1.5:
+    dependencies:
+      brace-expansion: 1.1.15
+
+  minimatch@8.0.7:
+    dependencies:
+      brace-expansion: 2.1.1
+
+  minimist@1.2.8: {}
+
+  minipass@4.2.8: {}
+
+  minipass@7.1.3: {}
+
+  mkdirp@1.0.4: {}
+
+  mnemonist@0.38.3:
+    dependencies:
+      obliterator: 1.6.1
+
+  motion-dom@12.40.0:
+    dependencies:
+      motion-utils: 12.39.0
+
+  motion-utils@12.39.0: {}
+
+  motion@12.40.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+    dependencies:
+      framer-motion: 12.40.0(react-dom@19.2.7(react@19.2.7))(react@19.2.7)
+      tslib: 2.8.1
+    optionalDependencies:
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
+
+  ms@2.1.3: {}
+
+  msw@2.14.6(@types/node@25.9.3)(typescript@5.9.3):
+    dependencies:
+      '@inquirer/confirm': 6.1.1(@types/node@25.9.3)
+      '@mswjs/interceptors': 0.41.9
+      '@open-draft/deferred-promise': 3.0.0
+      '@types/statuses': 2.0.6
+      cookie: 1.1.1
+      graphql: 16.14.2
+      headers-polyfill: 5.0.1
+      is-node-process: 1.2.0
+      outvariant: 1.4.3
+      path-to-regexp: 6.3.0
+      picocolors: 1.1.1
+      rettime: 0.11.11
+      statuses: 2.0.2
+      strict-event-emitter: 0.5.1
+      tough-cookie: 6.0.1
+      type-fest: 5.7.0
+      until-async: 3.0.2
+      yargs: 17.7.2
+    optionalDependencies:
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - '@types/node'
+
+  mute-stream@3.0.0: {}
+
+  nanoid@3.3.12: {}
+
+  napi-postinstall@0.3.4: {}
+
+  natural-compare@1.4.0: {}
+
+  negotiator@1.0.0: {}
+
+  next-devtools-mcp@0.3.10:
+    dependencies:
+      '@modelcontextprotocol/sdk': 1.24.3(zod@3.25.76)
+      find-process: 2.0.0
+      pid-port: 2.0.0
+      undici: 7.16.0
+      zod: 3.25.76
+    transitivePeerDependencies:
+      - '@cfworker/json-schema'
+      - supports-color
+
+  next-themes@0.4.6(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+    dependencies:
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
+
+  next@16.2.9(@babel/core@7.29.7)(babel-plugin-react-compiler@1.0.0)(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+    dependencies:
+      '@next/env': 16.2.9
+      '@swc/helpers': 0.5.15
+      baseline-browser-mapping: 2.10.37
+      caniuse-lite: 1.0.30001799
+      postcss: 8.4.31
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
+      styled-jsx: 5.1.6(@babel/core@7.29.7)(react@19.2.7)
+    optionalDependencies:
+      '@next/swc-darwin-arm64': 16.2.9
+      '@next/swc-darwin-x64': 16.2.9
+      '@next/swc-linux-arm64-gnu': 16.2.9
+      '@next/swc-linux-arm64-musl': 16.2.9
+      '@next/swc-linux-x64-gnu': 16.2.9
+      '@next/swc-linux-x64-musl': 16.2.9
+      '@next/swc-win32-arm64-msvc': 16.2.9
+      '@next/swc-win32-x64-msvc': 16.2.9
+      babel-plugin-react-compiler: 1.0.0
+      sharp: 0.34.5
+    transitivePeerDependencies:
+      - '@babel/core'
+      - babel-plugin-macros
+
+  node-domexception@1.0.0: {}
+
+  node-exports-info@1.6.0:
+    dependencies:
+      array.prototype.flatmap: 1.3.3
+      es-errors: 1.3.0
+      object.entries: 1.1.9
+      semver: 6.3.1
+
+  node-fetch@2.7.0:
+    dependencies:
+      whatwg-url: 5.0.0
+
+  node-fetch@3.3.2:
+    dependencies:
+      data-uri-to-buffer: 4.0.1
+      fetch-blob: 3.2.0
+      formdata-polyfill: 4.0.10
+
+  node-releases@2.0.47: {}
+
+  npm-run-path@4.0.1:
+    dependencies:
+      path-key: 3.1.1
+
+  npm-run-path@6.0.0:
+    dependencies:
+      path-key: 4.0.0
+      unicorn-magic: 0.3.0
+
+  object-assign@4.1.1: {}
+
+  object-inspect@1.13.4: {}
+
+  object-keys@1.1.1: {}
+
+  object-treeify@1.1.33: {}
+
+  object.assign@4.1.7:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.2
+      has-symbols: 1.1.0
+      object-keys: 1.1.1
+
+  object.entries@1.1.9:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.2
+
+  object.fromentries@2.0.8:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-object-atoms: 1.1.2
+
+  object.groupby@1.0.3:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+
+  object.values@1.2.1:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.2
+
+  obliterator@1.6.1: {}
+
+  on-finished@2.4.1:
+    dependencies:
+      ee-first: 1.1.1
+
+  once@1.4.0:
+    dependencies:
+      wrappy: 1.0.2
+
+  onetime@5.1.2:
+    dependencies:
+      mimic-fn: 2.1.0
+
+  onetime@7.0.0:
+    dependencies:
+      mimic-function: 5.0.1
+
+  open@11.0.0:
+    dependencies:
+      default-browser: 5.5.0
+      define-lazy-prop: 3.0.0
+      is-in-ssh: 1.0.0
+      is-inside-container: 1.0.0
+      powershell-utils: 0.1.0
+      wsl-utils: 0.3.1
+
+  optionator@0.9.4:
+    dependencies:
+      deep-is: 0.1.4
+      fast-levenshtein: 2.0.6
+      levn: 0.4.1
+      prelude-ls: 1.2.1
+      type-check: 0.4.0
+      word-wrap: 1.2.5
+
+  ora@8.2.0:
+    dependencies:
+      chalk: 5.6.2
+      cli-cursor: 5.0.0
+      cli-spinners: 2.9.2
+      is-interactive: 2.0.0
+      is-unicode-supported: 2.1.0
+      log-symbols: 6.0.0
+      stdin-discarder: 0.2.2
+      string-width: 7.2.0
+      strip-ansi: 7.2.0
+
+  outvariant@1.4.3: {}
+
+  own-keys@1.0.1:
+    dependencies:
+      get-intrinsic: 1.3.0
+      object-keys: 1.1.1
+      safe-push-apply: 1.0.0
+
+  p-limit@3.1.0:
+    dependencies:
+      yocto-queue: 0.1.0
+
+  p-locate@5.0.0:
+    dependencies:
+      p-limit: 3.1.0
+
+  package-json-from-dist@1.0.1: {}
+
+  package-manager-detector@1.6.0: {}
+
+  parent-module@1.0.1:
+    dependencies:
+      callsites: 3.1.0
+
+  parse-json@5.2.0:
+    dependencies:
+      '@babel/code-frame': 7.29.7
+      error-ex: 1.3.4
+      json-parse-even-better-errors: 2.3.1
+      lines-and-columns: 1.2.4
+
+  parse-ms@4.0.0: {}
+
+  parseurl@1.3.3: {}
+
+  path-browserify@1.0.1: {}
+
+  path-exists@4.0.0: {}
+
+  path-expression-matcher@1.5.0: {}
+
+  path-key@3.1.1: {}
+
+  path-key@4.0.0: {}
+
+  path-parse@1.0.7: {}
+
+  path-scurry@1.11.1:
+    dependencies:
+      lru-cache: 10.4.3
+      minipass: 7.1.3
+
+  path-scurry@2.0.2:
+    dependencies:
+      lru-cache: 11.5.1
+      minipass: 7.1.3
+
+  path-to-regexp@6.3.0: {}
+
+  path-to-regexp@8.4.2: {}
+
+  pathe@2.0.3: {}
+
+  picocolors@1.1.1: {}
+
+  picomatch@2.3.2: {}
+
+  picomatch@4.0.4: {}
+
+  pid-port@2.0.0:
+    dependencies:
+      execa: 9.6.1
+
+  pkce-challenge@5.0.1: {}
+
+  possible-typed-array-names@1.1.0: {}
+
+  postcss-selector-parser@7.1.4:
+    dependencies:
+      cssesc: 3.0.0
+      util-deprecate: 1.0.2
+
+  postcss@8.4.31:
+    dependencies:
+      nanoid: 3.3.12
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
+  postcss@8.5.15:
+    dependencies:
+      nanoid: 3.3.12
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
+
+  powershell-utils@0.1.0: {}
+
+  prelude-ls@1.2.1: {}
+
+  prettier-plugin-organize-imports@4.3.0(prettier@3.8.4)(typescript@5.9.3):
+    dependencies:
+      prettier: 3.8.4
+      typescript: 5.9.3
+
+  prettier-plugin-tailwindcss@0.7.4(prettier-plugin-organize-imports@4.3.0(prettier@3.8.4)(typescript@5.9.3))(prettier@3.8.4):
+    dependencies:
+      prettier: 3.8.4
+    optionalDependencies:
+      prettier-plugin-organize-imports: 4.3.0(prettier@3.8.4)(typescript@5.9.3)
+
+  prettier@3.8.4: {}
+
+  pretty-ms@9.3.0:
+    dependencies:
+      parse-ms: 4.0.0
+
+  prompts@2.4.2:
+    dependencies:
+      kleur: 3.0.3
+      sisteransi: 1.0.5
+
+  prop-types@15.8.1:
+    dependencies:
+      loose-envify: 1.4.0
+      object-assign: 4.1.1
+      react-is: 16.13.1
+
+  proxy-addr@2.0.7:
+    dependencies:
+      forwarded: 0.2.0
+      ipaddr.js: 1.9.1
+
+  punycode@2.3.1: {}
+
+  qs@6.15.2:
+    dependencies:
+      side-channel: 1.1.1
+
+  queue-microtask@1.2.3: {}
+
+  range-parser@1.2.1: {}
+
+  raw-body@3.0.2:
+    dependencies:
+      bytes: 3.1.2
+      http-errors: 2.0.1
+      iconv-lite: 0.7.2
+      unpipe: 1.0.0
+
+  react-dom@19.2.7(react@19.2.7):
+    dependencies:
+      react: 19.2.7
+      scheduler: 0.27.0
+
+  react-icons@5.6.0(react@19.2.7):
+    dependencies:
+      react: 19.2.7
+
+  react-is@16.13.1: {}
+
+  react@19.2.7: {}
+
+  recast@0.23.11:
+    dependencies:
+      ast-types: 0.16.1
+      esprima: 4.0.1
+      source-map: 0.6.1
+      tiny-invariant: 1.3.3
+      tslib: 2.8.1
+
+  reflect.getprototypeof@1.0.10:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.2
+      get-intrinsic: 1.3.0
+      get-proto: 1.0.1
+      which-builtin-type: 1.2.1
+
+  regexp.prototype.flags@1.5.4:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-errors: 1.3.0
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      set-function-name: 2.0.2
+
+  require-directory@2.1.1: {}
+
+  require-from-string@2.0.2: {}
+
+  reselect@5.2.0: {}
+
+  resolve-from@4.0.0: {}
+
+  resolve-pkg-maps@1.0.0: {}
+
+  resolve@2.0.0-next.7:
+    dependencies:
+      es-errors: 1.3.0
+      is-core-module: 2.16.2
+      node-exports-info: 1.6.0
+      object-keys: 1.1.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+
+  restore-cursor@5.1.0:
+    dependencies:
+      onetime: 7.0.0
+      signal-exit: 4.1.0
+
+  rettime@0.11.11: {}
+
+  reusify@1.1.0: {}
+
+  router@2.2.0:
+    dependencies:
+      debug: 4.4.3
+      depd: 2.0.0
+      is-promise: 4.0.0
+      parseurl: 1.3.3
+      path-to-regexp: 8.4.2
+    transitivePeerDependencies:
+      - supports-color
+
+  run-applescript@7.1.0: {}
+
+  run-parallel@1.2.0:
+    dependencies:
+      queue-microtask: 1.2.3
+
+  safe-array-concat@1.1.4:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      get-intrinsic: 1.3.0
+      has-symbols: 1.1.0
+      isarray: 2.0.5
+
+  safe-push-apply@1.0.0:
+    dependencies:
+      es-errors: 1.3.0
+      isarray: 2.0.5
+
+  safe-regex-test@1.1.0:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-regex: 1.2.1
+
+  safer-buffer@2.1.2: {}
+
+  scheduler@0.27.0: {}
+
+  semver@6.3.1: {}
+
+  semver@7.8.4: {}
+
+  send@1.2.1:
+    dependencies:
+      debug: 4.4.3
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      etag: 1.8.1
+      fresh: 2.0.0
+      http-errors: 2.0.1
+      mime-types: 3.0.2
+      ms: 2.1.3
+      on-finished: 2.4.1
+      range-parser: 1.2.1
+      statuses: 2.0.2
+    transitivePeerDependencies:
+      - supports-color
+
+  serve-static@2.2.1:
+    dependencies:
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      parseurl: 1.3.3
+      send: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
+
+  set-cookie-parser@3.1.0: {}
+
+  set-function-length@1.2.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.3.0
+      gopd: 1.2.0
+      has-property-descriptors: 1.0.2
+
+  set-function-name@2.0.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      functions-have-names: 1.2.3
+      has-property-descriptors: 1.0.2
+
+  set-proto@1.0.0:
+    dependencies:
+      dunder-proto: 1.0.1
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.2
+
+  setprototypeof@1.2.0: {}
+
+  shadcn@3.8.5(@types/node@25.9.3)(typescript@5.9.3):
+    dependencies:
+      '@antfu/ni': 25.0.0
+      '@babel/core': 7.29.7
+      '@babel/parser': 7.29.7
+      '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7)
+      '@babel/preset-typescript': 7.29.7(@babel/core@7.29.7)
+      '@dotenvx/dotenvx': 1.71.3
+      '@modelcontextprotocol/sdk': 1.29.0(zod@3.25.76)
+      '@types/validate-npm-package-name': 4.0.2
+      browserslist: 4.28.2
+      commander: 14.0.3
+      cosmiconfig: 9.0.2(typescript@5.9.3)
+      dedent: 1.7.2
+      deepmerge: 4.3.1
+      diff: 8.0.4
+      execa: 9.6.1
+      fast-glob: 3.3.3
+      fs-extra: 11.3.5
+      fuzzysort: 3.1.0
+      https-proxy-agent: 7.0.6
+      kleur: 4.1.5
+      msw: 2.14.6(@types/node@25.9.3)(typescript@5.9.3)
+      node-fetch: 3.3.2
+      open: 11.0.0
+      ora: 8.2.0
+      postcss: 8.5.15
+      postcss-selector-parser: 7.1.4
+      prompts: 2.4.2
+      recast: 0.23.11
+      stringify-object: 5.0.0
+      tailwind-merge: 3.6.0
+      ts-morph: 26.0.0
+      tsconfig-paths: 4.2.0
+      validate-npm-package-name: 7.0.2
+      zod: 3.25.76
+      zod-to-json-schema: 3.25.2(zod@3.25.76)
+    transitivePeerDependencies:
+      - '@cfworker/json-schema'
+      - '@types/node'
+      - babel-plugin-macros
+      - supports-color
+      - typescript
+
+  sharp@0.34.5:
+    dependencies:
+      '@img/colour': 1.1.0
+      detect-libc: 2.1.2
+      semver: 7.8.4
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.34.5
+      '@img/sharp-darwin-x64': 0.34.5
+      '@img/sharp-libvips-darwin-arm64': 1.2.4
+      '@img/sharp-libvips-darwin-x64': 1.2.4
+      '@img/sharp-libvips-linux-arm': 1.2.4
+      '@img/sharp-libvips-linux-arm64': 1.2.4
+      '@img/sharp-libvips-linux-ppc64': 1.2.4
+      '@img/sharp-libvips-linux-riscv64': 1.2.4
+      '@img/sharp-libvips-linux-s390x': 1.2.4
+      '@img/sharp-libvips-linux-x64': 1.2.4
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
+      '@img/sharp-linux-arm': 0.34.5
+      '@img/sharp-linux-arm64': 0.34.5
+      '@img/sharp-linux-ppc64': 0.34.5
+      '@img/sharp-linux-riscv64': 0.34.5
+      '@img/sharp-linux-s390x': 0.34.5
+      '@img/sharp-linux-x64': 0.34.5
+      '@img/sharp-linuxmusl-arm64': 0.34.5
+      '@img/sharp-linuxmusl-x64': 0.34.5
+      '@img/sharp-wasm32': 0.34.5
+      '@img/sharp-win32-arm64': 0.34.5
+      '@img/sharp-win32-ia32': 0.34.5
+      '@img/sharp-win32-x64': 0.34.5
+
+  shebang-command@2.0.0:
+    dependencies:
+      shebang-regex: 3.0.0
+
+  shebang-regex@3.0.0: {}
+
+  side-channel-list@1.0.1:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-map@1.0.1:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+
+  side-channel-weakmap@1.0.2:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-map: 1.0.1
+
+  side-channel@1.1.1:
+    dependencies:
+      es-errors: 1.3.0
+      object-inspect: 1.13.4
+      side-channel-list: 1.0.1
+      side-channel-map: 1.0.1
+      side-channel-weakmap: 1.0.2
+
+  signal-exit@3.0.7: {}
+
+  signal-exit@4.1.0: {}
+
+  sisteransi@1.0.5: {}
+
+  sonner@2.0.7(react-dom@19.2.7(react@19.2.7))(react@19.2.7):
+    dependencies:
+      react: 19.2.7
+      react-dom: 19.2.7(react@19.2.7)
+
+  source-map-js@1.2.1: {}
+
+  source-map-support@0.5.21:
+    dependencies:
+      buffer-from: 1.1.2
+      source-map: 0.6.1
+
+  source-map@0.6.1: {}
+
+  stable-hash@0.0.5: {}
+
+  statuses@2.0.2: {}
+
+  stdin-discarder@0.2.2: {}
+
+  stop-iteration-iterator@1.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      internal-slot: 1.1.0
+
+  strict-event-emitter@0.5.1: {}
+
+  string-ts@2.3.1: {}
+
+  string-width@4.2.3:
+    dependencies:
+      emoji-regex: 8.0.0
+      is-fullwidth-code-point: 3.0.0
+      strip-ansi: 6.0.1
+
+  string-width@7.2.0:
+    dependencies:
+      emoji-regex: 10.6.0
+      get-east-asian-width: 1.6.0
+      strip-ansi: 7.2.0
+
+  string.prototype.includes@2.0.1:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+
+  string.prototype.matchall@4.0.12:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-errors: 1.3.0
+      es-object-atoms: 1.1.2
+      get-intrinsic: 1.3.0
+      gopd: 1.2.0
+      has-symbols: 1.1.0
+      internal-slot: 1.1.0
+      regexp.prototype.flags: 1.5.4
+      set-function-name: 2.0.2
+      side-channel: 1.1.1
+
+  string.prototype.repeat@1.0.0:
+    dependencies:
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+
+  string.prototype.trim@1.2.11:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      define-data-property: 1.1.4
+      define-properties: 1.2.1
+      es-abstract: 1.24.2
+      es-object-atoms: 1.1.2
+      has-property-descriptors: 1.0.2
+      safe-regex-test: 1.1.0
+
+  string.prototype.trimend@1.0.10:
+    dependencies:
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.2
+
+  string.prototype.trimstart@1.0.8:
+    dependencies:
+      call-bind: 1.0.9
+      define-properties: 1.2.1
+      es-object-atoms: 1.1.2
+
+  stringify-object@5.0.0:
+    dependencies:
+      get-own-enumerable-keys: 1.0.0
+      is-obj: 3.0.0
+      is-regexp: 3.1.0
+
+  strip-ansi@6.0.1:
+    dependencies:
+      ansi-regex: 5.0.1
+
+  strip-ansi@7.2.0:
+    dependencies:
+      ansi-regex: 6.2.2
+
+  strip-bom@3.0.0: {}
+
+  strip-final-newline@2.0.0: {}
+
+  strip-final-newline@4.0.0: {}
+
+  strip-json-comments@3.1.1: {}
+
+  strnum@2.4.0:
+    dependencies:
+      anynum: 1.0.0
+
+  styled-jsx@5.1.6(@babel/core@7.29.7)(react@19.2.7):
+    dependencies:
+      client-only: 0.0.1
+      react: 19.2.7
+    optionalDependencies:
+      '@babel/core': 7.29.7
+
+  supports-color@10.2.2: {}
+
+  supports-color@7.2.0:
+    dependencies:
+      has-flag: 4.0.0
+
+  supports-preserve-symlinks-flag@1.0.0: {}
+
+  tagged-tag@1.0.0: {}
+
+  tailwind-merge@3.6.0: {}
+
+  tailwindcss@4.3.1: {}
+
+  tapable@2.3.3: {}
+
+  terser@5.16.9:
+    dependencies:
+      '@jridgewell/source-map': 0.3.11
+      acorn: 8.17.0
+      commander: 2.20.3
+      source-map-support: 0.5.21
+
+  tiny-invariant@1.3.3: {}
+
+  tinyexec@1.2.4: {}
+
+  tinyglobby@0.2.17:
+    dependencies:
+      fdir: 6.5.0(picomatch@4.0.4)
+      picomatch: 4.0.4
+
+  tldts-core@7.4.2: {}
+
+  tldts@7.4.2:
+    dependencies:
+      tldts-core: 7.4.2
+
+  to-regex-range@5.0.1:
+    dependencies:
+      is-number: 7.0.0
+
+  toidentifier@1.0.1: {}
+
+  tough-cookie@6.0.1:
+    dependencies:
+      tldts: 7.4.2
+
+  tr46@0.0.3: {}
+
+  ts-api-utils@2.5.0(typescript@5.9.3):
+    dependencies:
+      typescript: 5.9.3
+
+  ts-declaration-location@1.0.7(typescript@5.9.3):
+    dependencies:
+      picomatch: 4.0.4
+      typescript: 5.9.3
+
+  ts-morph@26.0.0:
+    dependencies:
+      '@ts-morph/common': 0.27.0
+      code-block-writer: 13.0.3
+
+  ts-pattern@5.9.0: {}
+
+  ts-tqdm@0.8.6: {}
+
+  tsconfig-paths@3.15.0:
+    dependencies:
+      '@types/json5': 0.0.29
+      json5: 1.0.2
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+
+  tsconfig-paths@4.2.0:
+    dependencies:
+      json5: 2.2.3
+      minimist: 1.2.8
+      strip-bom: 3.0.0
+
+  tslib@2.8.1: {}
+
+  tw-animate-css@1.4.0: {}
+
+  type-check@0.4.0:
+    dependencies:
+      prelude-ls: 1.2.1
+
+  type-fest@5.7.0:
+    dependencies:
+      tagged-tag: 1.0.0
+
+  type-is@2.1.0:
+    dependencies:
+      content-type: 2.0.0
+      media-typer: 1.1.0
+      mime-types: 3.0.2
+
+  typed-array-buffer@1.0.3:
+    dependencies:
+      call-bound: 1.0.4
+      es-errors: 1.3.0
+      is-typed-array: 1.1.15
+
+  typed-array-byte-length@1.0.3:
+    dependencies:
+      call-bind: 1.0.9
+      for-each: 0.3.5
+      gopd: 1.2.0
+      has-proto: 1.2.0
+      is-typed-array: 1.1.15
+
+  typed-array-byte-offset@1.0.4:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.9
+      for-each: 0.3.5
+      gopd: 1.2.0
+      has-proto: 1.2.0
+      is-typed-array: 1.1.15
+      reflect.getprototypeof: 1.0.10
+
+  typed-array-length@1.0.8:
+    dependencies:
+      call-bind: 1.0.9
+      for-each: 0.3.5
+      gopd: 1.2.0
+      is-typed-array: 1.1.15
+      possible-typed-array-names: 1.1.0
+      reflect.getprototypeof: 1.0.10
+
+  typescript-eslint@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3):
+    dependencies:
+      '@typescript-eslint/eslint-plugin': 8.61.0(@typescript-eslint/parser@8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3))(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/parser': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      '@typescript-eslint/typescript-estree': 8.61.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.61.0(eslint@9.39.4(jiti@2.7.0))(typescript@5.9.3)
+      eslint: 9.39.4(jiti@2.7.0)
+      typescript: 5.9.3
+    transitivePeerDependencies:
+      - supports-color
+
+  typescript@5.9.3: {}
+
+  unbox-primitive@1.1.0:
+    dependencies:
+      call-bound: 1.0.4
+      has-bigints: 1.1.0
+      has-symbols: 1.1.0
+      which-boxed-primitive: 1.1.1
+
+  undici-types@5.26.5: {}
+
+  undici-types@7.24.6: {}
+
+  undici@7.16.0: {}
+
+  undici@7.24.8: {}
+
+  unenv@2.0.0-rc.24:
+    dependencies:
+      pathe: 2.0.3
+
+  unicorn-magic@0.3.0: {}
+
+  universalify@2.0.1: {}
+
+  unpipe@1.0.0: {}
+
+  unrs-resolver@1.12.2:
+    dependencies:
+      napi-postinstall: 0.3.4
+    optionalDependencies:
+      '@unrs/resolver-binding-android-arm-eabi': 1.12.2
+      '@unrs/resolver-binding-android-arm64': 1.12.2
+      '@unrs/resolver-binding-darwin-arm64': 1.12.2
+      '@unrs/resolver-binding-darwin-x64': 1.12.2
+      '@unrs/resolver-binding-freebsd-x64': 1.12.2
+      '@unrs/resolver-binding-linux-arm-gnueabihf': 1.12.2
+      '@unrs/resolver-binding-linux-arm-musleabihf': 1.12.2
+      '@unrs/resolver-binding-linux-arm64-gnu': 1.12.2
+      '@unrs/resolver-binding-linux-arm64-musl': 1.12.2
+      '@unrs/resolver-binding-linux-loong64-gnu': 1.12.2
+      '@unrs/resolver-binding-linux-loong64-musl': 1.12.2
+      '@unrs/resolver-binding-linux-ppc64-gnu': 1.12.2
+      '@unrs/resolver-binding-linux-riscv64-gnu': 1.12.2
+      '@unrs/resolver-binding-linux-riscv64-musl': 1.12.2
+      '@unrs/resolver-binding-linux-s390x-gnu': 1.12.2
+      '@unrs/resolver-binding-linux-x64-gnu': 1.12.2
+      '@unrs/resolver-binding-linux-x64-musl': 1.12.2
+      '@unrs/resolver-binding-openharmony-arm64': 1.12.2
+      '@unrs/resolver-binding-wasm32-wasi': 1.12.2
+      '@unrs/resolver-binding-win32-arm64-msvc': 1.12.2
+      '@unrs/resolver-binding-win32-ia32-msvc': 1.12.2
+      '@unrs/resolver-binding-win32-x64-msvc': 1.12.2
+
+  until-async@3.0.2: {}
+
+  update-browserslist-db@1.2.3(browserslist@4.28.2):
+    dependencies:
+      browserslist: 4.28.2
+      escalade: 3.2.0
+      picocolors: 1.1.1
+
+  uri-js@4.4.1:
+    dependencies:
+      punycode: 2.3.1
+
+  urlpattern-polyfill@10.1.0: {}
+
+  use-sync-external-store@1.6.0(react@19.2.7):
+    dependencies:
+      react: 19.2.7
+
+  util-deprecate@1.0.2: {}
+
+  validate-npm-package-name@7.0.2: {}
+
+  vary@1.1.2: {}
+
+  web-streams-polyfill@3.3.3: {}
+
+  web-streams-polyfill@4.0.0-beta.3: {}
+
+  webidl-conversions@3.0.1: {}
+
+  whatwg-url@5.0.0:
+    dependencies:
+      tr46: 0.0.3
+      webidl-conversions: 3.0.1
+
+  which-boxed-primitive@1.1.1:
+    dependencies:
+      is-bigint: 1.1.0
+      is-boolean-object: 1.2.2
+      is-number-object: 1.1.1
+      is-string: 1.1.1
+      is-symbol: 1.1.1
+
+  which-builtin-type@1.2.1:
+    dependencies:
+      call-bound: 1.0.4
+      function.prototype.name: 1.2.0
+      has-tostringtag: 1.0.2
+      is-async-function: 2.1.1
+      is-date-object: 1.1.0
+      is-finalizationregistry: 1.1.1
+      is-generator-function: 1.1.2
+      is-regex: 1.2.1
+      is-weakref: 1.1.1
+      isarray: 2.0.5
+      which-boxed-primitive: 1.1.1
+      which-collection: 1.0.2
+      which-typed-array: 1.1.22
+
+  which-collection@1.0.2:
+    dependencies:
+      is-map: 2.0.3
+      is-set: 2.0.3
+      is-weakmap: 2.0.2
+      is-weakset: 2.0.4
+
+  which-typed-array@1.1.22:
+    dependencies:
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.9
+      call-bound: 1.0.4
+      for-each: 0.3.5
+      get-proto: 1.0.1
+      gopd: 1.2.0
+      has-tostringtag: 1.0.2
+
+  which@2.0.2:
+    dependencies:
+      isexe: 2.0.0
+
+  which@4.0.0:
+    dependencies:
+      isexe: 3.1.5
+
+  word-wrap@1.2.5: {}
+
+  workerd@1.20260611.1:
+    optionalDependencies:
+      '@cloudflare/workerd-darwin-64': 1.20260611.1
+      '@cloudflare/workerd-darwin-arm64': 1.20260611.1
+      '@cloudflare/workerd-linux-64': 1.20260611.1
+      '@cloudflare/workerd-linux-arm64': 1.20260611.1
+      '@cloudflare/workerd-windows-64': 1.20260611.1
+
+  wrangler@4.100.0:
+    dependencies:
+      '@cloudflare/kv-asset-handler': 0.5.0
+      '@cloudflare/unenv-preset': 2.16.1(unenv@2.0.0-rc.24)(workerd@1.20260611.1)
+      blake3-wasm: 2.1.5
+      esbuild: 0.27.3
+      miniflare: 4.20260611.0
+      path-to-regexp: 6.3.0
+      unenv: 2.0.0-rc.24
+      workerd: 1.20260611.1
+    optionalDependencies:
+      fsevents: 2.3.3
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  wrap-ansi@7.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  wrap-ansi@9.0.2:
+    dependencies:
+      ansi-styles: 6.2.3
+      string-width: 7.2.0
+      strip-ansi: 7.2.0
+
+  wrappy@1.0.2: {}
+
+  ws@8.20.1: {}
+
+  wsl-utils@0.3.1:
+    dependencies:
+      is-wsl: 3.1.1
+      powershell-utils: 0.1.0
+
+  xml-naming@0.1.0: {}
+
+  y18n@5.0.8: {}
+
+  yallist@3.1.1: {}
+
+  yaml@2.9.0: {}
+
+  yargs-parser@21.1.1: {}
+
+  yargs-parser@22.0.0: {}
+
+  yargs@17.7.2:
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+
+  yargs@18.0.0:
+    dependencies:
+      cliui: 9.0.1
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      string-width: 7.2.0
+      y18n: 5.0.8
+      yargs-parser: 22.0.0
+
+  yocto-queue@0.1.0: {}
+
+  yocto-spinner@1.2.0:
+    dependencies:
+      yoctocolors: 2.1.2
+
+  yoctocolors@2.1.2: {}
+
+  youch-core@0.3.3:
+    dependencies:
+      '@poppinss/exception': 1.2.3
+      error-stack-parser-es: 1.0.5
+
+  youch@4.1.0-beta.10:
+    dependencies:
+      '@poppinss/colors': 4.1.6
+      '@poppinss/dumper': 0.6.5
+      '@speed-highlight/core': 1.2.17
+      cookie: 1.1.1
+      youch-core: 0.3.3
+
+  zod-to-json-schema@3.25.2(zod@3.25.76):
+    dependencies:
+      zod: 3.25.76
+
+  zod-validation-error@4.0.2(zod@4.4.3):
+    dependencies:
+      zod: 4.4.3
+
+  zod@3.25.76: {}
+
+  zod@4.4.3: {}
diff --git a/web/postcss.config.mjs b/web/postcss.config.mjs
new file mode 100644
index 00000000..86e8e3c4
--- /dev/null
+++ b/web/postcss.config.mjs
@@ -0,0 +1,5 @@
+const config = {
+  plugins: ['@tailwindcss/postcss'],
+}
+
+export default config
diff --git a/web/public/_headers b/web/public/_headers
new file mode 100644
index 00000000..c846ea71
--- /dev/null
+++ b/web/public/_headers
@@ -0,0 +1,2 @@
+/_next/static/*
+  Cache-Control: public, max-age=31536000, immutable
diff --git a/web/public/logo.svg b/web/public/logo.svg
new file mode 100644
index 00000000..c34811be
--- /dev/null
+++ b/web/public/logo.svg
@@ -0,0 +1,19 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<defs>
+<linearGradient id="paint0_linear_2_12" x1="50" y1="0" x2="50" y2="100" gradientUnits="userSpaceOnUse">
+<stop stop-color="#9146FF"/>
+<stop offset="1"/>
+</linearGradient>
+</defs>
+<circle cx="50" cy="50" r="50" fill="url(#paint0_linear_2_12)"/>
+<mask id="mask0_2_12" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="15" y="32" width="70" height="33">
+<rect x="15" y="32" width="69.7793" height="33" fill="white"/>
+</mask>
+<g mask="url(#mask0_2_12)">
+<path d="M6.24302 73.762L44.1917 35.8133C46.1718 33.8332 47.1619 32.8431 48.3035 32.4722C49.3077 32.1459 50.3895 32.1459 51.3937 32.4722C52.5353 32.8431 53.5254 33.8332 55.5054 35.8133L56.3666 36.6744L12.761 80.28L6.24302 73.762Z" fill="white"/>
+<path d="M44.2383 35.8133C46.2184 33.8332 47.2085 32.8432 48.3501 32.4722C49.3543 32.1459 50.4361 32.1459 51.4403 32.4722C52.5819 32.8432 53.572 33.8332 55.552 35.8133L93.5008 73.762L86.9827 80.28L43.3772 36.6745L44.2383 35.8133Z" fill="white"/>
+<g style="mix-blend-mode:lighten">
+<rect x="38.6633" y="42.4162" width="61.6676" height="9.21788" transform="rotate(45 38.6633 42.4162)" fill="white"/>
+</g>
+</g>
+</svg>
diff --git a/web/public/video.webm b/web/public/video.webm
new file mode 100644
index 00000000..0a1ecbd1
Binary files /dev/null and b/web/public/video.webm differ
diff --git a/web/src/app/globals.css b/web/src/app/globals.css
new file mode 100644
index 00000000..e01ee0cb
--- /dev/null
+++ b/web/src/app/globals.css
@@ -0,0 +1,126 @@
+@import 'tailwindcss';
+@import 'tw-animate-css';
+@import 'shadcn/tailwind.css';
+
+@custom-variant dark (&:where(.dark, .dark *));
+
+@theme inline {
+  --font-sans: var(--font-sans);
+  --font-mono: var(--font-mono);
+  --color-sidebar-ring: var(--sidebar-ring);
+  --color-sidebar-border: var(--sidebar-border);
+  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+  --color-sidebar-accent: var(--sidebar-accent);
+  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+  --color-sidebar-primary: var(--sidebar-primary);
+  --color-sidebar-foreground: var(--sidebar-foreground);
+  --color-sidebar: var(--sidebar);
+  --color-chart-5: var(--chart-5);
+  --color-chart-4: var(--chart-4);
+  --color-chart-3: var(--chart-3);
+  --color-chart-2: var(--chart-2);
+  --color-chart-1: var(--chart-1);
+  --color-ring: var(--ring);
+  --color-input: var(--input);
+  --color-border: var(--border);
+  --color-destructive: var(--destructive);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-accent: var(--accent);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-muted: var(--muted);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-secondary: var(--secondary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-primary: var(--primary);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-popover: var(--popover);
+  --color-card-foreground: var(--card-foreground);
+  --color-card: var(--card);
+  --color-foreground: var(--foreground);
+  --color-background: var(--background);
+  --radius-sm: calc(var(--radius) - 4px);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) + 4px);
+  --radius-2xl: calc(var(--radius) + 8px);
+  --radius-3xl: calc(var(--radius) + 12px);
+  --radius-4xl: calc(var(--radius) + 16px);
+}
+
+:root {
+  --background: oklch(1 0 0);
+  --foreground: oklch(0.145 0 0);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0.145 0 0);
+  --popover: oklch(1 0 0);
+  --popover-foreground: oklch(0.145 0 0);
+  --primary: oklch(0.541 0.281 293.009);
+  --primary-foreground: oklch(0.969 0.016 293.756);
+  --secondary: oklch(0.967 0.001 286.375);
+  --secondary-foreground: oklch(0.21 0.006 285.885);
+  --muted: oklch(0.97 0 0);
+  --muted-foreground: oklch(0.556 0 0);
+  --accent: oklch(0.97 0 0);
+  --accent-foreground: oklch(0.205 0 0);
+  --destructive: oklch(0.58 0.22 27);
+  --border: oklch(0.922 0 0);
+  --input: oklch(0.922 0 0);
+  --ring: oklch(0.708 0 0);
+  --chart-1: oklch(0.811 0.111 293.571);
+  --chart-2: oklch(0.606 0.25 292.717);
+  --chart-3: oklch(0.541 0.281 293.009);
+  --chart-4: oklch(0.491 0.27 292.581);
+  --chart-5: oklch(0.432 0.232 292.759);
+  --radius: 0.625rem;
+  --sidebar: oklch(0.985 0 0);
+  --sidebar-foreground: oklch(0.145 0 0);
+  --sidebar-primary: oklch(0.541 0.281 293.009);
+  --sidebar-primary-foreground: oklch(0.969 0.016 293.756);
+  --sidebar-accent: oklch(0.97 0 0);
+  --sidebar-accent-foreground: oklch(0.205 0 0);
+  --sidebar-border: oklch(0.922 0 0);
+  --sidebar-ring: oklch(0.708 0 0);
+}
+
+.dark {
+  --background: oklch(0.145 0 0);
+  --foreground: oklch(0.985 0 0);
+  --card: oklch(0.205 0 0);
+  --card-foreground: oklch(0.985 0 0);
+  --popover: oklch(0.205 0 0);
+  --popover-foreground: oklch(0.985 0 0);
+  --primary: oklch(0.606 0.25 292.717);
+  --primary-foreground: oklch(0.969 0.016 293.756);
+  --secondary: oklch(0.274 0.006 286.033);
+  --secondary-foreground: oklch(0.985 0 0);
+  --muted: oklch(0.269 0 0);
+  --muted-foreground: oklch(0.708 0 0);
+  --accent: oklch(0.371 0 0);
+  --accent-foreground: oklch(0.985 0 0);
+  --destructive: oklch(0.704 0.191 22.216);
+  --border: oklch(1 0 0 / 10%);
+  --input: oklch(1 0 0 / 15%);
+  --ring: oklch(0.556 0 0);
+  --chart-1: oklch(0.811 0.111 293.571);
+  --chart-2: oklch(0.606 0.25 292.717);
+  --chart-3: oklch(0.541 0.281 293.009);
+  --chart-4: oklch(0.491 0.27 292.581);
+  --chart-5: oklch(0.432 0.232 292.759);
+  --sidebar: oklch(0.205 0 0);
+  --sidebar-foreground: oklch(0.985 0 0);
+  --sidebar-primary: oklch(0.606 0.25 292.717);
+  --sidebar-primary-foreground: oklch(0.969 0.016 293.756);
+  --sidebar-accent: oklch(0.269 0 0);
+  --sidebar-accent-foreground: oklch(0.985 0 0);
+  --sidebar-border: oklch(1 0 0 / 10%);
+  --sidebar-ring: oklch(0.556 0 0);
+}
+
+@layer base {
+  * {
+    @apply border-border outline-ring/50;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
+}
diff --git a/web/src/app/icon.svg b/web/src/app/icon.svg
new file mode 100644
index 00000000..c34811be
--- /dev/null
+++ b/web/src/app/icon.svg
@@ -0,0 +1,19 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+<defs>
+<linearGradient id="paint0_linear_2_12" x1="50" y1="0" x2="50" y2="100" gradientUnits="userSpaceOnUse">
+<stop stop-color="#9146FF"/>
+<stop offset="1"/>
+</linearGradient>
+</defs>
+<circle cx="50" cy="50" r="50" fill="url(#paint0_linear_2_12)"/>
+<mask id="mask0_2_12" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="15" y="32" width="70" height="33">
+<rect x="15" y="32" width="69.7793" height="33" fill="white"/>
+</mask>
+<g mask="url(#mask0_2_12)">
+<path d="M6.24302 73.762L44.1917 35.8133C46.1718 33.8332 47.1619 32.8431 48.3035 32.4722C49.3077 32.1459 50.3895 32.1459 51.3937 32.4722C52.5353 32.8431 53.5254 33.8332 55.5054 35.8133L56.3666 36.6744L12.761 80.28L6.24302 73.762Z" fill="white"/>
+<path d="M44.2383 35.8133C46.2184 33.8332 47.2085 32.8432 48.3501 32.4722C49.3543 32.1459 50.4361 32.1459 51.4403 32.4722C52.5819 32.8432 53.572 33.8332 55.552 35.8133L93.5008 73.762L86.9827 80.28L43.3772 36.6745L44.2383 35.8133Z" fill="white"/>
+<g style="mix-blend-mode:lighten">
+<rect x="38.6633" y="42.4162" width="61.6676" height="9.21788" transform="rotate(45 38.6633 42.4162)" fill="white"/>
+</g>
+</g>
+</svg>
diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx
new file mode 100644
index 00000000..bb5b3a14
--- /dev/null
+++ b/web/src/app/layout.tsx
@@ -0,0 +1,65 @@
+import { Providers } from '@/components/Providers'
+import { type Metadata } from 'next'
+import { Inter, JetBrains_Mono } from 'next/font/google'
+import { twJoin } from 'tailwind-merge'
+import './globals.css'
+
+const fontSans = Inter({
+  subsets: ['latin'],
+  variable: '--font-sans',
+  axes: ['opsz'],
+})
+const fontMono = JetBrains_Mono({
+  subsets: ['latin'],
+  variable: '--font-mono',
+})
+
+export const metadata: Metadata = {
+  metadataBase: new URL('https://frostyapp.io'),
+  title: {
+    default: 'Frosty for Twitch',
+    template: '%s — Frosty',
+  },
+  description:
+    'A fast, open-source Twitch client for iOS and Android with native 7TV, BTTV, and FFZ emote support.',
+  openGraph: {
+    siteName: 'Frosty',
+    locale: 'en_US',
+    type: 'website',
+  },
+  twitter: {
+    card: 'summary_large_image',
+  },
+  alternates: {
+    canonical: '/',
+  },
+}
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode
+}>) {
+  return (
+    <html lang='en' suppressHydrationWarning>
+      <head>
+        <link
+          rel='preconnect'
+          href='https://cdn.7tv.app'
+          crossOrigin='anonymous'
+        />
+      </head>
+      <body
+        className={twJoin(
+          'selection:bg-primary selection:text-primary-foreground min-h-dvh overscroll-none font-sans underline-offset-4 antialiased',
+          fontSans.variable,
+          fontMono.variable,
+        )}
+      >
+        <Providers>
+          <main>{children}</main>
+        </Providers>
+      </body>
+    </html>
+  )
+}
diff --git a/web/src/app/opengraph-image.png b/web/src/app/opengraph-image.png
new file mode 100644
index 00000000..3f6190bf
Binary files /dev/null and b/web/src/app/opengraph-image.png differ
diff --git a/web/src/app/page.tsx b/web/src/app/page.tsx
new file mode 100644
index 00000000..28423320
--- /dev/null
+++ b/web/src/app/page.tsx
@@ -0,0 +1,441 @@
+'use client'
+
+import screenshotCategories from '@/assets/screenshot-categories.png'
+import screenshotFollowing from '@/assets/screenshot-following.png'
+import screenshotSettings from '@/assets/screenshot-settings.png'
+import { EmotePhysicsBackground } from '@/components/EmotePhysicsBackground'
+import { Footer } from '@/components/Footer'
+import { Header } from '@/components/Header'
+import { Button } from '@/components/ui/button'
+import {
+  appStoreLink,
+  bttvLink,
+  ffzLink,
+  playStoreLink,
+  sevenTvLink,
+} from '@/lib/constants'
+import { cn } from '@/lib/utils'
+import { ChevronLeft, ChevronRight } from 'lucide-react'
+import { AnimatePresence, motion } from 'motion/react'
+import Image, { type StaticImageData } from 'next/image'
+import {
+  useCallback,
+  useEffect,
+  useRef,
+  useState,
+  useSyncExternalStore,
+} from 'react'
+import { SiApple, SiGoogleplay } from 'react-icons/si'
+
+const features = [
+  {
+    title: 'Native emotes',
+    description: 'Watch and chat with 7TV, BetterTTV, and FrankerFaceZ emotes.',
+    media: { type: 'video' as const, src: '/video.webm' },
+  },
+  {
+    title: 'Followed channels',
+    description:
+      'See who is live, pin favorites, and browse your followed list.',
+    media: { type: 'image' as const, src: screenshotFollowing },
+  },
+  {
+    title: 'Explore categories',
+    description: 'Browse top streams and trending categories across Twitch.',
+    media: { type: 'image' as const, src: screenshotCategories },
+  },
+  {
+    title: 'Deeply customizable',
+    description:
+      'Themes, autocomplete, sleep timers, and local message history.',
+    media: { type: 'image' as const, src: screenshotSettings },
+  },
+]
+
+// ─── Entrance animation variants ─────────────────────────────────────────────
+const item = {
+  hidden: { opacity: 0, y: 20, filter: 'blur(4px)' },
+  visible: {
+    opacity: 1,
+    y: 0,
+    filter: 'blur(0px)',
+    transition: { duration: 0.5, ease: 'easeOut' as const },
+  },
+}
+
+const staggerContainer = {
+  hidden: {},
+  visible: { transition: { staggerChildren: 0.12 } },
+}
+
+function DownloadButtons() {
+  return (
+    <div className='flex flex-wrap justify-center gap-3'>
+      <Button
+        variant='outline'
+        size='lg'
+        className='bg-background h-14 rounded-xl px-6'
+        render={<a href={appStoreLink} target='_blank' rel='noreferrer' />}
+      >
+        <SiApple className='mr-2.5 size-6 text-blue-500 dark:text-blue-400' />
+        <div className='flex flex-col items-start'>
+          <span className='text-xs leading-tight font-normal opacity-60'>
+            Download on the
+          </span>
+          <span className='text-base leading-tight font-semibold'>
+            App Store
+          </span>
+        </div>
+      </Button>
+      <Button
+        variant='outline'
+        size='lg'
+        className='bg-background h-14 rounded-xl px-6'
+        render={<a href={playStoreLink} target='_blank' rel='noreferrer' />}
+      >
+        <SiGoogleplay className='mr-2.5 size-5 text-green-500 dark:text-green-400' />
+        <div className='flex flex-col items-start'>
+          <span className='text-xs leading-tight font-normal opacity-60'>
+            Get it on
+          </span>
+          <span className='text-base leading-tight font-semibold'>
+            Google Play
+          </span>
+        </div>
+      </Button>
+    </div>
+  )
+}
+
+function PhoneFrame({
+  children,
+  className,
+}: {
+  children?: React.ReactNode
+  className?: string
+}) {
+  return (
+    <div className={cn('aspect-[6/13]', className)}>
+      <div className='border-border/50 size-full overflow-hidden rounded-4xl border bg-black p-1 shadow-xl'>
+        <div className='relative size-full overflow-hidden rounded-4xl'>
+          {children}
+        </div>
+      </div>
+    </div>
+  )
+}
+
+function PhoneMedia({
+  media,
+  title,
+  isCurrent,
+}: {
+  media:
+    | { type: 'video'; src: string }
+    | { type: 'image'; src: StaticImageData }
+  title: string
+  isCurrent: boolean
+}) {
+  const videoRef = useRef<HTMLVideoElement>(null)
+
+  useEffect(() => {
+    if (media.type !== 'video') return
+    const video = videoRef.current
+    if (!video) return
+    if (isCurrent) {
+      void video.play()
+    } else {
+      video.pause()
+    }
+  }, [isCurrent, media.type])
+
+  return (
+    <div className='relative size-full bg-black'>
+      {media.type === 'video' ? (
+        <video
+          ref={videoRef}
+          src={media.src}
+          loop
+          muted
+          playsInline
+          className='size-full object-contain'
+        />
+      ) : (
+        <Image
+            src={media.src}
+            alt={title}
+            fill
+            sizes='(min-width: 768px) 352px, 240px'
+            className='object-contain'
+          />
+      )}
+    </div>
+  )
+}
+
+const STEP_MOBILE = 260
+const STEP_DESKTOP = 370
+const stepQuery = '(min-width: 768px)'
+function subscribeStep(callback: () => void) {
+  const mq = window.matchMedia(stepQuery)
+  mq.addEventListener('change', callback)
+  return () => mq.removeEventListener('change', callback)
+}
+function getStepSnapshot() {
+  return window.matchMedia(stepQuery).matches ? STEP_DESKTOP : STEP_MOBILE
+}
+function getStepServerSnapshot() {
+  return STEP_DESKTOP
+}
+
+function Carousel() {
+  const [current, setCurrent] = useState(0)
+  const [hovered, setHovered] = useState<number | null>(null)
+  const step = useSyncExternalStore(
+    subscribeStep,
+    getStepSnapshot,
+    getStepServerSnapshot,
+  )
+
+  const touchStartRef = useRef(0)
+  const regionRef = useRef<HTMLDivElement>(null)
+
+  const go = useCallback((delta: number) => {
+    setCurrent((prev) =>
+      Math.max(0, Math.min(features.length - 1, prev + delta)),
+    )
+    regionRef.current?.focus()
+  }, [])
+
+  return (
+    <div className='flex h-full flex-col items-center justify-center gap-4'>
+      {/* Phone track with overlay arrows */}
+      <div
+        ref={regionRef}
+        role='region'
+        aria-roledescription='carousel'
+        aria-label='App features'
+        tabIndex={0}
+        className='relative h-full max-h-130 min-h-0 w-full shrink touch-pan-y overflow-hidden focus-visible:outline-none md:max-h-200'
+        onKeyDown={(e) => {
+          if (e.key === 'ArrowLeft') {
+            e.preventDefault()
+            go(-1)
+          } else if (e.key === 'ArrowRight') {
+            e.preventDefault()
+            go(1)
+          }
+        }}
+        onTouchStart={(e) => {
+          touchStartRef.current = e.touches[0]!.clientX
+        }}
+        onTouchEnd={(e) => {
+          const delta = e.changedTouches[0]!.clientX - touchStartRef.current
+          if (delta > 50) go(-1)
+          else if (delta < -50) go(1)
+        }}
+      >
+        {/* Animated phones on the track */}
+        {features.map((feature, i) => {
+          const offset = i - current
+
+          if (Math.abs(offset) > 2) return null
+
+          return (
+            <motion.div
+              key={feature.title}
+              role='group'
+              aria-roledescription='slide'
+              aria-label={`${i + 1} of ${features.length}: ${feature.title}`}
+              initial={{ x: offset * step, opacity: 0 }}
+              animate={{
+                x: offset * step,
+                opacity:
+                  offset === 0
+                    ? 1
+                    : Math.abs(offset) === 1
+                      ? hovered === i
+                        ? 0.5
+                        : 0.25
+                      : 0,
+              }}
+              transition={{ type: 'spring', stiffness: 300, damping: 30 }}
+              className='pointer-events-none absolute inset-0 flex items-center justify-center'
+            >
+              <div
+                className={cn(
+                  'flex h-full items-center justify-center',
+                  Math.abs(offset) === 1 &&
+                    'pointer-events-auto cursor-pointer',
+                )}
+                {...(Math.abs(offset) === 1
+                  ? {
+                      role: 'button',
+                      tabIndex: 0,
+                      'aria-label': `Go to ${feature.title}`,
+                      onMouseEnter: () => setHovered(i),
+                      onMouseLeave: () => setHovered(null),
+                      onClick: () => go(offset),
+                      onKeyDown: (e: React.KeyboardEvent) => {
+                        if (e.key === 'Enter' || e.key === ' ') {
+                          e.preventDefault()
+                          go(offset)
+                        }
+                      },
+                    }
+                  : undefined)}
+              >
+                <PhoneFrame className='h-full max-h-130 max-w-60 md:max-h-190 md:max-w-88'>
+                  <PhoneMedia
+                    media={feature.media}
+                    title={feature.title}
+                    isCurrent={offset === 0}
+                  />
+                </PhoneFrame>
+              </div>
+            </motion.div>
+          )
+        })}
+
+        {/* Arrow overlays */}
+        <AnimatePresence>
+          {current > 0 && (
+            <motion.div
+              key='prev'
+              initial={{ opacity: 0, x: -8 }}
+              animate={{ opacity: 1, x: 0 }}
+              exit={{ opacity: 0, x: -8 }}
+              transition={{ duration: 0.2, ease: 'easeOut' }}
+              className='absolute top-1/2 left-4 z-10 -translate-y-1/2'
+            >
+              <Button
+                variant='ghost'
+                size='icon'
+                onClick={() => go(-1)}
+                aria-label='Previous feature'
+              >
+                <ChevronLeft />
+              </Button>
+            </motion.div>
+          )}
+          {current < features.length - 1 && (
+            <motion.div
+              key='next'
+              initial={{ opacity: 0, x: 8 }}
+              animate={{ opacity: 1, x: 0 }}
+              exit={{ opacity: 0, x: 8 }}
+              transition={{ duration: 0.2, ease: 'easeOut' }}
+              className='absolute top-1/2 right-4 z-10 -translate-y-1/2'
+            >
+              <Button
+                variant='ghost'
+                size='icon'
+                onClick={() => go(1)}
+                aria-label='Next feature'
+              >
+                <ChevronRight />
+              </Button>
+            </motion.div>
+          )}
+        </AnimatePresence>
+      </div>
+
+      {/* Description */}
+      <span className='sr-only' aria-live='polite' aria-atomic>
+        {features[current]?.title}: {features[current]?.description}
+      </span>
+      <div className='min-h-10 px-4 text-center' aria-hidden>
+        <AnimatePresence mode='wait'>
+          <motion.p
+            key={current}
+            initial={{ opacity: 0, y: 4, filter: 'blur(4px)' }}
+            animate={{ opacity: 1, y: 0, filter: 'blur(0px)' }}
+            exit={{ opacity: 0, y: -4, filter: 'blur(4px)' }}
+            transition={{ duration: 0.3, ease: 'easeOut' }}
+            className='text-muted-foreground text-sm'
+          >
+            {features[current]?.description}
+          </motion.p>
+        </AnimatePresence>
+      </div>
+    </div>
+  )
+}
+
+export default function Home() {
+  return (
+    <div className='grid h-dvh grid-rows-[auto_1fr] overflow-hidden md:grid-cols-2 md:grid-rows-none'>
+      {/* Left cell — intro */}
+      <motion.div
+        className='bg-muted/50 dark:bg-muted/30 relative flex flex-col gap-4 overflow-hidden px-4'
+        initial='hidden'
+        animate='visible'
+        variants={staggerContainer}
+      >
+        <EmotePhysicsBackground />
+        <motion.div variants={item} className='relative z-20 pt-4'>
+          <Header />
+        </motion.div>
+
+        <motion.div
+          variants={staggerContainer}
+          className='relative z-10 flex flex-1 flex-col items-center justify-center gap-4 text-center md:gap-6'
+        >
+          <motion.div variants={item} className='flex flex-col gap-3 md:gap-4'>
+            <h1 className='text-2xl font-semibold tracking-tight text-pretty md:text-4xl'>
+              Watch Twitch on mobile with
+              <br />
+              <a
+                href={sevenTvLink}
+                target='_blank'
+                rel='noreferrer'
+                className='text-primary underline'
+              >
+                7TV
+              </a>
+              ,{' '}
+              <a
+                href={bttvLink}
+                target='_blank'
+                rel='noreferrer'
+                className='text-primary underline'
+              >
+                BTTV
+              </a>
+              , and{' '}
+              <a
+                href={ffzLink}
+                target='_blank'
+                rel='noreferrer'
+                className='text-primary underline'
+              >
+                FFZ
+              </a>{' '}
+              emotes
+            </h1>
+            <p className='text-muted-foreground mx-auto max-w-md text-sm text-balance md:max-w-lg md:text-base'>
+              Frosty is a fast, open-source Twitch client for iOS and Android
+              with native 7TV, BTTV, and FFZ support.
+            </p>
+          </motion.div>
+          <motion.div variants={item}>
+            <DownloadButtons />
+          </motion.div>
+        </motion.div>
+        <motion.div variants={item} className='z-30'>
+          <Footer />
+        </motion.div>
+      </motion.div>
+
+      {/* Right cell — carousel */}
+      <motion.div
+        className='flex min-h-0 flex-col overflow-hidden py-4'
+        initial={{ opacity: 0, y: 30, filter: 'blur(4px)' }}
+        animate={{ opacity: 1, y: 0, filter: 'blur(0px)' }}
+        transition={{ duration: 0.6, ease: 'easeOut', delay: 0.4 }}
+      >
+        <Carousel />
+      </motion.div>
+    </div>
+  )
+}
diff --git a/web/src/app/privacy/page.tsx b/web/src/app/privacy/page.tsx
new file mode 100644
index 00000000..f0b63a00
--- /dev/null
+++ b/web/src/app/privacy/page.tsx
@@ -0,0 +1,158 @@
+import type { Metadata } from 'next'
+import Image from 'next/image'
+import Link from 'next/link'
+
+export const metadata: Metadata = {
+  title: 'Privacy Policy',
+  description:
+    'Privacy policy for Frosty, an open-source Twitch client for iOS and Android.',
+  alternates: {
+    canonical: '/privacy',
+  },
+}
+
+function ExtLink({
+  href,
+  children,
+}: {
+  href: string
+  children: React.ReactNode
+}) {
+  return (
+    <a
+      href={href}
+      target='_blank'
+      rel='noreferrer'
+      className='text-muted-foreground decoration-muted-foreground/40 hover:text-foreground hover:decoration-foreground/40 underline underline-offset-4 transition-colors'
+    >
+      {children}
+    </a>
+  )
+}
+
+export default function Privacy() {
+  return (
+    <div className='mx-auto max-w-2xl px-6 py-12 font-mono'>
+      <Link href='/' className='mb-12 flex items-center gap-2'>
+        <Image src='/logo.svg' alt='' width={24} height={24} />
+        <span className='text-foreground font-sans text-sm font-semibold'>
+          Frosty
+        </span>
+      </Link>
+
+      <h1 className='text-foreground text-2xl font-bold tracking-tight'>
+        Privacy Policy
+      </h1>
+      <p className='text-muted-foreground mt-1 text-sm'>
+        Last updated: February 2026
+      </p>
+
+      <p className='text-muted-foreground mt-8 text-sm leading-relaxed'>
+        Frosty is an unofficial open-source mobile Twitch client for iOS and
+        Android. We are dedicated to protecting your privacy. Frosty does not
+        collect or share any personal information. However, we may gather
+        anonymous usage data and crash logs solely to improve the app. For more
+        information, please refer to the sections below.
+      </p>
+
+      <h2 className='text-foreground mt-10 text-lg font-semibold tracking-tight'>
+        Third-party services
+      </h2>
+      <p className='text-muted-foreground mt-3 text-sm leading-relaxed'>
+        Frosty uses and interacts with the following services in order to
+        provide the best experience possible:
+      </p>
+
+      <h3 className='text-foreground mt-8 text-base font-semibold'>Twitch</h3>
+      <p className='text-muted-foreground mt-2 text-sm leading-relaxed'>
+        Frosty uses the official Twitch API to showcase live channels, connect
+        to chat, and provide additional features. You can optionally log in with
+        your Twitch account to access user-specific features, such as sending
+        chat messages and viewing your followed channels.
+      </p>
+      <p className='text-muted-foreground mt-3 text-sm leading-relaxed'>
+        If you log in using Twitch, Frosty will only ask you for the necessary
+        and required permissions to function. Frosty will then obtain your OAuth
+        access token and send requests to receive and transmit data to Twitch
+        only on your behalf. This access token is stored and encrypted locally
+        on your device only.
+      </p>
+      <p className='text-muted-foreground mt-3 text-sm leading-relaxed'>
+        For more information on how Twitch handles your data, please refer to
+        their{' '}
+        <ExtLink href='https://www.twitch.tv/p/en/legal/privacy-notice/'>
+          privacy policy
+        </ExtLink>
+        .
+      </p>
+
+      <h3 className='text-foreground mt-8 text-base font-semibold'>
+        7TV, BetterTTV, and FrankerFaceZ
+      </h3>
+      <p className='text-muted-foreground mt-2 text-sm leading-relaxed'>
+        Frosty uses APIs from 7TV, BetterTTV (BTTV), and FrankerFaceZ (FFZ) to
+        display custom badges and emotes in chat. When you view a channel,
+        Frosty will request these services using the channel&apos;s public
+        Twitch ID or username to obtain emotes and badges associated with that
+        channel.
+      </p>
+      <p className='text-muted-foreground mt-3 text-sm leading-relaxed'>
+        For more information on how these services handle your data, please
+        refer to their respective privacy policies:{' '}
+        <ExtLink href='https://7tv.app/legal/privacy'>7TV</ExtLink>,{' '}
+        <ExtLink href='https://betterttv.com/privacy'>BTTV</ExtLink>, and{' '}
+        <ExtLink href='https://www.frankerfacez.com/privacy'>FFZ</ExtLink>.
+      </p>
+
+      <h3 className='text-foreground mt-8 text-base font-semibold'>Firebase</h3>
+      <p className='text-muted-foreground mt-2 text-sm leading-relaxed'>
+        Frosty utilizes Firebase for crash reporting, performance monitoring,
+        and analytics to aid in the development of new features, improvements,
+        and bug fixes. Data collected may include device model, OS version,
+        crash traces, session analytics, and network performance traces. This
+        data is anonymous and does not contain any personal information. You can
+        opt out of this data collection by turning off crash logs and analytics
+        in the settings.
+      </p>
+      <p className='text-muted-foreground mt-3 text-sm leading-relaxed'>
+        Firebase retains analytics and crash data according to its default
+        retention periods. For more information, please refer to the{' '}
+        <ExtLink href='https://firebase.google.com/support/privacy'>
+          Firebase privacy policy
+        </ExtLink>
+        .
+      </p>
+
+      <h2 className='text-foreground mt-10 text-lg font-semibold tracking-tight'>
+        Data retention
+      </h2>
+      <p className='text-muted-foreground mt-3 text-sm leading-relaxed'>
+        Frosty does not operate its own servers or databases. All data
+        collection is handled by Firebase, which retains data according to its
+        default retention policies.
+      </p>
+
+      <h2 className='text-foreground mt-10 text-lg font-semibold tracking-tight'>
+        Privacy policy updates
+      </h2>
+      <p className='text-muted-foreground mt-3 text-sm leading-relaxed'>
+        We may occasionally update this privacy policy, and the most recent
+        version will always be available on this page. We recommend reviewing
+        this privacy policy periodically for any changes. Changes to this
+        privacy policy become effective when they are posted on this page.
+      </p>
+
+      <h2 className='text-foreground mt-10 text-lg font-semibold tracking-tight'>
+        Contact
+      </h2>
+      <p className='text-muted-foreground mt-3 text-sm leading-relaxed'>
+        If you have any questions or suggestions about this privacy policy,
+        please feel free to contact us at{' '}
+        <ExtLink href='mailto:contact@frostyapp.io'>
+          contact@frostyapp.io
+        </ExtLink>
+        .
+      </p>
+    </div>
+  )
+}
diff --git a/web/src/app/robots.ts b/web/src/app/robots.ts
new file mode 100644
index 00000000..99399645
--- /dev/null
+++ b/web/src/app/robots.ts
@@ -0,0 +1,8 @@
+import type { MetadataRoute } from 'next'
+
+export default function robots(): MetadataRoute.Robots {
+  return {
+    rules: { userAgent: '*', allow: '/' },
+    sitemap: 'https://frostyapp.io/sitemap.xml',
+  }
+}
diff --git a/web/src/app/sitemap.ts b/web/src/app/sitemap.ts
new file mode 100644
index 00000000..88fcefad
--- /dev/null
+++ b/web/src/app/sitemap.ts
@@ -0,0 +1,12 @@
+import type { MetadataRoute } from 'next'
+
+export default function sitemap(): MetadataRoute.Sitemap {
+  return [
+    { url: 'https://frostyapp.io', lastModified: new Date(), priority: 1 },
+    {
+      url: 'https://frostyapp.io/privacy',
+      lastModified: new Date(),
+      priority: 0.3,
+    },
+  ]
+}
diff --git a/web/src/assets/screenshot-categories.png b/web/src/assets/screenshot-categories.png
new file mode 100644
index 00000000..3bb468b0
Binary files /dev/null and b/web/src/assets/screenshot-categories.png differ
diff --git a/web/src/assets/screenshot-channel.png b/web/src/assets/screenshot-channel.png
new file mode 100644
index 00000000..e8f40159
Binary files /dev/null and b/web/src/assets/screenshot-channel.png differ
diff --git a/web/src/assets/screenshot-following.png b/web/src/assets/screenshot-following.png
new file mode 100644
index 00000000..8c5ab0d6
Binary files /dev/null and b/web/src/assets/screenshot-following.png differ
diff --git a/web/src/assets/screenshot-settings.png b/web/src/assets/screenshot-settings.png
new file mode 100644
index 00000000..2cd0970b
Binary files /dev/null and b/web/src/assets/screenshot-settings.png differ
diff --git a/web/src/components/EmotePhysicsBackground.tsx b/web/src/components/EmotePhysicsBackground.tsx
new file mode 100644
index 00000000..d93fbfab
--- /dev/null
+++ b/web/src/components/EmotePhysicsBackground.tsx
@@ -0,0 +1,577 @@
+'use client'
+
+import { animate, type AnimationPlaybackControls } from 'motion'
+import { useEffect, useRef } from 'react'
+
+// ─── 7TV emotes ─────────────────────────────────────────────────────────────
+// Curated mix of channel, global, and popular emotes.
+// Images load directly from cdn.7tv.app.
+const EMOTE_IDS = [
+  // ─── xQc channel set ───
+  '01FZ975PV8000B4AWRZNMVNEXN', // LOL
+  '01GBPSCGR00007Q17796BDN5AJ', // Classic
+  '01JP0FG0NN10YJPYVTZN5K67WY', // LO
+  '01F6MZGCNG000255K4X1K7NTHR', // GIGACHAD
+  '01HTKMB7680004B0MV8TERR9A4', // AURA
+  '01F00Z3A9G0007E4VV006YKSK9', // OMEGALUL
+  '01HMBMJPV0000D32KQCYBK4S1D', // aga
+  '01F71VQYHR000D3ZZ6Q11NR7TV', // WW
+  '01FS5ZCFG0000500DPPCXJWCP8', // o7
+  '01F7CTADRG000351ERP2WA0ME9', // FLASHBANG
+  '01F6T8NM9R0007M5BTFWSP1YSJ', // Clueless
+  '01F22WE74G000F9Q0G00A2DE8N', // LULW
+  '01F6TCFKM0000CBRZV8MZ7ZGGH', // Deadass
+  '01F6MG1HPR0009K1N00D4GG63Z', // ICANT
+  '01FHNBZRW8000C3ZWT2Z63JS92', // Sadge
+  '01EZTCN91800012PTN006Q50PR', // Pog
+  '01FFWH9WV80000JT8GHDKHJNZC', // Aware
+  '01F010F9GR0007E4VV006YKSKN', // PepeLaugh
+  '01F6MA6Y100002B6P5MWZ5D916', // Hmm
+  '01F6NACCD80006SZ7ZW5FMWKWK', // Prayge
+  '01FG1NDHJR0001XDR7G9054X2Q', // HUH
+  '01GFBTYEV80008P4E5PB4NX0XC', // DIESOFCRINGE
+  '01F6MDFCSR0000WDA7ERT623YT', // NODDERS
+  '01F6MQ33FG000FFJ97ZB8MWV52', // catJAM
+  '01EZY967K0000CYST6006V20T8', // pepeJAM
+  '01F6NMMEER00015NVG2J8ZH77N', // peepoHey
+  '01H3ZS4R1R0003PH84VNH1WMYC', // Madge
+  '01F6MMQCM80009C9ZSNZT3GTK1', // PagChomp
+  '01FAJR9X80000136YH153JYZTB', // modCheck
+  '01G7RNEB2R00029YRR37CZ24HX', // LockIn
+  '01G7YR9X5G0003Z50SB3FM5WR4', // Happi
+  '01GBEBQQN00001RAQMJBWFVDXF', // COOKING
+  '01JJ0D0C2XWZ640NP4WJKB8MYX', // Cooked
+  '01GY1RDSR8000ENJJARE9FMTJR', // SLAY
+  '01FBZESCNR000A6AWCB1X558GZ', // Chatting
+  '01GF1Y2Q5G0000BGNJSP34TQRD', // widepeepoHappy
+
+  // ─── 7TV global emotes ───
+  '01FCY771D800007PQ2DF3GDTN6', // RainTime
+  '01FE3XY508000AA32JP519W2EW', // PETPET
+  '01GGD5PJA8000FH13S498E9D8X', // ppL
+  '01GB2TN09G000AZXHZ8HNEZX6G', // Clap2
+  '01GAM8EFQ00004MXFXAJYKA859', // Clap
+  '01GAFTZ9K80003DHH026MC7JW0', // PepePls
+  '01GAZ199Z8000FEWHS6AT5QZV0', // peepoHappy
+  '01GAZ4SBX80007YCE2RXBT44B2', // peepoSad
+  '01GB9W8JN80004CKF2H1TWA99H', // FeelsDankMan
+  '01GB2S7H7000018VJGJ4A9BMFS', // BillyApprove
+  '01GB8EQNJ8000497KFBZWNSDFZ', // forsenPls
+  '01GB54CZTG0004ZBZEDT30HE2M', // RoxyPotato
+  '01GB4P2HX0000BJ5HR8F6XV9Q0', // gachiBASS
+  '01FKSDK14G0008TM5NY9QEG0QV', // PartyParrot
+  '01G98W833R0000BRQD106P0ZNT', // WAYTOODANK
+  '01GB2ZJFBG000DTBJYANG8XYFP', // AlienDance
+  '01GGCQPCGR000C7MT8JZGP6E89', // ApuApustaja
+  '01GB9W2CDG000BFSD141G0MGSA', // BasedGod
+  '01G98V5RFG0001CD052SPS435F', // GuitarTime
+  '01HM524VE80004SKSHMCZWXH1T', // peepoPls
+  '01HM4P26CR000449DZBT4FVMA5', // TeaTime
+  '01HM4PGHC80007635TAZG67FT5', // WineTime
+  '01G98V81Q80000BRQD106P0ZEK', // PianoTime
+  '01G98TT6BR000A39K5ZSQFTPWR', // CrayonTime
+  '01HM6NJ2X000035ZKVAPWBNW26', // nymnCorn
+  '01J107C3E8000DX4MZBQSYGRXS', // sevenTV
+  '01FTEZEE900001E12995B12GR4', // nanaAYAYA
+  '01J8NMZ2HG0005G1FWF2H9Y615', // BibleThump
+  '01H16FA16G0005EZED5J0EY7KN', // glorp
+  '01GG3YGWK8000DWE419062SG28', // Stare
+  '01F9EM2ETG000E7SC8F953GXCX', // gachiGASM
+  '01GB32XE6R00018VJGJ4A9BNCV', // AYAYA
+  '01GB4XE3ZR000DKFRGM9Q1M7VS', // RareParrot
+  '01GB4FWTR8000DGEZ8VYY59RBN', // FeelsWeirdMan
+  '01GB4CK01800090V9B3D8CGEEX', // EZ
+  '01GB46137R000BJ5HR8F6XV8J1', // FeelsOkayMan
+  '01GB4EV0Q800090V9B3D8CGEHV', // FeelsStrongMan
+  '01GBFDVP18000CRDCG0DV7KEMY', // 7Cinema
+
+  // ─── Popular / trending ───
+  '01F6MKTFTG0009C9ZSNZTFV2ZF', // NOOOO
+  '01F6N31ETR0004P7N4A9PKS5X9', // BOOBA
+  '01F6ME7ADR0000WDA7ERT9H30R', // COPIUM
+  '01F5VW2TKR0003RCV2Z6JBHCST', // catKISS
+  '01F6MXJD8R000F76KNAAV5HDGD', // Bedge
+  '01F6BN89H80006VBW12DRB1DJ0', // donowall
+  '01F61B1440000991F7SWQNMVX7', // KEKW
+  '01F6RD7B88000B4N55W5NS55R7', // LETSGO
+  '01F6QV6G8R0000TEKRM6BFG0Z3', // ratJAM
+  '01GDDQVMH000038Q48APH8VE3Q', // AINTNOWAY
+  '01F6NET6G00009JYTB75QDKV1S', // peepoClap
+  '01F6NTA4X80007X1R6PNS21T6E', // peepoGiggles
+  '01GBFAYKGR000FWWN7MDZZ8XQN', // RAGEY
+  '01F6PPENA80002RDNAW6F35V4X', // YEP
+  '01F6NPHCN0000BEKN8ZXWQNSDC', // monkaW
+  '01F6NM2T080003C6R1CKK0T0P2', // WICKED
+  '01F6MMZW3R00012ZP6HJJ38G2E', // SadgeCry
+  '01G4ZTECKR0002P97QQ94BDSP4', // WHAT
+  '01F9Q9PA100009VDTF4G64R32V', // Nerdge
+  '01FYQZVG280006SX8JX4TD7SJA', // VIBE
+  '01GQ3WPTDR000300KQF1J7PFF8', // NOWAYING
+  '01H0405680000AJFXTYVX2PNJ7', // uuh
+  '01F6NPFQXG000AAS5FM9Q6GVCC', // 5Head
+  '01EZY51MDR000CYST6006V20T4', // NOPERS
+  '01GN5QQ1X8000C0QTR0C8JV0GR', // LETHIMCOOK
+  '01EZTD6KQ800012PTN006Q50PV', // Pepega
+  '01F6P0803G000898NRWSAKGYXT', // POGGERS
+  '01F2ZWD6CR000DSBG200DM9SGM', // pepeD
+  '01GA4TYKW0000EN50T4AGZ0CK8', // lebronJAM
+  '01F6M3N17G000B5V5G2M2RYJN7', // PogU
+  '01F9DGR2YG000E7SC8F959BREV', // RIPBOZO
+  '01F6NCKMP000052X5637DW2XDY', // meow
+  '01F6NPEJT0000B70V1XA8MNBC9', // popCat
+  '01F7GJ0N4R00074A83FVHRDMDB', // Okayge
+  '01EZPJCXQ8000C438200A44F38', // dinkDonk
+  '01GM78BAGR0001WBT5AMQY9YG3', // D:
+  '01F6Q045KR0005589X3BDQHRAY', // peepoRun
+  '01EZPGMA6G00047EF100A1SBTF', // TrollDespair
+  '01G9FN8YF000080GCW6BK847N1', // MONKE
+  '01F6N2GFVR000F76KNAAVCSDGX', // PauseChamp
+  '01F0HMZ1ZG0004V54C00A616CB', // Weirdge
+  '01H0SQNM9R0005HNCSM10SYJEQ', // CAUGHT
+  '01F6NHAQMR00015NVG2J8J00CX', // Amogus
+  '01F8YE5QNR00081476FRV8XDEZ', // Deadge
+]
+
+const EMOTE_URLS = EMOTE_IDS.map(
+  (id) => `https://cdn.7tv.app/emote/${id}/2x.webp`,
+)
+
+// ─── Scaling ────────────────────────────────────────────────────────────────
+const MAX_PARTICLES = 100
+
+function computeParticleCount(w: number, h: number): number {
+  const diagonal = Math.sqrt(w * w + h * h)
+  return Math.max(12, Math.min(MAX_PARTICLES, Math.round(diagonal / 38)))
+}
+
+function computeEmoteSize(w: number): number {
+  if (w < 480) return 28
+  if (w < 768) return 32
+  if (w < 1920) return 40
+  return 44
+}
+
+function computeTargetOpacity(w: number): number {
+  // Kept low enough that emotes behind text don't break WCAG AA contrast
+  // (4.5:1 body text, 3:1 large text). Center zone avoidance is the main
+  // safeguard — emotes rarely overlap text directly.
+  if (w < 480) return 0.25
+  if (w < 768) return 0.3
+  return 0.35
+}
+
+function computeRepulseRadius(w: number): number {
+  if (w < 480) return 80
+  if (w < 768) return 100
+  return 130
+}
+
+// ─── Physics constants ──────────────────────────────────────────────────────
+const INITIAL_SPEED = 0.4
+const MIN_SPEED = 0.2
+const MAX_SPEED = 2.5
+const FRICTION = 0.998
+const RESTITUTION = 0.8
+const REPULSE_STRENGTH = 1.6
+const CENTER_ZONE_X = 0.6
+const CENTER_ZONE_Y = 0.5
+const CENTER_PUSH = 0.15
+
+// ─── Types ──────────────────────────────────────────────────────────────────
+interface ParticleState {
+  x: number
+  y: number
+  vx: number
+  vy: number
+  rotation: number
+  rotationSpeed: number
+  halfW: number
+  measured: boolean
+}
+
+// ─── Helpers ────────────────────────────────────────────────────────────────
+function rand(min: number, max: number) {
+  return Math.random() * (max - min) + min
+}
+
+function shuffle<T>(array: T[]): T[] {
+  const a = [...array]
+  for (let i = a.length - 1; i > 0; i--) {
+    const j = Math.floor(Math.random() * (i + 1))
+    ;[a[i], a[j]] = [a[j]!, a[i]!]
+  }
+  return a
+}
+
+function spawnInEdgeZone(
+  w: number,
+  h: number,
+  size: number,
+): { x: number; y: number } {
+  const half = size / 2
+  const zoneRx = (w * CENTER_ZONE_X) / 2
+  const zoneRy = (h * CENTER_ZONE_Y) / 2
+  let x: number
+  let y: number
+  do {
+    x = rand(half, w - half)
+    y = rand(half, h - half)
+  } while (((x - w / 2) / zoneRx) ** 2 + ((y - h / 2) / zoneRy) ** 2 < 1)
+  return { x, y }
+}
+
+function createParticle(w: number, h: number, halfW: number): ParticleState {
+  const { x, y } = spawnInEdgeZone(w, h, halfW * 2)
+  const angle = rand(0, Math.PI * 2)
+  return {
+    x,
+    y,
+    vx: Math.cos(angle) * INITIAL_SPEED,
+    vy: Math.sin(angle) * INITIAL_SPEED,
+    rotation: rand(-0.3, 0.3),
+    rotationSpeed: rand(-0.003, 0.003),
+    halfW,
+    measured: false,
+  }
+}
+
+// ─── Component ──────────────────────────────────────────────────────────────
+export function EmotePhysicsBackground() {
+  const containerRef = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    const container = containerRef.current
+    if (container === null) return
+
+    const elements =
+      container.querySelectorAll<HTMLImageElement>('[data-emote]')
+    if (elements.length === 0) return
+
+    // Shuffled once so each element keeps a stable URL across resizes
+    const urls = shuffle(EMOTE_URLS)
+
+    let cancelled = false
+    let rafId = 0
+    let w = 0
+    let h = 0
+    let activeCount = 0
+    let emoteSize = 40
+    let repulseRadius = 130
+    let currentPointer: { x: number; y: number } | null = null
+    const particles: ParticleState[] = []
+    const animations: AnimationPlaybackControls[] = []
+    let loadedCount = 0
+    const loadCleanups: (() => void)[] = []
+
+    function revealEmote(el: HTMLImageElement) {
+      const delay = loadedCount * 0.06
+      loadedCount++
+      animations.push(
+        animate(
+          el,
+          { opacity: 1, filter: ['blur(4px)', 'blur(0px)'] },
+          { duration: 0.5, delay, ease: 'easeOut' },
+        ),
+      )
+    }
+
+    // ── Sync visible particle count to container size ──
+    function syncCount(newW: number, newH: number, initial: boolean) {
+      const newCount = Math.min(
+        computeParticleCount(newW, newH),
+        elements.length,
+      )
+      const newSize = computeEmoteSize(newW)
+      repulseRadius = computeRepulseRadius(newW)
+      container!.style.opacity = String(computeTargetOpacity(newW))
+      emoteSize = newSize
+      const halfW = newSize / 2
+
+      for (const p of particles) {
+        if (!p.measured) p.halfW = halfW
+      }
+
+      if (newCount > activeCount) {
+        for (let i = activeCount; i < newCount; i++) {
+          const el = elements[i]
+          if (el === undefined) break
+          if (i >= particles.length) {
+            particles.push(createParticle(newW, newH, halfW))
+          }
+          el.style.display = ''
+          el.style.height = `${newSize}px`
+          // Lazy src assignment — only fetch images that are actually active
+          if (!el.src && i < urls.length) el.src = urls[i]!
+          if (initial) {
+            if (el.complete && el.naturalWidth > 0) {
+              revealEmote(el)
+            } else {
+              const onLoad = () => {
+                if (!cancelled) revealEmote(el)
+              }
+              // eslint-disable-next-line @eslint-react/web-api/no-leaked-event-listener -- cleaned up via loadCleanups array
+              el.addEventListener('load', onLoad, { once: true })
+              loadCleanups.push(() => {
+                el.removeEventListener('load', onLoad)
+              })
+            }
+          } else {
+            el.style.opacity = '1'
+            el.style.filter = ''
+          }
+        }
+      } else if (newCount < activeCount) {
+        for (let i = newCount; i < activeCount; i++) {
+          const el = elements[i]
+          if (el !== undefined) {
+            el.style.display = 'none'
+            el.style.opacity = '0'
+          }
+        }
+      }
+
+      // Update size on already-visible elements
+      for (let i = 0; i < Math.min(newCount, activeCount); i++) {
+        const el = elements[i]
+        if (el !== undefined) el.style.height = `${newSize}px`
+      }
+
+      activeCount = newCount
+    }
+
+    // Initialize dimensions
+    const rect = container.getBoundingClientRect()
+    w = rect.width
+    h = rect.height
+    if (w > 0 && h > 0) syncCount(w, h, true)
+
+    // ── Resize handling ──
+    const ro = new ResizeObserver((entries) => {
+      const entry = entries[0]
+      if (entry === undefined) return
+      const { width, height } = entry.contentRect
+      if (width > 0 && height > 0) {
+        w = width
+        h = height
+        syncCount(w, h, false)
+        const halfH = emoteSize / 2
+        for (let i = 0; i < activeCount; i++) {
+          const p = particles[i]
+          if (p === undefined) continue
+          p.x = Math.max(p.halfW, Math.min(p.x, w - p.halfW))
+          p.y = Math.max(halfH, Math.min(p.y, h - halfH))
+        }
+      }
+    })
+    ro.observe(container)
+
+    // ── Pointer tracking (mouse + touch) ──
+    const panel = container.parentElement ?? container
+    function updatePointer(clientX: number, clientY: number) {
+      const r = container!.getBoundingClientRect()
+      currentPointer = { x: clientX - r.left, y: clientY - r.top }
+    }
+    function clearPointer() {
+      currentPointer = null
+    }
+    function onMouseMove(e: MouseEvent) {
+      updatePointer(e.clientX, e.clientY)
+    }
+    function onTouchMove(e: TouchEvent) {
+      const touch = e.touches[0]
+      if (touch !== undefined) updatePointer(touch.clientX, touch.clientY)
+    }
+    panel.addEventListener('mousemove', onMouseMove)
+    panel.addEventListener('mouseleave', clearPointer)
+    panel.addEventListener('touchmove', onTouchMove, { passive: true })
+    panel.addEventListener('touchend', clearPointer)
+
+    // ── Physics loop ──
+    function tick() {
+      if (cancelled) return
+
+      if (activeCount > 0) {
+        const m = currentPointer
+        const centerX = w / 2
+        const centerY = h / 2
+        const zoneRadiusX = (w * CENTER_ZONE_X) / 2
+        const zoneRadiusY = (h * CENTER_ZONE_Y) / 2
+        const halfH = emoteSize / 2
+
+        // Per-particle forces, friction, speed limits, and integration
+        for (let i = 0; i < activeCount; i++) {
+          const p = particles[i]
+          if (p === undefined) continue
+
+          // Center avoidance — soft elliptical repulsion
+          const cdx = p.x - centerX
+          const cdy = p.y - centerY
+          const normDist = (cdx / zoneRadiusX) ** 2 + (cdy / zoneRadiusY) ** 2
+          if (normDist < 1 && normDist > 0.001) {
+            const strength = (1 - normDist) * CENTER_PUSH
+            const dist = Math.sqrt(cdx * cdx + cdy * cdy) || 1
+            p.vx += (cdx / dist) * strength
+            p.vy += (cdy / dist) * strength
+          }
+
+          // Pointer repulsion
+          if (m !== null) {
+            const dx = p.x - m.x
+            const dy = p.y - m.y
+            const distSq = dx * dx + dy * dy
+            if (distSq < repulseRadius * repulseRadius && distSq > 0.01) {
+              const dist = Math.sqrt(distSq)
+              const force =
+                ((repulseRadius - dist) / repulseRadius) * REPULSE_STRENGTH
+              p.vx += (dx / dist) * force
+              p.vy += (dy / dist) * force
+            }
+          }
+
+          // Friction
+          p.vx *= FRICTION
+          p.vy *= FRICTION
+
+          // Maintain minimum speed — keeps emotes always drifting
+          const speed = Math.sqrt(p.vx * p.vx + p.vy * p.vy)
+          if (speed < MIN_SPEED) {
+            if (speed > 0.001) {
+              const scale = MIN_SPEED / speed
+              p.vx *= scale
+              p.vy *= scale
+            } else {
+              const angle = rand(0, Math.PI * 2)
+              p.vx = Math.cos(angle) * MIN_SPEED
+              p.vy = Math.sin(angle) * MIN_SPEED
+            }
+          } else if (speed > MAX_SPEED) {
+            const ratio = MAX_SPEED / speed
+            p.vx *= ratio
+            p.vy *= ratio
+          }
+
+          // Integrate position
+          p.x += p.vx
+          p.y += p.vy
+
+          // Lazily measure actual rendered width once image loads
+          const el = elements[i]
+          if (
+            el !== undefined &&
+            !p.measured &&
+            el.naturalWidth > 0 &&
+            el.naturalHeight > 0
+          ) {
+            p.halfW = ((el.naturalWidth / el.naturalHeight) * emoteSize) / 2
+            p.measured = true
+          }
+        }
+
+        // Particle-particle elastic collision
+        for (let i = 0; i < activeCount; i++) {
+          const a = particles[i]
+          if (a === undefined) continue
+          const rA = Math.max(a.halfW, halfH)
+          for (let j = i + 1; j < activeCount; j++) {
+            const b = particles[j]
+            if (b === undefined) continue
+            const rB = Math.max(b.halfW, halfH)
+            const dx = b.x - a.x
+            const dy = b.y - a.y
+            const distSq = dx * dx + dy * dy
+            const minDist = rA + rB
+            if (distSq < minDist * minDist && distSq > 0.01) {
+              const dist = Math.sqrt(distSq)
+              const nx = dx / dist
+              const ny = dy / dist
+              // Separate overlapping particles
+              const overlap = (minDist - dist) / 2
+              a.x -= nx * overlap
+              a.y -= ny * overlap
+              b.x += nx * overlap
+              b.y += ny * overlap
+              // Elastic velocity exchange along collision normal
+              const dvx = a.vx - b.vx
+              const dvy = a.vy - b.vy
+              const dvDotN = dvx * nx + dvy * ny
+              if (dvDotN > 0) {
+                a.vx -= dvDotN * nx * RESTITUTION
+                a.vy -= dvDotN * ny * RESTITUTION
+                b.vx += dvDotN * nx * RESTITUTION
+                b.vy += dvDotN * ny * RESTITUTION
+              }
+            }
+          }
+        }
+
+        // Wall bounce and DOM write
+        for (let i = 0; i < activeCount; i++) {
+          const p = particles[i]
+          const el = elements[i]
+          if (p === undefined || el === undefined) continue
+
+          if (p.x - p.halfW < 0) {
+            p.x = p.halfW
+            p.vx = Math.abs(p.vx) * RESTITUTION
+          } else if (p.x + p.halfW > w) {
+            p.x = w - p.halfW
+            p.vx = -Math.abs(p.vx) * RESTITUTION
+          }
+          if (p.y - halfH < 0) {
+            p.y = halfH
+            p.vy = Math.abs(p.vy) * RESTITUTION
+          } else if (p.y + halfH > h) {
+            p.y = h - halfH
+            p.vy = -Math.abs(p.vy) * RESTITUTION
+          }
+
+          // Rotation
+          p.rotation += p.rotationSpeed
+
+          // Write to DOM — only transform, no layout thrash
+          el.style.transform = `translate3d(${p.x - p.halfW}px, ${p.y - halfH}px, 0) rotate(${p.rotation}rad)`
+        }
+      }
+
+      rafId = requestAnimationFrame(tick)
+    }
+
+    tick()
+
+    return () => {
+      cancelled = true
+      cancelAnimationFrame(rafId)
+      for (const a of animations) a.stop()
+      for (const cleanup of loadCleanups) cleanup()
+      ro.disconnect()
+      panel.removeEventListener('mousemove', onMouseMove)
+      panel.removeEventListener('mouseleave', clearPointer)
+      panel.removeEventListener('touchmove', onTouchMove)
+      panel.removeEventListener('touchend', clearPointer)
+    }
+  }, [])
+
+  return (
+    <div ref={containerRef} className='absolute inset-0 overflow-hidden'>
+      {Array.from({ length: MAX_PARTICLES }, (_, i) => (
+        // eslint-disable-next-line @next/next/no-img-element -- imperative DOM manipulation requires plain <img>
+        <img
+          key={i}
+          data-emote
+          alt=''
+          decoding='async'
+          fetchPriority='low'
+          draggable={false}
+          crossOrigin='anonymous'
+          className='pointer-events-none absolute top-0 left-0 select-none'
+          style={{
+            willChange: 'transform',
+            display: 'none',
+            opacity: 0,
+            filter: 'blur(4px)',
+          }}
+        />
+      ))}
+    </div>
+  )
+}
diff --git a/web/src/components/Footer.tsx b/web/src/components/Footer.tsx
new file mode 100644
index 00000000..70cd0ebc
--- /dev/null
+++ b/web/src/components/Footer.tsx
@@ -0,0 +1,19 @@
+import { tommyLink } from '@/lib/constants'
+
+export function Footer() {
+  return (
+    <footer className='relative z-30 pb-2 text-center md:pb-4'>
+      <p className='text-muted-foreground/60 text-xs'>
+        Made by{' '}
+        <a
+          href={tommyLink}
+          target='_blank'
+          rel='noreferrer'
+          className='hover:text-muted-foreground underline underline-offset-4 transition-colors'
+        >
+          Tommy Chow
+        </a>
+      </p>
+    </footer>
+  )
+}
diff --git a/web/src/components/Header.tsx b/web/src/components/Header.tsx
new file mode 100644
index 00000000..d8fc8fb4
--- /dev/null
+++ b/web/src/components/Header.tsx
@@ -0,0 +1,132 @@
+'use client'
+
+import { ThemeToggle } from '@/components/ThemeToggle'
+import { Button } from '@/components/ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import {
+  donateLink,
+  emailAddress,
+  emailLink,
+  githubLink,
+} from '@/lib/constants'
+import { Copy, Heart, Mail, Menu, Shield } from 'lucide-react'
+import Image from 'next/image'
+import Link from 'next/link'
+import { SiGithub } from 'react-icons/si'
+import { toast } from 'sonner'
+
+function ContactDropdown() {
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger render={<Button variant='ghost' />}>
+        <Mail />
+        Contact
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align='end'>
+        <DropdownMenuItem render={<a href={emailLink} />}>
+          <Mail />
+          Send email
+        </DropdownMenuItem>
+        <DropdownMenuItem
+          onClick={() => {
+            void navigator.clipboard.writeText(emailAddress)
+            toast.success('Email copied to clipboard')
+          }}
+        >
+          <Copy />
+          Copy email
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  )
+}
+
+export function Header() {
+  return (
+    <header>
+      <nav className='flex items-center justify-between'>
+        <Link href='/' className='flex items-center gap-2'>
+          <Image src='/logo.svg' alt='' width={28} height={28} />
+          <span className='font-semibold'>Frosty</span>
+        </Link>
+
+        {/* Desktop actions */}
+        <div className='hidden items-center gap-1 lg:flex'>
+          <Button
+            variant='ghost'
+            render={<a href={githubLink} target='_blank' rel='noreferrer' />}
+          >
+            <SiGithub />
+            GitHub
+          </Button>
+          <Button
+            variant='ghost'
+            render={<a href={donateLink} target='_blank' rel='noreferrer' />}
+          >
+            <Heart />
+            Donate
+          </Button>
+          <Button variant='ghost' render={<Link href='/privacy' />}>
+            <Shield />
+            Privacy
+          </Button>
+          <ContactDropdown />
+          <ThemeToggle />
+        </div>
+
+        {/* Mobile actions */}
+        <div className='flex items-center gap-1 lg:hidden'>
+          <Button
+            variant='ghost'
+            render={<a href={githubLink} target='_blank' rel='noreferrer' />}
+          >
+            <SiGithub />
+            GitHub
+          </Button>
+          <ThemeToggle />
+          <DropdownMenu>
+            <DropdownMenuTrigger
+              render={<Button variant='ghost' size='icon' aria-label='Menu' />}
+            >
+              <Menu />
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align='end'>
+              <DropdownMenuItem
+                render={
+                  <a href={donateLink} target='_blank' rel='noreferrer' />
+                }
+              >
+                <Heart />
+                Donate
+              </DropdownMenuItem>
+              <DropdownMenuItem render={<Link href='/privacy' />}>
+                <Shield />
+                Privacy
+              </DropdownMenuItem>
+              <DropdownMenuSeparator />
+              <DropdownMenuItem render={<a href={emailLink} />}>
+                <Mail />
+                Send email
+              </DropdownMenuItem>
+              <DropdownMenuItem
+                onClick={() => {
+                  void navigator.clipboard.writeText(emailAddress)
+                  toast.success('Email copied to clipboard')
+                }}
+              >
+                <Copy />
+                Copy email
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
+      </nav>
+    </header>
+  )
+}
diff --git a/web/src/components/Providers.tsx b/web/src/components/Providers.tsx
new file mode 100644
index 00000000..617d32c7
--- /dev/null
+++ b/web/src/components/Providers.tsx
@@ -0,0 +1,20 @@
+'use client'
+
+import { Toaster } from '@/components/ui/sonner'
+import { MotionConfig } from 'motion/react'
+import { ThemeProvider } from 'next-themes'
+
+interface ProvidersProps {
+  children: React.ReactNode
+}
+
+export function Providers({ children }: ProvidersProps) {
+  return (
+    <MotionConfig reducedMotion='user'>
+      <ThemeProvider attribute='class' disableTransitionOnChange>
+        {children}
+        <Toaster position='top-center' />
+      </ThemeProvider>
+    </MotionConfig>
+  )
+}
diff --git a/web/src/components/ThemeToggle.tsx b/web/src/components/ThemeToggle.tsx
new file mode 100644
index 00000000..5277a5d9
--- /dev/null
+++ b/web/src/components/ThemeToggle.tsx
@@ -0,0 +1,52 @@
+'use client'
+
+import { Button } from '@/components/ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu'
+import { Monitor, Moon, Sun } from 'lucide-react'
+import { useTheme } from 'next-themes'
+import { useEffect, useState } from 'react'
+
+export function ThemeToggle() {
+  const { theme, setTheme } = useTheme()
+
+  const [mounted, setMounted] = useState(false)
+
+  useEffect(() => {
+    // eslint-disable-next-line -- intentional hydration pattern
+    setMounted(true)
+  }, [])
+
+  if (!mounted) return <div className='size-9' />
+
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger
+        aria-label='Toggle theme'
+        render={<Button variant='ghost' size='icon' />}
+      >
+        {theme === 'dark' && <Moon />}
+        {theme === 'light' && <Sun />}
+        {theme === 'system' && <Monitor />}
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align='end'>
+        <DropdownMenuItem onClick={() => setTheme('light')}>
+          <Sun className='mr-2' />
+          Light
+        </DropdownMenuItem>
+        <DropdownMenuItem onClick={() => setTheme('dark')}>
+          <Moon className='mr-2' />
+          Dark
+        </DropdownMenuItem>
+        <DropdownMenuItem onClick={() => setTheme('system')}>
+          <Monitor className='mr-2' />
+          System
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  )
+}
diff --git a/web/src/components/ui/accordion.tsx b/web/src/components/ui/accordion.tsx
new file mode 100644
index 00000000..03c08d80
--- /dev/null
+++ b/web/src/components/ui/accordion.tsx
@@ -0,0 +1,74 @@
+"use client"
+
+import { Accordion as AccordionPrimitive } from "@base-ui/react/accordion"
+
+import { cn } from "@/lib/utils"
+import { ChevronDownIcon, ChevronUpIcon } from "lucide-react"
+
+function Accordion({ className, ...props }: AccordionPrimitive.Root.Props) {
+  return (
+    <AccordionPrimitive.Root
+      data-slot="accordion"
+      className={cn("flex w-full flex-col", className)}
+      {...props}
+    />
+  )
+}
+
+function AccordionItem({ className, ...props }: AccordionPrimitive.Item.Props) {
+  return (
+    <AccordionPrimitive.Item
+      data-slot="accordion-item"
+      className={cn("not-last:border-b", className)}
+      {...props}
+    />
+  )
+}
+
+function AccordionTrigger({
+  className,
+  children,
+  ...props
+}: AccordionPrimitive.Trigger.Props) {
+  return (
+    <AccordionPrimitive.Header className="flex">
+      <AccordionPrimitive.Trigger
+        data-slot="accordion-trigger"
+        className={cn(
+          "focus-visible:ring-ring/50 focus-visible:border-ring focus-visible:after:border-ring **:data-[slot=accordion-trigger-icon]:text-muted-foreground rounded-md py-4 text-left text-sm font-medium hover:underline focus-visible:ring-3 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 group/accordion-trigger relative flex flex-1 items-start justify-between border border-transparent transition-all outline-none disabled:pointer-events-none disabled:opacity-50",
+          className
+        )}
+        {...props}
+      >
+        {children}
+        <ChevronDownIcon data-slot="accordion-trigger-icon" className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden" />
+        <ChevronUpIcon data-slot="accordion-trigger-icon" className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline" />
+      </AccordionPrimitive.Trigger>
+    </AccordionPrimitive.Header>
+  )
+}
+
+function AccordionContent({
+  className,
+  children,
+  ...props
+}: AccordionPrimitive.Panel.Props) {
+  return (
+    <AccordionPrimitive.Panel
+      data-slot="accordion-content"
+      className="data-open:animate-accordion-down data-closed:animate-accordion-up text-sm overflow-hidden"
+      {...props}
+    >
+      <div
+        className={cn(
+          "pt-0 pb-4 [&_a]:hover:text-foreground h-(--accordion-panel-height) data-ending-style:h-0 data-starting-style:h-0 [&_a]:underline [&_a]:underline-offset-3 [&_p:not(:last-child)]:mb-4",
+          className
+        )}
+      >
+        {children}
+      </div>
+    </AccordionPrimitive.Panel>
+  )
+}
+
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }
diff --git a/web/src/components/ui/button.tsx b/web/src/components/ui/button.tsx
new file mode 100644
index 00000000..0b390334
--- /dev/null
+++ b/web/src/components/ui/button.tsx
@@ -0,0 +1,57 @@
+"use client"
+
+import { Button as ButtonPrimitive } from "@base-ui/react/button"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/lib/utils"
+
+const buttonVariants = cva(
+  "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:aria-invalid:border-destructive/50 rounded-md border border-transparent bg-clip-padding text-sm font-medium focus-visible:ring-3 aria-invalid:ring-3 [&_svg:not([class*='size-'])]:size-4 inline-flex items-center justify-center whitespace-nowrap transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none shrink-0 [&_svg]:shrink-0 outline-none group/button select-none",
+  {
+    variants: {
+      variant: {
+        default: "bg-primary text-primary-foreground hover:bg-primary/80",
+        outline: "border-border bg-background hover:bg-muted hover:text-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50 aria-expanded:bg-muted aria-expanded:text-foreground shadow-xs",
+        secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80 aria-expanded:bg-secondary aria-expanded:text-secondary-foreground",
+        ghost: "hover:bg-muted hover:text-foreground dark:hover:bg-muted/50 aria-expanded:bg-muted aria-expanded:text-foreground",
+        destructive: "bg-destructive/10 hover:bg-destructive/20 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/20 text-destructive focus-visible:border-destructive/40 dark:hover:bg-destructive/30",
+        link: "text-primary underline-offset-4 hover:underline",
+      },
+      size: {
+        default: "h-9 gap-1.5 px-2.5 in-data-[slot=button-group]:rounded-md has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
+        xs: "h-6 gap-1 rounded-[min(var(--radius-md),8px)] px-2 text-xs in-data-[slot=button-group]:rounded-md has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3",
+        sm: "h-8 gap-1 rounded-[min(var(--radius-md),10px)] px-2.5 in-data-[slot=button-group]:rounded-md has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5",
+        lg: "h-10 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-3 has-data-[icon=inline-start]:pl-3",
+        icon: "size-9",
+        "icon-xs": "size-6 rounded-[min(var(--radius-md),8px)] in-data-[slot=button-group]:rounded-md [&_svg:not([class*='size-'])]:size-3",
+        "icon-sm": "size-8 rounded-[min(var(--radius-md),10px)] in-data-[slot=button-group]:rounded-md",
+        "icon-lg": "size-10",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  }
+)
+
+function Button({
+  className,
+  variant = "default",
+  size = "default",
+  nativeButton,
+  render,
+  ...props
+}: ButtonPrimitive.Props & VariantProps<typeof buttonVariants>) {
+  return (
+    <ButtonPrimitive
+      data-slot="button"
+      className={cn(buttonVariants({ variant, size, className }))}
+      nativeButton={nativeButton ?? (render != null ? false : undefined)}
+      render={render}
+      {...props}
+    />
+  )
+}
+
+export { Button, buttonVariants }
diff --git a/web/src/components/ui/card.tsx b/web/src/components/ui/card.tsx
new file mode 100644
index 00000000..0cf104f5
--- /dev/null
+++ b/web/src/components/ui/card.tsx
@@ -0,0 +1,94 @@
+import * as React from "react"
+
+import { cn } from "@/lib/utils"
+
+function Card({
+  className,
+  size = "default",
+  ...props
+}: React.ComponentProps<"div"> & { size?: "default" | "sm" }) {
+  return (
+    <div
+      data-slot="card"
+      data-size={size}
+      className={cn("ring-foreground/10 bg-card text-card-foreground gap-6 overflow-hidden rounded-xl py-6 text-sm shadow-xs ring-1 has-[>img:first-child]:pt-0 data-[size=sm]:gap-4 data-[size=sm]:py-4 *:[img:first-child]:rounded-t-xl *:[img:last-child]:rounded-b-xl group/card flex flex-col", className)}
+      {...props}
+    />
+  )
+}
+
+function CardHeader({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="card-header"
+      className={cn(
+        "gap-1 rounded-t-xl px-6 group-data-[size=sm]/card:px-4 [.border-b]:pb-6 group-data-[size=sm]/card:[.border-b]:pb-4 group/card-header @container/card-header grid auto-rows-min items-start has-data-[slot=card-action]:grid-cols-[1fr_auto] has-data-[slot=card-description]:grid-rows-[auto_auto]",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function CardTitle({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="card-title"
+      className={cn("text-base leading-normal font-medium group-data-[size=sm]/card:text-sm", className)}
+      {...props}
+    />
+  )
+}
+
+function CardDescription({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="card-description"
+      className={cn("text-muted-foreground text-sm", className)}
+      {...props}
+    />
+  )
+}
+
+function CardAction({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="card-action"
+      className={cn(
+        "col-start-2 row-span-2 row-start-1 self-start justify-self-end",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function CardContent({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="card-content"
+      className={cn("px-6 group-data-[size=sm]/card:px-4", className)}
+      {...props}
+    />
+  )
+}
+
+function CardFooter({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="card-footer"
+      className={cn("rounded-b-xl px-6 group-data-[size=sm]/card:px-4 [.border-t]:pt-6 group-data-[size=sm]/card:[.border-t]:pt-4 flex items-center", className)}
+      {...props}
+    />
+  )
+}
+
+export {
+  Card,
+  CardHeader,
+  CardFooter,
+  CardTitle,
+  CardAction,
+  CardDescription,
+  CardContent,
+}
diff --git a/web/src/components/ui/dropdown-menu.tsx b/web/src/components/ui/dropdown-menu.tsx
new file mode 100644
index 00000000..f61992e0
--- /dev/null
+++ b/web/src/components/ui/dropdown-menu.tsx
@@ -0,0 +1,262 @@
+"use client"
+
+import * as React from "react"
+import { Menu as MenuPrimitive } from "@base-ui/react/menu"
+
+import { cn } from "@/lib/utils"
+import { ChevronRightIcon, CheckIcon } from "lucide-react"
+
+function DropdownMenu({ ...props }: MenuPrimitive.Root.Props) {
+  return <MenuPrimitive.Root data-slot="dropdown-menu" {...props} />
+}
+
+function DropdownMenuPortal({ ...props }: MenuPrimitive.Portal.Props) {
+  return <MenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />
+}
+
+function DropdownMenuTrigger({ ...props }: MenuPrimitive.Trigger.Props) {
+  return <MenuPrimitive.Trigger data-slot="dropdown-menu-trigger" {...props} />
+}
+
+function DropdownMenuContent({
+  align = "start",
+  alignOffset = 0,
+  side = "bottom",
+  sideOffset = 4,
+  className,
+  ...props
+}: MenuPrimitive.Popup.Props &
+  Pick<
+    MenuPrimitive.Positioner.Props,
+    "align" | "alignOffset" | "side" | "sideOffset"
+  >) {
+  return (
+    <MenuPrimitive.Portal>
+      <MenuPrimitive.Positioner
+        className="isolate z-50 outline-none"
+        align={align}
+        alignOffset={alignOffset}
+        side={side}
+        sideOffset={sideOffset}
+      >
+        <MenuPrimitive.Popup
+          data-slot="dropdown-menu-content"
+          className={cn("data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 bg-popover text-popover-foreground min-w-32 rounded-md p-1 shadow-md ring-1 duration-100 data-[side=inline-start]:slide-in-from-right-2 data-[side=inline-end]:slide-in-from-left-2 z-50 max-h-(--available-height) w-(--anchor-width) origin-(--transform-origin) overflow-x-hidden overflow-y-auto outline-none data-closed:overflow-hidden", className )}
+          {...props}
+        />
+      </MenuPrimitive.Positioner>
+    </MenuPrimitive.Portal>
+  )
+}
+
+function DropdownMenuGroup({ ...props }: MenuPrimitive.Group.Props) {
+  return <MenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />
+}
+
+function DropdownMenuLabel({
+  className,
+  inset,
+  ...props
+}: MenuPrimitive.GroupLabel.Props & {
+  inset?: boolean
+}) {
+  return (
+    <MenuPrimitive.GroupLabel
+      data-slot="dropdown-menu-label"
+      data-inset={inset}
+      className={cn("text-muted-foreground px-2 py-1.5 text-xs font-medium data-inset:pl-8", className)}
+      {...props}
+    />
+  )
+}
+
+function DropdownMenuItem({
+  className,
+  inset,
+  variant = "default",
+  ...props
+}: MenuPrimitive.Item.Props & {
+  inset?: boolean
+  variant?: "default" | "destructive"
+}) {
+  return (
+    <MenuPrimitive.Item
+      data-slot="dropdown-menu-item"
+      data-inset={inset}
+      data-variant={variant}
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:text-destructive not-data-[variant=destructive]:focus:**:text-accent-foreground gap-2 rounded-sm px-2 py-1.5 text-sm data-inset:pl-8 [&_svg:not([class*='size-'])]:size-4 group/dropdown-menu-item relative flex cursor-default items-center outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function DropdownMenuSub({ ...props }: MenuPrimitive.SubmenuRoot.Props) {
+  return <MenuPrimitive.SubmenuRoot data-slot="dropdown-menu-sub" {...props} />
+}
+
+function DropdownMenuSubTrigger({
+  className,
+  inset,
+  children,
+  ...props
+}: MenuPrimitive.SubmenuTrigger.Props & {
+  inset?: boolean
+}) {
+  return (
+    <MenuPrimitive.SubmenuTrigger
+      data-slot="dropdown-menu-sub-trigger"
+      data-inset={inset}
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground data-open:bg-accent data-open:text-accent-foreground not-data-[variant=destructive]:focus:**:text-accent-foreground gap-2 rounded-sm px-2 py-1.5 text-sm data-inset:pl-8 [&_svg:not([class*='size-'])]:size-4 data-popup-open:bg-accent data-popup-open:text-accent-foreground flex cursor-default items-center outline-hidden select-none [&_svg]:pointer-events-none [&_svg]:shrink-0",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronRightIcon className="ml-auto" />
+    </MenuPrimitive.SubmenuTrigger>
+  )
+}
+
+function DropdownMenuSubContent({
+  align = "start",
+  alignOffset = -3,
+  side = "right",
+  sideOffset = 0,
+  className,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuContent>) {
+  return (
+    <DropdownMenuContent
+      data-slot="dropdown-menu-sub-content"
+      className={cn("data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 bg-popover text-popover-foreground min-w-[96px] rounded-md p-1 shadow-lg ring-1 duration-100 w-auto", className)}
+      align={align}
+      alignOffset={alignOffset}
+      side={side}
+      sideOffset={sideOffset}
+      {...props}
+    />
+  )
+}
+
+function DropdownMenuCheckboxItem({
+  className,
+  children,
+  checked,
+  inset,
+  ...props
+}: MenuPrimitive.CheckboxItem.Props & {
+  inset?: boolean
+}) {
+  return (
+    <MenuPrimitive.CheckboxItem
+      data-slot="dropdown-menu-checkbox-item"
+      data-inset={inset}
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground focus:**:text-accent-foreground gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm data-inset:pl-8 [&_svg:not([class*='size-'])]:size-4 relative flex cursor-default items-center outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+        className
+      )}
+      checked={checked}
+      {...props}
+    >
+      <span
+        className="absolute right-2 flex items-center justify-center pointer-events-none"
+        data-slot="dropdown-menu-checkbox-item-indicator"
+      >
+        <MenuPrimitive.CheckboxItemIndicator>
+          <CheckIcon
+          />
+        </MenuPrimitive.CheckboxItemIndicator>
+      </span>
+      {children}
+    </MenuPrimitive.CheckboxItem>
+  )
+}
+
+function DropdownMenuRadioGroup({ ...props }: MenuPrimitive.RadioGroup.Props) {
+  return (
+    <MenuPrimitive.RadioGroup
+      data-slot="dropdown-menu-radio-group"
+      {...props}
+    />
+  )
+}
+
+function DropdownMenuRadioItem({
+  className,
+  children,
+  inset,
+  ...props
+}: MenuPrimitive.RadioItem.Props & {
+  inset?: boolean
+}) {
+  return (
+    <MenuPrimitive.RadioItem
+      data-slot="dropdown-menu-radio-item"
+      data-inset={inset}
+      className={cn(
+        "focus:bg-accent focus:text-accent-foreground focus:**:text-accent-foreground gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm data-inset:pl-8 [&_svg:not([class*='size-'])]:size-4 relative flex cursor-default items-center outline-hidden select-none data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+        className
+      )}
+      {...props}
+    >
+      <span
+        className="absolute right-2 flex items-center justify-center pointer-events-none"
+        data-slot="dropdown-menu-radio-item-indicator"
+      >
+        <MenuPrimitive.RadioItemIndicator>
+          <CheckIcon
+          />
+        </MenuPrimitive.RadioItemIndicator>
+      </span>
+      {children}
+    </MenuPrimitive.RadioItem>
+  )
+}
+
+function DropdownMenuSeparator({
+  className,
+  ...props
+}: MenuPrimitive.Separator.Props) {
+  return (
+    <MenuPrimitive.Separator
+      data-slot="dropdown-menu-separator"
+      className={cn("bg-border -mx-1 my-1 h-px", className)}
+      {...props}
+    />
+  )
+}
+
+function DropdownMenuShortcut({
+  className,
+  ...props
+}: React.ComponentProps<"span">) {
+  return (
+    <span
+      data-slot="dropdown-menu-shortcut"
+      className={cn("text-muted-foreground group-focus/dropdown-menu-item:text-accent-foreground ml-auto text-xs tracking-widest", className)}
+      {...props}
+    />
+  )
+}
+
+export {
+  DropdownMenu,
+  DropdownMenuPortal,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuLabel,
+  DropdownMenuItem,
+  DropdownMenuCheckboxItem,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut,
+  DropdownMenuSub,
+  DropdownMenuSubTrigger,
+  DropdownMenuSubContent,
+}
diff --git a/web/src/components/ui/skeleton.tsx b/web/src/components/ui/skeleton.tsx
new file mode 100644
index 00000000..41bcbf94
--- /dev/null
+++ b/web/src/components/ui/skeleton.tsx
@@ -0,0 +1,13 @@
+import { cn } from "@/lib/utils"
+
+function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="skeleton"
+      className={cn("bg-muted rounded-md animate-pulse", className)}
+      {...props}
+    />
+  )
+}
+
+export { Skeleton }
diff --git a/web/src/components/ui/sonner.tsx b/web/src/components/ui/sonner.tsx
new file mode 100644
index 00000000..9280ee52
--- /dev/null
+++ b/web/src/components/ui/sonner.tsx
@@ -0,0 +1,49 @@
+"use client"
+
+import { useTheme } from "next-themes"
+import { Toaster as Sonner, type ToasterProps } from "sonner"
+import { CircleCheckIcon, InfoIcon, TriangleAlertIcon, OctagonXIcon, Loader2Icon } from "lucide-react"
+
+const Toaster = ({ ...props }: ToasterProps) => {
+  const { theme = "system" } = useTheme()
+
+  return (
+    <Sonner
+      theme={theme as ToasterProps["theme"]}
+      className="toaster group"
+      icons={{
+        success: (
+          <CircleCheckIcon className="size-4" />
+        ),
+        info: (
+          <InfoIcon className="size-4" />
+        ),
+        warning: (
+          <TriangleAlertIcon className="size-4" />
+        ),
+        error: (
+          <OctagonXIcon className="size-4" />
+        ),
+        loading: (
+          <Loader2Icon className="size-4 animate-spin" />
+        ),
+      }}
+      style={
+        {
+          "--normal-bg": "var(--popover)",
+          "--normal-text": "var(--popover-foreground)",
+          "--normal-border": "var(--border)",
+          "--border-radius": "var(--radius)",
+        } as React.CSSProperties
+      }
+      toastOptions={{
+        classNames: {
+          toast: "cn-toast",
+        },
+      }}
+      {...props}
+    />
+  )
+}
+
+export { Toaster }
diff --git a/web/src/lib/constants.ts b/web/src/lib/constants.ts
new file mode 100644
index 00000000..c9dbee9b
--- /dev/null
+++ b/web/src/lib/constants.ts
@@ -0,0 +1,14 @@
+export const githubLink = 'https://github.com/tommyxchow/frosty'
+export const appStoreLink =
+  'https://apps.apple.com/us/app/frosty-for-twitch/id1603987585'
+export const playStoreLink =
+  'https://play.google.com/store/apps/details?id=com.tommychow.frosty'
+export const twitchLink = 'https://www.twitch.tv/'
+export const bttvLink = 'https://www.betterttv.net/'
+export const ffzLink = 'https://www.frankerfacez.com/'
+export const sevenTvLink = 'https://7tv.app/'
+export const donateLink = 'https://buymeacoffee.com/tommychow'
+export const emailAddress = 'contact@frostyapp.io'
+export const emailLink = `mailto:${emailAddress}`
+export const tommyLink = 'https://www.tommychow.com/'
+export const sourceLink = 'https://github.com/tommyxchow/frostyapp.io'
diff --git a/web/src/lib/utils.ts b/web/src/lib/utils.ts
new file mode 100644
index 00000000..fed2fe91
--- /dev/null
+++ b/web/src/lib/utils.ts
@@ -0,0 +1,6 @@
+import { clsx, type ClassValue } from 'clsx'
+import { twMerge } from 'tailwind-merge'
+
+export function cn(...inputs: ClassValue[]) {
+  return twMerge(clsx(inputs))
+}
diff --git a/web/tsconfig.json b/web/tsconfig.json
new file mode 100644
index 00000000..9c6d90c7
--- /dev/null
+++ b/web/tsconfig.json
@@ -0,0 +1,40 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": false,
+    "skipLibCheck": true,
+    "strict": true,
+    "noUncheckedIndexedAccess": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleDetection": "force",
+    "moduleResolution": "bundler",
+    "isolatedModules": true,
+    "verbatimModuleSyntax": true,
+    "jsx": "react-jsx",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@/*": ["./src/*"]
+    },
+    "resolveJsonModule": true
+  },
+  "include": [
+    "next-env.d.ts",
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts",
+    ".next/dev/types/**/*.ts",
+    "**/*.mts"
+  ],
+  "exclude": ["node_modules"]
+}
diff --git a/web/wrangler.jsonc b/web/wrangler.jsonc
new file mode 100644
index 00000000..348d12cb
--- /dev/null
+++ b/web/wrangler.jsonc
@@ -0,0 +1,39 @@
+{
+  "$schema": "node_modules/wrangler/config-schema.json",
+  "main": ".open-next/worker.js",
+  "name": "frosty-web",
+  "compatibility_date": "2026-02-14",
+  "compatibility_flags": [
+    // Enable Node.js API
+    // see https://developers.cloudflare.com/workers/configuration/compatibility-flags/#nodejs-compatibility-flag
+    "nodejs_compat",
+    // Allow to fetch URLs in your app
+    // see https://developers.cloudflare.com/workers/configuration/compatibility-flags/#global-fetch-strictly-public
+    "global_fetch_strictly_public",
+  ],
+  "assets": {
+    "directory": ".open-next/assets",
+    "binding": "ASSETS",
+  },
+  "services": [
+    {
+      "binding": "WORKER_SELF_REFERENCE",
+      // The service should match the "name" of your worker
+      "service": "frosty-web",
+    },
+  ],
+  // Create a R2 binding with the binding name "NEXT_INC_CACHE_R2_BUCKET"
+  // "r2_buckets": [
+  //   {
+  //     "binding": "NEXT_INC_CACHE_R2_BUCKET",
+  //     "bucket_name": "<BUCKET_NAME>",
+  //   },
+  // ],
+  "minify": true,
+  "keep_names": false,
+  "upload_source_maps": true,
+  "keep_vars": true,
+  "observability": {
+    "enabled": true,
+  },
+}