From 2e2ee3f02888449a49c7ca61c28ebd0b8dd9f648 Mon Sep 17 00:00:00 2001
From: sudacode <suda@sudacode.com>
Date: Mon, 13 Jul 2026 22:03:35 -0700
Subject: [PATCH] refactor(tsukihime): swap Animetosho backend for TsukiHime
 API (#165)

---
 .gitignore                                    |   3 +
 README.md                                     |   1 +
 changes/animetosho-english-subtitles.md       |   4 -
 changes/tsukihime-english-subtitles.md        |   4 +
 config.example.jsonc                          |  16 +-
 docs-site/.vitepress/config.ts                |   2 +-
 docs-site/animetosho-integration.md           |  73 ---
 docs-site/public/config.example.jsonc         |  16 +-
 docs-site/shortcuts.md                        |   4 +-
 docs-site/tsukihime-integration.md            |  81 +++
 docs-site/usage.md                            |   3 +
 plugin/subminer/session_bindings.lua          |   4 +-
 scripts/test-plugin-session-bindings.lua      |   9 +
 src/animetosho/lang.test.ts                   |  45 --
 src/animetosho/utils.test.ts                  | 233 -------
 src/cli/args.test.ts                          |  12 +-
 src/cli/args.ts                               |  19 +-
 src/config/definitions.ts                     |   4 +-
 src/config/definitions/defaults-core.ts       |   2 +-
 .../definitions/defaults-integrations.ts      |   6 +-
 src/config/definitions/options-core.ts        |   6 +-
 .../definitions/options-integrations.ts       |  13 +-
 src/config/definitions/shared.ts              |   2 +
 src/config/definitions/template-sections.ts   |   8 +-
 src/config/resolve/core-domains.ts            |  16 +-
 src/config/resolve/subtitle-domains.ts        |  27 +-
 src/config/resolve/top-level.ts               |   2 +-
 src/config/resolve/tsukihime-compat.test.ts   |  63 ++
 src/config/settings/registry.test.ts          |   2 +
 src/config/settings/registry.ts               |   5 +-
 src/core/services/anki-jimaku-ipc.test.ts     |  66 +-
 src/core/services/anki-jimaku-ipc.ts          |  88 +--
 src/core/services/anki-jimaku.test.ts         |  60 +-
 src/core/services/anki-jimaku.ts              |  86 +--
 src/core/services/app-lifecycle.test.ts       |   2 +-
 src/core/services/cli-command.test.ts         |   2 +-
 src/core/services/cli-command.ts              |   8 +-
 src/core/services/ipc-command.test.ts         |  14 +-
 src/core/services/ipc-command.ts              |  10 +-
 .../services/overlay-shortcut-handler.test.ts |  22 +-
 src/core/services/overlay-shortcut-handler.ts |  14 +-
 src/core/services/overlay-shortcut.test.ts    |   8 +-
 src/core/services/overlay-shortcut.ts         |   4 +-
 src/core/services/session-actions.test.ts     |   2 +-
 src/core/services/session-actions.ts          |   6 +-
 src/core/services/session-bindings.test.ts    |  17 +-
 src/core/services/session-bindings.ts         |   6 +-
 src/core/services/startup-bootstrap.test.ts   |   2 +-
 src/core/utils/shortcut-config.ts             |   4 +-
 src/main.ts                                   |  18 +-
 src/main/dependencies.ts                      |   4 +-
 src/main/ipc-mpv-command.ts                   |   4 +-
 src/main/overlay-runtime.ts                   |  10 +-
 src/main/overlay-shortcuts-runtime.ts         |   6 +-
 .../composers/ipc-runtime-composer.test.ts    |   2 +-
 .../runtime/first-run-setup-service.test.ts   |   2 +-
 src/main/runtime/first-run-setup-service.ts   |   2 +-
 .../global-shortcuts-runtime-handlers.test.ts |   2 +-
 src/main/runtime/global-shortcuts.test.ts     |   2 +-
 .../ipc-bridge-actions-main-deps.test.ts      |   2 +-
 src/main/runtime/ipc-bridge-actions.test.ts   |   2 +-
 .../runtime/ipc-mpv-command-main-deps.test.ts |   6 +-
 src/main/runtime/ipc-mpv-command-main-deps.ts |   2 +-
 ...verlay-shortcuts-runtime-main-deps.test.ts |   2 +-
 .../overlay-shortcuts-runtime-main-deps.ts    |   2 +-
 .../{animetosho-open.ts => tsukihime-open.ts} |  16 +-
 src/preload.ts                                |  42 +-
 src/renderer/handlers/keyboard.test.ts        |   4 +-
 src/renderer/handlers/keyboard.ts             |   6 +-
 src/renderer/index.html                       |  40 +-
 src/renderer/modals/animetosho.test.ts        | 388 -----------
 src/renderer/modals/animetosho.ts             | 487 --------------
 src/renderer/modals/session-help-sections.ts  |  10 +-
 src/renderer/modals/tsukihime.test.ts         | 615 ++++++++++++++++++
 src/renderer/modals/tsukihime.ts              | 506 ++++++++++++++
 src/renderer/renderer.ts                      |  22 +-
 src/renderer/state.ts                         |  32 +-
 src/renderer/style.css                        |  14 +-
 src/renderer/utils/dom.ts                     |  48 +-
 src/shared/ipc/contracts.ts                   |  12 +-
 src/shared/ipc/validators.ts                  |  14 +-
 .../fetch-limits.test.ts                      |  34 +-
 src/tsukihime/lang.test.ts                    |  45 ++
 src/{animetosho => tsukihime}/lang.ts         |  18 +-
 src/tsukihime/utils.test.ts                   | 349 ++++++++++
 src/{animetosho => tsukihime}/utils.ts        | Bin 10527 -> 13199 bytes
 src/types/config.ts                           |  17 +-
 src/types/integrations.ts                     |  17 +-
 src/types/runtime.ts                          |  36 +-
 src/types/session-bindings.ts                 |   2 +-
 90 files changed, 2253 insertions(+), 1695 deletions(-)
 delete mode 100644 changes/animetosho-english-subtitles.md
 create mode 100644 changes/tsukihime-english-subtitles.md
 delete mode 100644 docs-site/animetosho-integration.md
 create mode 100644 docs-site/tsukihime-integration.md
 delete mode 100644 src/animetosho/lang.test.ts
 delete mode 100644 src/animetosho/utils.test.ts
 create mode 100644 src/config/resolve/tsukihime-compat.test.ts
 rename src/main/runtime/{animetosho-open.ts => tsukihime-open.ts} (74%)
 delete mode 100644 src/renderer/modals/animetosho.test.ts
 delete mode 100644 src/renderer/modals/animetosho.ts
 create mode 100644 src/renderer/modals/tsukihime.test.ts
 create mode 100644 src/renderer/modals/tsukihime.ts
 rename src/{animetosho => tsukihime}/fetch-limits.test.ts (70%)
 create mode 100644 src/tsukihime/lang.test.ts
 rename src/{animetosho => tsukihime}/lang.ts (67%)
 create mode 100644 src/tsukihime/utils.test.ts
 rename src/{animetosho => tsukihime}/utils.ts (58%)

diff --git a/.gitignore b/.gitignore
index 96c00b02..2f4cd81a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,6 @@ tests/*
 favicon.png
 .claude/*
 !stats/public/favicon.png
+
+# Browser-automation session artifacts (page snapshots, console logs, downloads)
+.playwright-mcp/
diff --git a/README.md b/README.md
index 505784f8..2d86385d 100644
--- a/README.md
+++ b/README.md
@@ -238,6 +238,7 @@ SubMiner builds on the work of these open-source projects:
 | [jellyfin-mpv-shim](https://github.com/jellyfin/jellyfin-mpv-shim)                          | Jellyfin integration                                                    |
 | [Jimaku.cc](https://jimaku.cc)                                                              | Japanese subtitle search and downloads                                  |
 | [Renji's Texthooker Page](https://github.com/Renji-XD/texthooker-ui)                        | Base for the WebSocket texthooker integration                           |
+| [TsukiHime](https://tsukihime.org)                                                          | Release-track subtitle search and downloads (Animetosho successor)      |
 | [Yomitan](https://github.com/yomidevs/yomitan)                                              | Dictionary engine powering all lookups and the morphological parser     |
 | [yomitan-jlpt-vocab](https://github.com/stephenmk/yomitan-jlpt-vocab)                       | JLPT level tags for vocabulary                                          |
 
diff --git a/changes/animetosho-english-subtitles.md b/changes/animetosho-english-subtitles.md
deleted file mode 100644
index 60907887..00000000
--- a/changes/animetosho-english-subtitles.md
+++ /dev/null
@@ -1,4 +0,0 @@
-type: added
-area: overlay
-
-- Added an Animetosho integration for downloading English (and Japanese) subtitles, mirroring the Jimaku flow: `Ctrl+Shift+T` (configurable via `shortcuts.openAnimetosho`) opens an in-overlay modal with two language tabs (the first follows `secondarySub.secondarySubLanguages`, defaulting to English; the second is Japanese) that parses the current video filename, searches Animetosho releases, lists extracted text subtitle tracks filtered by the active tab, then downloads the chosen track, decompresses it (requires the `xz` binary), saves it next to the video with a language suffix (`<video>.en.<ext>`, `.ja` for Japanese tracks, etc.), and loads it into mpv immediately - Japanese tracks as the primary subtitle, other languages as the secondary subtitle. No API key is required; also reachable via `subminer --open-animetosho`, the `__animetosho-open` keybinding command, and configurable under a new `animetosho` config section.
\ No newline at end of file
diff --git a/changes/tsukihime-english-subtitles.md b/changes/tsukihime-english-subtitles.md
new file mode 100644
index 00000000..ee20bd7a
--- /dev/null
+++ b/changes/tsukihime-english-subtitles.md
@@ -0,0 +1,4 @@
+type: added
+area: overlay
+
+- Added a TsukiHime integration for downloading primary and secondary subtitles, mirroring the Jimaku flow: `Ctrl+Shift+T` (configurable via `shortcuts.openTsukihime`) opens an in-overlay modal with a Japanese primary tab and a secondary tab that follows `secondarySub.secondarySubLanguages`. It parses the current video filename, searches TsukiHime releases, lists extracted text subtitle tracks filtered by the active tab, then downloads the chosen track, decompresses it (requires the `xz` binary), saves it next to the video with a language suffix (`<video>.en.<ext>`, `.ja` for Japanese tracks, etc.), and loads Japanese into mpv's primary slot or configured secondary tracks into its secondary slot. No API key is required; also reachable via `subminer --open-tsukihime`, the `__tsukihime-open` keybinding command, and configurable under a new `tsukihime` config section. TsukiHime is the successor to Animetosho, which stops processing new releases in May 2026; it imported the Animetosho index and mirrors its attachment storage, so older releases stay reachable. Existing `animetosho`, `shortcuts.openAnimetosho`, `--open-animetosho`, and `__animetosho-open` inputs remain accepted as deprecated aliases.
diff --git a/config.example.jsonc b/config.example.jsonc
index 008f2290..0938591d 100644
--- a/config.example.jsonc
+++ b/config.example.jsonc
@@ -205,7 +205,7 @@
     "openCharacterDictionaryManager": "CommandOrControl+D", // Accelerator that opens the character dictionary manager modal.
     "openRuntimeOptions": "CommandOrControl+Shift+O", // Accelerator that opens the runtime options modal.
     "openJimaku": "Ctrl+Shift+J", // Accelerator that opens the Jimaku subtitle search modal.
-    "openAnimetosho": "Ctrl+Shift+T", // Accelerator that opens the Animetosho subtitle search modal (English/Japanese tabs).
+    "openTsukihime": "Ctrl+Shift+T", // Accelerator that opens the TsukiHime subtitle search modal (configured secondary/Japanese primary tabs).
     "openSessionHelp": "CommandOrControl+Slash", // Accelerator that opens the session help / keybinding cheatsheet.
     "openControllerSelect": "Alt+C", // Accelerator that opens the controller selection and learn-mode modal.
     "openControllerDebug": "Alt+Shift+C", // Accelerator that opens the controller debug modal with live axis/button readouts.
@@ -614,14 +614,14 @@
   }, // Jimaku API configuration and defaults.
 
   // ==========================================
-  // Animetosho
-  // Animetosho subtitle search configuration (English and Japanese). No API key required.
-  // Hot-reload: Animetosho changes apply to the next Animetosho request.
+  // TsukiHime
+  // TsukiHime subtitle search configuration for Japanese primary and configured secondary subtitles. No API key required.
+  // Hot-reload: TsukiHime changes apply to the next TsukiHime request.
   // ==========================================
-  "animetosho": {
-    "apiBaseUrl": "https://feed.animetosho.org", // Base URL of the Animetosho JSON feed API. No API key required.
-    "maxSearchResults": 10 // Maximum Animetosho search results returned.
-  }, // Animetosho subtitle search configuration (English and Japanese). No API key required.
+  "tsukihime": {
+    "apiBaseUrl": "https://api.tsukihime.org/v1", // Base URL of the TsukiHime API (Animetosho successor). No API key required.
+    "maxSearchResults": 10 // Maximum TsukiHime search results returned.
+  }, // TsukiHime subtitle search configuration for Japanese primary and configured secondary subtitles. No API key required.
 
   // ==========================================
   // YouTube Playback Settings
diff --git a/docs-site/.vitepress/config.ts b/docs-site/.vitepress/config.ts
index c20fc4dd..e842aba8 100644
--- a/docs-site/.vitepress/config.ts
+++ b/docs-site/.vitepress/config.ts
@@ -327,7 +327,7 @@ const sidebar: DefaultTheme.SidebarItem[] = [
       { text: 'Jellyfin', link: '/jellyfin-integration' },
       { text: 'YouTube', link: '/youtube-integration' },
       { text: 'Jimaku', link: '/jimaku-integration' },
-      { text: 'Animetosho', link: '/animetosho-integration' },
+      { text: 'TsukiHime', link: '/tsukihime-integration' },
       { text: 'AniList', link: '/anilist-integration' },
       { text: 'AniSkip', link: '/aniskip-integration' },
       { text: 'Character Dictionary', link: '/character-dictionary' },
diff --git a/docs-site/animetosho-integration.md b/docs-site/animetosho-integration.md
deleted file mode 100644
index b7e56919..00000000
--- a/docs-site/animetosho-integration.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Animetosho Integration
-
-[Animetosho](https://animetosho.org) mirrors anime torrent releases and extracts every attachment - including embedded subtitle tracks - from the release files, hosting them for direct download. SubMiner integrates with the Animetosho JSON feed API so you can pull English subtitles for the currently playing episode straight from the overlay, no torrent client involved. Downloaded subtitles are decompressed, saved next to the video, and loaded into mpv immediately.
-
-This is the English-side companion to the [Jimaku integration](/jimaku-integration): Jimaku covers Japanese subtitles, Animetosho covers your secondary language (English by default). Releases that ship multiple languages (e.g. Netflix `[MultiSub]` rips) expose them all; the modal's tabs pick which ones you see, and each download is saved with its own language suffix.
-
-::: tip No API key required
-Unlike Jimaku, Animetosho needs no account or API key. The only requirement is the `xz` binary on your `PATH` - Animetosho serves extracted subtitles xz-compressed, and SubMiner shells out to `xz` to decompress them. Most Linux distributions ship it by default (package `xz` or `xz-utils`).
-:::
-
-## How It Works
-
-The integration runs through an in-overlay modal opened with `Ctrl+Shift+T` by default. The modal has two tabs that filter the subtitle tracks of the selected release by language: the first tab follows your `secondarySub.secondarySubLanguages` config (defaults to English when unset, and the tab is labeled accordingly - e.g. "German" if you configure `["de"]`), and the second tab is always **Japanese**. Tracks with no language tag stay visible on the first tab.
-
-When you open the modal, SubMiner parses the current video filename to extract a title and episode number (same parser as Jimaku - `S01E03`, `1x03`, `E03`, and dash-separated numbers all work). If the filename yields a high-confidence match, SubMiner auto-searches immediately.
-
-From there:
-
-1. **Search** - SubMiner queries the Animetosho feed with `<title> <episode>`. Results appear as a list of releases (e.g. `[SubsPlease] ... - 28 (1080p)`), with size and file count.
-2. **Browse releases** - Select a release to list the text subtitle tracks extracted from its files. English tracks sort first; image-based tracks (PGS/VobSub) are filtered out.
-3. **Download** - Selecting a track downloads the xz-compressed subtitle from Animetosho's storage, decompresses it, saves it next to the video (or a temp directory for remote/streamed media), and loads it into mpv. Japanese tracks are selected as the **primary** subtitle; any other language loads as the **secondary** subtitle, so your Japanese primary track stays in place. The filename carries the track's language - `<video basename>.en.<ext>` for English, `.ja` for Japanese, and so on - so mpv and media servers detect the language correctly.
-
-Because releases on Animetosho are the same files circulating as torrents, picking the release that matches your local file (same group, same version) gives you subtitles with exact timing - no resync needed. If your file is a raw or from a different group, pick any release of the same episode and adjust timing with the [subtitle sync tools](/troubleshooting#subtitle-sync-subsync) (`Ctrl+Alt+S`) if necessary.
-
-### Modal Keyboard Shortcuts
-
-| Key                       | Action                          |
-| ------------------------- | ------------------------------- |
-| `Enter` (in text field)      | Search                             |
-| `Enter` (in list)            | Select release / download track    |
-| `Arrow Up` / `Arrow Down`    | Navigate releases or tracks        |
-| `Arrow Left` / `Arrow Right` | Switch English / Japanese tab      |
-| `Escape`                     | Close modal                        |
-
-## Configuration
-
-The integration works out of the box. An optional `animetosho` section in `config.jsonc` tunes it:
-
-```jsonc
-{
-  "animetosho": {
-    "apiBaseUrl": "https://feed.animetosho.org",
-    "maxSearchResults": 10,
-  },
-}
-```
-
-| Option                        | Type     | Default                         | Description                                                                   |
-| ----------------------------- | -------- | ------------------------------- | ----------------------------------------------------------------------------- |
-| `animetosho.apiBaseUrl`       | `string` | `"https://feed.animetosho.org"` | Base URL of the Animetosho JSON feed API. Only change this if using a mirror. |
-| `animetosho.maxSearchResults` | `number` | `10`                            | Maximum number of releases returned per search.                               |
-
-The keyboard shortcut is configured separately under `shortcuts`:
-
-```jsonc
-{
-  "shortcuts": {
-    "openAnimetosho": "Ctrl+Shift+T", // default; set to null to disable
-  },
-}
-```
-
-## Other Ways to Open It
-
-- CLI: `subminer --open-animetosho`
-- Keybinding command: bind any key to `["__animetosho-open"]` in the `keybindings` array
-
-## Troubleshooting
-
-- **"xz binary not found"** - install `xz`/`xz-utils` with your package manager.
-- **"Batch releases are not supported"** - the Animetosho feed API only exposes extracted attachments for single-file torrents. Pick the single-episode release for your episode instead of a season batch.
-- **"No text subtitle tracks in this release"** - the release only carries image-based subtitles (PGS/VobSub) or none at all; try a different release (fansub and SubsPlease-style releases almost always carry ASS tracks).
-- **Timing is off** - the subtitle came from a different release than your video file. Use the subtitle sync modal (`Ctrl+Alt+S`) or pick the release matching your file exactly.
diff --git a/docs-site/public/config.example.jsonc b/docs-site/public/config.example.jsonc
index 008f2290..0938591d 100644
--- a/docs-site/public/config.example.jsonc
+++ b/docs-site/public/config.example.jsonc
@@ -205,7 +205,7 @@
     "openCharacterDictionaryManager": "CommandOrControl+D", // Accelerator that opens the character dictionary manager modal.
     "openRuntimeOptions": "CommandOrControl+Shift+O", // Accelerator that opens the runtime options modal.
     "openJimaku": "Ctrl+Shift+J", // Accelerator that opens the Jimaku subtitle search modal.
-    "openAnimetosho": "Ctrl+Shift+T", // Accelerator that opens the Animetosho subtitle search modal (English/Japanese tabs).
+    "openTsukihime": "Ctrl+Shift+T", // Accelerator that opens the TsukiHime subtitle search modal (configured secondary/Japanese primary tabs).
     "openSessionHelp": "CommandOrControl+Slash", // Accelerator that opens the session help / keybinding cheatsheet.
     "openControllerSelect": "Alt+C", // Accelerator that opens the controller selection and learn-mode modal.
     "openControllerDebug": "Alt+Shift+C", // Accelerator that opens the controller debug modal with live axis/button readouts.
@@ -614,14 +614,14 @@
   }, // Jimaku API configuration and defaults.
 
   // ==========================================
-  // Animetosho
-  // Animetosho subtitle search configuration (English and Japanese). No API key required.
-  // Hot-reload: Animetosho changes apply to the next Animetosho request.
+  // TsukiHime
+  // TsukiHime subtitle search configuration for Japanese primary and configured secondary subtitles. No API key required.
+  // Hot-reload: TsukiHime changes apply to the next TsukiHime request.
   // ==========================================
-  "animetosho": {
-    "apiBaseUrl": "https://feed.animetosho.org", // Base URL of the Animetosho JSON feed API. No API key required.
-    "maxSearchResults": 10 // Maximum Animetosho search results returned.
-  }, // Animetosho subtitle search configuration (English and Japanese). No API key required.
+  "tsukihime": {
+    "apiBaseUrl": "https://api.tsukihime.org/v1", // Base URL of the TsukiHime API (Animetosho successor). No API key required.
+    "maxSearchResults": 10 // Maximum TsukiHime search results returned.
+  }, // TsukiHime subtitle search configuration for Japanese primary and configured secondary subtitles. No API key required.
 
   // ==========================================
   // YouTube Playback Settings
diff --git a/docs-site/shortcuts.md b/docs-site/shortcuts.md
index f7ac467b..645cd144 100644
--- a/docs-site/shortcuts.md
+++ b/docs-site/shortcuts.md
@@ -82,7 +82,7 @@ Mouse-hover playback behavior is configured separately from shortcuts: `subtitle
 | `Ctrl/Cmd+Shift+O` | Open runtime options palette                             | `shortcuts.openRuntimeOptions`             |
 | `Ctrl/Cmd+/`       | Open session help modal                                  | `shortcuts.openSessionHelp`                |
 | `Ctrl+Shift+J`     | Open Jimaku subtitle search modal                        | `shortcuts.openJimaku`                     |
-| `Ctrl+Shift+T`     | Open Animetosho subtitle search modal (EN/JA tabs)       | `shortcuts.openAnimetosho`                 |
+| `Ctrl+Shift+T`     | Open TsukiHime subtitle search modal (EN/JA tabs)       | `shortcuts.openTsukihime`                 |
 | `Ctrl/Cmd+N`       | Toggle overlay notification history panel                | `shortcuts.toggleNotificationHistory`      |
 | `Ctrl+Alt+C`       | Open the manual YouTube subtitle picker                  | `keybindings`                              |
 | `Ctrl+Alt+S`       | Open subtitle sync (subsync) modal                       | `shortcuts.triggerSubsync`                 |
@@ -91,6 +91,8 @@ Mouse-hover playback behavior is configured separately from shortcuts: `subtitle
 | `` ` ``            | Toggle stats overlay                                     | `stats.toggleKey`                          |
 | `W`                | Mark current video watched and advance to next in queue  | `stats.markWatchedKey`                     |
 
+`shortcuts.openAnimetosho` remains accepted as a deprecated alias for `shortcuts.openTsukihime`. The current name takes precedence when both are configured.
+
 The stats toggle is handled inside the focused visible overlay window. It is configurable through the top-level `stats.toggleKey` setting and defaults to `Backquote`.
 
 The subtitle sidebar toggle is overlay-local and only opens when SubMiner has a parsed cue list for the active subtitle source.
diff --git a/docs-site/tsukihime-integration.md b/docs-site/tsukihime-integration.md
new file mode 100644
index 00000000..27455e21
--- /dev/null
+++ b/docs-site/tsukihime-integration.md
@@ -0,0 +1,81 @@
+# TsukiHime Integration
+
+[TsukiHime](https://tsukihime.org) tracks anime torrent releases and extracts every attachment - including embedded subtitle tracks - from the release files, hosting them for direct download. SubMiner integrates with the TsukiHime API so you can pull English subtitles for the currently playing episode straight from the overlay, no torrent client involved. Downloaded subtitles are decompressed, saved next to the video, and loaded into mpv immediately.
+
+This is the multi-language companion to the [Jimaku integration](/jimaku-integration). Releases that ship multiple languages (e.g. Netflix `[MultiSub]` rips) expose them all; the modal's tabs pick which ones you see, and each download is saved with its own language suffix.
+
+::: tip Successor to Animetosho
+TsukiHime replaces [Animetosho](https://animetosho.org), which stops processing new releases in May 2026. TsukiHime imported the Animetosho index and mirrors its attachment storage, so older releases stay reachable alongside new ones.
+:::
+
+::: tip No API key required
+Unlike Jimaku, TsukiHime needs no account or API key. The only requirement is the `xz` binary on your `PATH` - TsukiHime serves extracted subtitles xz-compressed, and SubMiner shells out to `xz` to decompress them. Most Linux distributions ship it by default (package `xz` or `xz-utils`).
+:::
+
+## How It Works
+
+The integration runs through an in-overlay modal opened with `Ctrl+Shift+T` by default. The modal has two tabs that filter the subtitle tracks of the selected release by role: the first follows `secondarySub.secondarySubLanguages` (English when unset), and the second is always **Japanese**, the currently supported primary subtitle language. Tracks with no language tag stay visible on the secondary tab.
+
+When you open the modal, SubMiner parses the current video filename to extract a title and episode number (same parser as Jimaku - `S01E03`, `1x03`, `E03`, and dash-separated numbers all work). If the filename yields a high-confidence match, SubMiner auto-searches immediately.
+
+From there:
+
+1. **Search** - SubMiner queries TsukiHime with `<title> <episode>`. Results appear as a list of releases (e.g. `[SubsPlease] ... - 28 (1080p)`), each showing size, file count, and the subtitle languages the release carries.
+2. **Browse releases** - Select a release to list the text subtitle tracks extracted from its files. English tracks sort first; image-based tracks (PGS/VobSub) are filtered out.
+3. **Download** - Selecting a track downloads the xz-compressed subtitle from TsukiHime's storage, decompresses it, saves it next to the video (or a temp directory for remote/streamed media), and loads it into mpv. Japanese tracks are selected as mpv's **primary** subtitle. Tracks from the configured secondary tab are assigned to mpv's **secondary** subtitle slot without replacing the primary. The filename carries the track's language - `<video basename>.en.<ext>` for English, `.ja` for Japanese, and so on - so mpv and media servers detect the language correctly.
+
+Because releases on TsukiHime are the same files circulating as torrents, picking the release that matches your local file (same group, same version) gives you subtitles with exact timing - no resync needed. If your file is a raw or from a different group, pick any release of the same episode and adjust timing with the [subtitle sync tools](/troubleshooting#subtitle-sync-subsync) (`Ctrl+Alt+S`) if necessary.
+
+### Modal Keyboard Shortcuts
+
+| Key                          | Action                          |
+| ---------------------------- | ------------------------------- |
+| `Enter` (in text field)      | Search                          |
+| `Enter` (in list)            | Select release / download track |
+| `Arrow Up` / `Arrow Down`    | Navigate releases or tracks     |
+| `Arrow Left` / `Arrow Right` | Switch English / Japanese tab   |
+| `Escape`                     | Close modal                     |
+
+## Configuration
+
+The integration works out of the box. An optional `tsukihime` section in `config.jsonc` tunes it:
+
+```jsonc
+{
+  "tsukihime": {
+    "apiBaseUrl": "https://api.tsukihime.org/v1",
+    "maxSearchResults": 10,
+  },
+}
+```
+
+| Option                       | Type     | Default                          | Description                                                                |
+| ---------------------------- | -------- | -------------------------------- | -------------------------------------------------------------------------- |
+| `tsukihime.apiBaseUrl`       | `string` | `"https://api.tsukihime.org/v1"` | Base URL of the TsukiHime API. Only change this if using a mirror.         |
+| `tsukihime.maxSearchResults` | `number` | `10`                             | Maximum number of releases returned per search (the API caps this at 100). |
+
+The keyboard shortcut is configured separately under `shortcuts`:
+
+```jsonc
+{
+  "shortcuts": {
+    "openTsukihime": "Ctrl+Shift+T", // default; set to null to disable
+  },
+}
+```
+
+Existing Animetosho configuration remains compatible. SubMiner treats the old `animetosho` section and `shortcuts.openAnimetosho` setting as deprecated aliases. When old and current names are both present, `tsukihime` and `shortcuts.openTsukihime` take precedence.
+
+## Other Ways to Open It
+
+- CLI: `subminer --open-tsukihime`
+- Keybinding command: bind any key to `["__tsukihime-open"]` in the `keybindings` array
+
+The previous `--open-animetosho` flag and `__animetosho-open` keybinding command remain accepted as deprecated aliases.
+
+## Troubleshooting
+
+- **"xz binary not found"** - install `xz`/`xz-utils` with your package manager.
+- **"Batch releases are not supported"** - TsukiHime only exposes extracted attachments for single-file torrents. Pick the single-episode release for your episode instead of a season batch.
+- **"No text subtitle tracks in this release"** - the release only carries image-based subtitles (PGS/VobSub) or none at all; try a different release (fansub and SubsPlease-style releases almost always carry ASS tracks).
+- **Timing is off** - the subtitle came from a different release than your video file. Use the subtitle sync modal (`Ctrl+Alt+S`) or pick the release matching your file exactly.
diff --git a/docs-site/usage.md b/docs-site/usage.md
index edb30232..5f157cbf 100644
--- a/docs-site/usage.md
+++ b/docs-site/usage.md
@@ -151,6 +151,7 @@ SubMiner.AppImage --show-visible-overlay              # Force show visible overl
 SubMiner.AppImage --hide-visible-overlay              # Force hide visible overlay
 SubMiner.AppImage --toggle-primary-subtitle-bar       # Toggle primary subtitle bar visibility
 SubMiner.AppImage --toggle-subtitle-sidebar           # Toggle the subtitle sidebar
+SubMiner.AppImage --open-tsukihime                    # Open TsukiHime subtitle search
 SubMiner.AppImage --start --dev                         # Enable app/dev mode only
 SubMiner.AppImage --start --debug                       # Alias for --dev
 SubMiner.AppImage --start --log-level debug             # Force verbose logging without app/dev mode
@@ -174,6 +175,8 @@ SubMiner.AppImage --help                  # Show all options
 
 `--check` performs connection and version checks without changing data. `--json` emits the NDJSON event protocol used by the sync window. `--ui` opens that window in a detached app process and returns the shell immediately; closing a standalone-launched Sync window exits that app instance. `--make-temp` and `--remove-temp` are internal remote-transfer helpers and should normally be left to SubMiner. The packaged app's `--sync-cli` flag selects its headless sync-compatible entrypoint; the `subminer sync` launcher command proxies to it automatically.
 
+The previous `--open-animetosho` flag remains accepted as a deprecated alias for `--open-tsukihime`.
+
 The tray menu includes `Export Logs`, which creates the same sanitized local-date log ZIP as `subminer logs -e` and shows the archive path when complete. Export sanitization masks common PII and secrets, including home-directory usernames, IP addresses, emails, auth/cookie headers, yt-dlp cookie arguments, URL credentials, token/key/password fields, and signed YouTube media URL query strings. The exported copy is sanitized; source log files remain unredacted on disk.
 
 Once Jellyfin is configured, the tray menu includes `Jellyfin Discovery` for starting or stopping cast discovery in the current app session without changing config.
diff --git a/plugin/subminer/session_bindings.lua b/plugin/subminer/session_bindings.lua
index 7bc8ef02..8cb89fb8 100644
--- a/plugin/subminer/session_bindings.lua
+++ b/plugin/subminer/session_bindings.lua
@@ -254,8 +254,8 @@ function M.create(ctx)
 			return { "--open-runtime-options" }
 		elseif action_id == "openJimaku" then
 			return { "--open-jimaku" }
-		elseif action_id == "openAnimetosho" then
-			return { "--open-animetosho" }
+		elseif action_id == "openTsukihime" or action_id == "openAnimetosho" then
+			return { "--open-tsukihime" }
 		elseif action_id == "openYoutubePicker" then
 			return { "--open-youtube-picker" }
 		elseif action_id == "openSessionHelp" then
diff --git a/scripts/test-plugin-session-bindings.lua b/scripts/test-plugin-session-bindings.lua
index 952adb17..482941f6 100644
--- a/scripts/test-plugin-session-bindings.lua
+++ b/scripts/test-plugin-session-bindings.lua
@@ -237,6 +237,14 @@ local ctx = {
 						actionType = "session-action",
 						actionId = "openPlaylistBrowser",
 					},
+					{
+						key = {
+							code = "KeyT",
+							modifiers = { "ctrl", "alt" },
+						},
+						actionType = "session-action",
+						actionId = "openAnimetosho",
+					},
 					{
 						key = {
 							code = "KeyH",
@@ -387,6 +395,7 @@ end
 local expected_cli_bindings = {
 	{ keys = "Ctrl+Alt+c", flag = "--open-youtube-picker" },
 	{ keys = "Ctrl+Alt+p", flag = "--open-playlist-browser" },
+	{ keys = "Ctrl+Alt+t", flag = "--open-tsukihime" },
 	{ keys = "Ctrl+H", flag = "--replay-current-subtitle" },
 	{ keys = "Ctrl+L", flag = "--play-next-subtitle" },
 	{ keys = "w", flag = "--mark-watched" },
diff --git a/src/animetosho/lang.test.ts b/src/animetosho/lang.test.ts
deleted file mode 100644
index 3dce1cab..00000000
--- a/src/animetosho/lang.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import {
-  animetoshoLangToFilenameSuffix,
-  animetoshoTrackMatchesLanguages,
-  describeAnimetoshoTabLanguages,
-  normalizeAnimetoshoLangCode,
-} from './lang.js';
-
-test('normalizeAnimetoshoLangCode collapses 2/3-letter and region variants', () => {
-  assert.equal(normalizeAnimetoshoLangCode('eng'), 'en');
-  assert.equal(normalizeAnimetoshoLangCode('en'), 'en');
-  assert.equal(normalizeAnimetoshoLangCode('en-US'), 'en');
-  assert.equal(normalizeAnimetoshoLangCode('GER'), 'de');
-  assert.equal(normalizeAnimetoshoLangCode('jpn'), 'ja');
-  assert.equal(normalizeAnimetoshoLangCode('vie'), 'vie');
-  assert.equal(normalizeAnimetoshoLangCode(''), '');
-});
-
-test('animetoshoTrackMatchesLanguages matches across code forms', () => {
-  assert.equal(animetoshoTrackMatchesLanguages('eng', ['en']), true);
-  assert.equal(animetoshoTrackMatchesLanguages('eng', ['en', 'eng']), true);
-  assert.equal(animetoshoTrackMatchesLanguages('ger', ['de']), true);
-  assert.equal(animetoshoTrackMatchesLanguages('por', ['en']), false);
-  assert.equal(animetoshoTrackMatchesLanguages('spa', ['en', 'de']), false);
-});
-
-test('animetoshoTrackMatchesLanguages keeps unknown-language tracks visible', () => {
-  assert.equal(animetoshoTrackMatchesLanguages('', ['en']), true);
-  assert.equal(animetoshoTrackMatchesLanguages('und', ['en']), true);
-});
-
-test('describeAnimetoshoTabLanguages names common languages and dedupes', () => {
-  assert.equal(describeAnimetoshoTabLanguages(['en', 'eng']), 'English');
-  assert.equal(describeAnimetoshoTabLanguages(['de']), 'German');
-  assert.equal(describeAnimetoshoTabLanguages(['en', 'de']), 'English / German');
-  assert.equal(describeAnimetoshoTabLanguages(['vie']), 'VIE');
-  assert.equal(describeAnimetoshoTabLanguages([]), 'English');
-});
-
-test('animetoshoLangToFilenameSuffix is re-exported from the pure module', () => {
-  assert.equal(animetoshoLangToFilenameSuffix('jpn'), 'ja');
-  assert.equal(animetoshoLangToFilenameSuffix('eng'), 'en');
-});
diff --git a/src/animetosho/utils.test.ts b/src/animetosho/utils.test.ts
deleted file mode 100644
index 3eab9ea0..00000000
--- a/src/animetosho/utils.test.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { execFileSync } from 'node:child_process';
-
-import {
-  animetoshoLangToFilenameSuffix,
-  buildAnimetoshoAttachmentUrl,
-  decompressXzFile,
-  extractAnimetoshoSubtitleFiles,
-  mapAnimetoshoSearchResults,
-} from './utils.js';
-
-test('buildAnimetoshoAttachmentUrl pads the attachment id to 8 hex digits', () => {
-  assert.equal(
-    buildAnimetoshoAttachmentUrl(1955356),
-    'https://animetosho.org/storage/attach/001dd61c/1955356.xz',
-  );
-});
-
-test('animetoshoLangToFilenameSuffix maps common ISO 639-2 codes to two-letter suffixes', () => {
-  assert.equal(animetoshoLangToFilenameSuffix('eng'), 'en');
-  assert.equal(animetoshoLangToFilenameSuffix('jpn'), 'ja');
-  assert.equal(animetoshoLangToFilenameSuffix('ger'), 'de');
-  assert.equal(animetoshoLangToFilenameSuffix('spa'), 'es');
-  assert.equal(animetoshoLangToFilenameSuffix('POR'), 'pt');
-});
-
-test('animetoshoLangToFilenameSuffix falls back to the raw code, and to en when unknown', () => {
-  assert.equal(animetoshoLangToFilenameSuffix('vie'), 'vie');
-  assert.equal(animetoshoLangToFilenameSuffix(''), 'en');
-  assert.equal(animetoshoLangToFilenameSuffix(undefined), 'en');
-  assert.equal(animetoshoLangToFilenameSuffix('und'), 'en');
-});
-
-test('buildAnimetoshoAttachmentUrl rejects non-positive and non-integer ids', () => {
-  assert.equal(buildAnimetoshoAttachmentUrl(0), null);
-  assert.equal(buildAnimetoshoAttachmentUrl(-5), null);
-  assert.equal(buildAnimetoshoAttachmentUrl(1.5), null);
-  assert.equal(buildAnimetoshoAttachmentUrl(Number.NaN), null);
-});
-
-test('mapAnimetoshoSearchResults maps valid entries and caps to maxResults', () => {
-  const payload = [
-    {
-      id: 606713,
-      title: '[SubsPlease] Sousou no Frieren - 28 (1080p) [8BBBC28C].mkv',
-      timestamp: 1710000000,
-      total_size: 1490354395,
-      num_files: 1,
-    },
-    { id: 'bogus', title: 'missing numeric id' },
-    { id: 606714, title: '[Erai-raws] Sousou no Frieren - 28 [1080p].mkv' },
-    { id: 606715, title: 'capped away' },
-  ];
-
-  const entries = mapAnimetoshoSearchResults(payload, 2);
-  assert.equal(entries.length, 2);
-  assert.deepEqual(entries[0], {
-    id: 606713,
-    title: '[SubsPlease] Sousou no Frieren - 28 (1080p) [8BBBC28C].mkv',
-    timestamp: 1710000000,
-    totalSize: 1490354395,
-    numFiles: 1,
-  });
-  assert.equal(entries[1]!.id, 606714);
-  assert.equal(entries[1]!.totalSize, null);
-  assert.equal(entries[1]!.numFiles, null);
-});
-
-test('mapAnimetoshoSearchResults returns empty list for non-array payloads', () => {
-  assert.deepEqual(mapAnimetoshoSearchResults({ error: 'nope' }, 10), []);
-  assert.deepEqual(mapAnimetoshoSearchResults(null, 10), []);
-});
-
-const DETAIL_PAYLOAD = {
-  id: 606713,
-  title: '[SubsPlease] Sousou no Frieren - 28 (1080p) [8BBBC28C].mkv',
-  files: [
-    {
-      id: 1151711,
-      filename: '[SubsPlease] Sousou no Frieren - 28 (1080p) [8BBBC28C].mkv',
-      attachments: [
-        {
-          id: 1955355,
-          type: 'font',
-          info: { name: 'arial.ttf' },
-          size: 300000,
-        },
-        {
-          id: 1955356,
-          type: 'subtitle',
-          info: { codec: 'ASS', lang: 'eng', name: 'English subs', trackid: 2 },
-          size: 33075,
-        },
-      ],
-    },
-  ],
-};
-
-test('extractAnimetoshoSubtitleFiles keeps only text subtitle attachments with download urls', () => {
-  const files = extractAnimetoshoSubtitleFiles(DETAIL_PAYLOAD);
-  assert.equal(files.length, 1);
-  const file = files[0]!;
-  assert.equal(file.attachmentId, 1955356);
-  assert.equal(file.lang, 'eng');
-  assert.equal(file.trackName, 'English subs');
-  assert.equal(file.size, 33075);
-  assert.equal(file.url, 'https://animetosho.org/storage/attach/001dd61c/1955356.xz');
-  assert.equal(file.sourceFilename, '[SubsPlease] Sousou no Frieren - 28 (1080p) [8BBBC28C].mkv');
-  assert.equal(file.filename, '[SubsPlease] Sousou no Frieren - 28 (1080p) [8BBBC28C].eng.ass');
-});
-
-test('extractAnimetoshoSubtitleFiles skips image-based subtitle codecs', () => {
-  const files = extractAnimetoshoSubtitleFiles({
-    files: [
-      {
-        id: 1,
-        filename: 'movie.mkv',
-        attachments: [
-          { id: 10, type: 'subtitle', info: { codec: 'PGS', lang: 'eng' }, size: 100 },
-          { id: 11, type: 'subtitle', info: { codec: 'VobSub', lang: 'eng' }, size: 100 },
-          { id: 12, type: 'subtitle', info: { codec: 'SRT', lang: 'eng' }, size: 100 },
-        ],
-      },
-    ],
-  });
-  assert.deepEqual(
-    files.map((f) => f.attachmentId),
-    [12],
-  );
-  assert.equal(files[0]!.filename, 'movie.eng.srt');
-});
-
-test('extractAnimetoshoSubtitleFiles sorts English tracks first and disambiguates duplicates', () => {
-  const files = extractAnimetoshoSubtitleFiles({
-    files: [
-      {
-        id: 1,
-        filename: 'episode.mkv',
-        attachments: [
-          {
-            id: 21,
-            type: 'subtitle',
-            info: { codec: 'ASS', lang: 'ger', name: 'Deutsch' },
-            size: 1,
-          },
-          {
-            id: 22,
-            type: 'subtitle',
-            info: { codec: 'ASS', lang: 'eng', name: 'Signs & Songs' },
-            size: 2,
-          },
-          {
-            id: 23,
-            type: 'subtitle',
-            info: { codec: 'ASS', lang: 'eng', name: 'Full Subtitles' },
-            size: 3,
-          },
-        ],
-      },
-    ],
-  });
-
-  assert.deepEqual(
-    files.map((f) => f.attachmentId),
-    [22, 23, 21],
-  );
-  assert.equal(files[0]!.filename, 'episode.eng.signs-songs.ass');
-  assert.equal(files[1]!.filename, 'episode.eng.full-subtitles.ass');
-  assert.equal(files[2]!.filename, 'episode.ger.ass');
-});
-
-test('extractAnimetoshoSubtitleFiles tolerates missing info fields', () => {
-  const files = extractAnimetoshoSubtitleFiles({
-    files: [
-      {
-        id: 1,
-        attachments: [{ id: 31, type: 'subtitle', info: { codec: 'ASS' }, size: 5 }],
-      },
-    ],
-  });
-  assert.equal(files.length, 1);
-  assert.equal(files[0]!.lang, '');
-  assert.equal(files[0]!.trackName, null);
-  assert.equal(files[0]!.filename, 'subtitle.ass');
-});
-
-const hasXz = (() => {
-  try {
-    execFileSync('xz', ['--version'], { stdio: 'ignore' });
-    return true;
-  } catch {
-    return false;
-  }
-})();
-
-test('decompressXzFile round-trips an xz-compressed subtitle', { skip: !hasXz }, async () => {
-  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-animetosho-test-'));
-  try {
-    const plainPath = path.join(dir, 'sub.ass');
-    const content = '[Script Info]\nTitle: test\n';
-    fs.writeFileSync(plainPath, content, 'utf8');
-    execFileSync('xz', ['-z', plainPath]);
-
-    const destPath = path.join(dir, 'out.ass');
-    const result = await decompressXzFile(`${plainPath}.xz`, destPath);
-    assert.equal(result.ok, true);
-    if (result.ok) {
-      assert.equal(result.path, destPath);
-    }
-    assert.equal(fs.readFileSync(destPath, 'utf8'), content);
-  } finally {
-    fs.rmSync(dir, { recursive: true, force: true });
-  }
-});
-
-test('decompressXzFile reports an error for corrupt input', { skip: !hasXz }, async () => {
-  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-animetosho-test-'));
-  try {
-    const srcPath = path.join(dir, 'broken.xz');
-    fs.writeFileSync(srcPath, 'not xz data');
-    const result = await decompressXzFile(srcPath, path.join(dir, 'out.ass'));
-    assert.equal(result.ok, false);
-    if (!result.ok) {
-      assert.match(result.error.error, /xz|decompress/i);
-    }
-  } finally {
-    fs.rmSync(dir, { recursive: true, force: true });
-  }
-});
diff --git a/src/cli/args.test.ts b/src/cli/args.test.ts
index 556f0cf3..06ac662a 100644
--- a/src/cli/args.test.ts
+++ b/src/cli/args.test.ts
@@ -115,7 +115,7 @@ test('parseArgs captures session action forwarding flags', () => {
     '--toggle-stats-overlay',
     '--mark-watched',
     '--open-jimaku',
-    '--open-animetosho',
+    '--open-tsukihime',
     '--open-youtube-picker',
     '--open-playlist-browser',
     '--toggle-primary-subtitle-bar',
@@ -133,7 +133,7 @@ test('parseArgs captures session action forwarding flags', () => {
   assert.equal(args.toggleStatsOverlay, true);
   assert.equal(args.markWatched, true);
   assert.equal(args.openJimaku, true);
-  assert.equal(args.openAnimetosho, true);
+  assert.equal(args.openTsukihime, true);
   assert.equal(args.openYoutubePicker, true);
   assert.equal(args.openPlaylistBrowser, true);
   assert.equal(args.togglePrimarySubtitleBar, true);
@@ -148,6 +148,14 @@ test('parseArgs captures session action forwarding flags', () => {
   assert.equal(shouldStartApp(args), true);
 });
 
+test('parseArgs keeps the legacy Animetosho open flag as a TsukiHime alias', () => {
+  const args = parseArgs(['--open-animetosho']);
+
+  assert.equal(args.openTsukihime, true);
+  assert.equal(hasExplicitCommand(args), true);
+  assert.equal(shouldStartApp(args), true);
+});
+
 test('parseArgs ignores retired subtitle delay shift flags', () => {
   const args = parseArgs(['--shift-sub-delay-prev-line', '--shift-sub-delay-next-line']);
 
diff --git a/src/cli/args.ts b/src/cli/args.ts
index e5067a22..790c94c7 100644
--- a/src/cli/args.ts
+++ b/src/cli/args.ts
@@ -38,7 +38,7 @@ export interface CliArgs {
   openControllerSelect: boolean;
   openControllerDebug: boolean;
   openJimaku: boolean;
-  openAnimetosho: boolean;
+  openTsukihime: boolean;
   openYoutubePicker: boolean;
   openPlaylistBrowser: boolean;
   replayCurrentSubtitle: boolean;
@@ -148,7 +148,7 @@ export function parseArgs(argv: string[]): CliArgs {
     openControllerSelect: false,
     openControllerDebug: false,
     openJimaku: false,
-    openAnimetosho: false,
+    openTsukihime: false,
     openYoutubePicker: false,
     openPlaylistBrowser: false,
     replayCurrentSubtitle: false,
@@ -297,8 +297,9 @@ export function parseArgs(argv: string[]): CliArgs {
     else if (arg === '--open-controller-select') args.openControllerSelect = true;
     else if (arg === '--open-controller-debug') args.openControllerDebug = true;
     else if (arg === '--open-jimaku') args.openJimaku = true;
-    else if (arg === '--open-animetosho') args.openAnimetosho = true;
-    else if (arg === '--open-youtube-picker') args.openYoutubePicker = true;
+    else if (arg === '--open-tsukihime' || arg === '--open-animetosho') {
+      args.openTsukihime = true;
+    } else if (arg === '--open-youtube-picker') args.openYoutubePicker = true;
     else if (arg === '--open-playlist-browser') args.openPlaylistBrowser = true;
     else if (arg === '--replay-current-subtitle') args.replayCurrentSubtitle = true;
     else if (arg === '--play-next-subtitle') args.playNextSubtitle = true;
@@ -571,7 +572,7 @@ export function hasExplicitCommand(args: CliArgs): boolean {
     args.openControllerSelect ||
     args.openControllerDebug ||
     args.openJimaku ||
-    args.openAnimetosho ||
+    args.openTsukihime ||
     args.openYoutubePicker ||
     args.openPlaylistBrowser ||
     args.replayCurrentSubtitle ||
@@ -650,7 +651,7 @@ export function isStandaloneTexthookerCommand(args: CliArgs): boolean {
     !args.openControllerSelect &&
     !args.openControllerDebug &&
     !args.openJimaku &&
-    !args.openAnimetosho &&
+    !args.openTsukihime &&
     !args.openYoutubePicker &&
     !args.openPlaylistBrowser &&
     !args.replayCurrentSubtitle &&
@@ -718,7 +719,7 @@ export function shouldStartApp(args: CliArgs): boolean {
     args.openControllerSelect ||
     args.openControllerDebug ||
     args.openJimaku ||
-    args.openAnimetosho ||
+    args.openTsukihime ||
     args.openYoutubePicker ||
     args.openPlaylistBrowser ||
     args.replayCurrentSubtitle ||
@@ -780,7 +781,7 @@ export function shouldRunYomitanOnlyStartup(args: CliArgs): boolean {
     !args.openControllerSelect &&
     !args.openControllerDebug &&
     !args.openJimaku &&
-    !args.openAnimetosho &&
+    !args.openTsukihime &&
     !args.openYoutubePicker &&
     !args.openPlaylistBrowser &&
     !args.replayCurrentSubtitle &&
@@ -846,7 +847,7 @@ export function commandNeedsOverlayRuntime(args: CliArgs): boolean {
     args.openControllerSelect ||
     args.openControllerDebug ||
     args.openJimaku ||
-    args.openAnimetosho ||
+    args.openTsukihime ||
     args.openYoutubePicker ||
     args.openPlaylistBrowser ||
     args.replayCurrentSubtitle ||
diff --git a/src/config/definitions.ts b/src/config/definitions.ts
index c8994d8b..0cdfc924 100644
--- a/src/config/definitions.ts
+++ b/src/config/definitions.ts
@@ -40,7 +40,7 @@ const {
 const {
   ankiConnect,
   jimaku,
-  animetosho,
+  tsukihime,
   anilist,
   mpv,
   yomitan,
@@ -73,7 +73,7 @@ export const DEFAULT_CONFIG: ResolvedConfig = {
   subtitleSidebar,
   auto_start_overlay,
   jimaku,
-  animetosho,
+  tsukihime,
   anilist,
   mpv,
   yomitan,
diff --git a/src/config/definitions/defaults-core.ts b/src/config/definitions/defaults-core.ts
index b0e9f7f7..7d61e884 100644
--- a/src/config/definitions/defaults-core.ts
+++ b/src/config/definitions/defaults-core.ts
@@ -98,7 +98,7 @@ export const CORE_DEFAULT_CONFIG: Pick<
     openCharacterDictionaryManager: 'CommandOrControl+D',
     openRuntimeOptions: 'CommandOrControl+Shift+O',
     openJimaku: 'Ctrl+Shift+J',
-    openAnimetosho: 'Ctrl+Shift+T',
+    openTsukihime: 'Ctrl+Shift+T',
     openSessionHelp: 'CommandOrControl+Slash',
     openControllerSelect: 'Alt+C',
     openControllerDebug: 'Alt+Shift+C',
diff --git a/src/config/definitions/defaults-integrations.ts b/src/config/definitions/defaults-integrations.ts
index 6e566bee..bb18a955 100644
--- a/src/config/definitions/defaults-integrations.ts
+++ b/src/config/definitions/defaults-integrations.ts
@@ -5,7 +5,7 @@ export const INTEGRATIONS_DEFAULT_CONFIG: Pick<
   ResolvedConfig,
   | 'ankiConnect'
   | 'jimaku'
-  | 'animetosho'
+  | 'tsukihime'
   | 'anilist'
   | 'mpv'
   | 'yomitan'
@@ -97,8 +97,8 @@ export const INTEGRATIONS_DEFAULT_CONFIG: Pick<
     languagePreference: 'ja',
     maxEntryResults: 10,
   },
-  animetosho: {
-    apiBaseUrl: 'https://feed.animetosho.org',
+  tsukihime: {
+    apiBaseUrl: 'https://api.tsukihime.org/v1',
     maxSearchResults: 10,
   },
   mpv: {
diff --git a/src/config/definitions/options-core.ts b/src/config/definitions/options-core.ts
index d2858918..46cd7399 100644
--- a/src/config/definitions/options-core.ts
+++ b/src/config/definitions/options-core.ts
@@ -616,11 +616,11 @@ export function buildCoreConfigOptionRegistry(
       description: 'Accelerator that opens the Jimaku subtitle search modal.',
     },
     {
-      path: 'shortcuts.openAnimetosho',
+      path: 'shortcuts.openTsukihime',
       kind: 'string',
-      defaultValue: defaultConfig.shortcuts.openAnimetosho,
+      defaultValue: defaultConfig.shortcuts.openTsukihime,
       description:
-        'Accelerator that opens the Animetosho subtitle search modal (English/Japanese tabs).',
+        'Accelerator that opens the TsukiHime subtitle search modal (configured secondary/Japanese primary tabs).',
     },
     {
       path: 'shortcuts.openSessionHelp',
diff --git a/src/config/definitions/options-integrations.ts b/src/config/definitions/options-integrations.ts
index eeed95a3..fbcbb91a 100644
--- a/src/config/definitions/options-integrations.ts
+++ b/src/config/definitions/options-integrations.ts
@@ -401,16 +401,17 @@ export function buildIntegrationConfigOptionRegistry(
       description: 'Maximum Jimaku search results returned.',
     },
     {
-      path: 'animetosho.apiBaseUrl',
+      path: 'tsukihime.apiBaseUrl',
       kind: 'string',
-      defaultValue: defaultConfig.animetosho.apiBaseUrl,
-      description: 'Base URL of the Animetosho JSON feed API. No API key required.',
+      defaultValue: defaultConfig.tsukihime.apiBaseUrl,
+      description:
+        'Base URL of the TsukiHime API (Animetosho successor). No API key required.',
     },
     {
-      path: 'animetosho.maxSearchResults',
+      path: 'tsukihime.maxSearchResults',
       kind: 'number',
-      defaultValue: defaultConfig.animetosho.maxSearchResults,
-      description: 'Maximum Animetosho search results returned.',
+      defaultValue: defaultConfig.tsukihime.maxSearchResults,
+      description: 'Maximum TsukiHime search results returned.',
     },
     {
       path: 'anilist.enabled',
diff --git a/src/config/definitions/shared.ts b/src/config/definitions/shared.ts
index bd045447..ef937dbe 100644
--- a/src/config/definitions/shared.ts
+++ b/src/config/definitions/shared.ts
@@ -53,7 +53,9 @@ export const SPECIAL_COMMANDS = {
   SUBSYNC_TRIGGER: '__subsync-trigger',
   RUNTIME_OPTIONS_OPEN: '__runtime-options-open',
   JIMAKU_OPEN: '__jimaku-open',
+  /** @deprecated Use TSUKIHIME_OPEN. */
   ANIMETOSHO_OPEN: '__animetosho-open',
+  TSUKIHIME_OPEN: '__tsukihime-open',
   RUNTIME_OPTION_CYCLE_PREFIX: '__runtime-option-cycle:',
   REPLAY_SUBTITLE: '__replay-subtitle',
   PLAY_NEXT_SUBTITLE: '__play-next-subtitle',
diff --git a/src/config/definitions/template-sections.ts b/src/config/definitions/template-sections.ts
index fcc07845..19d0d0ec 100644
--- a/src/config/definitions/template-sections.ts
+++ b/src/config/definitions/template-sections.ts
@@ -148,12 +148,12 @@ const INTEGRATION_TEMPLATE_SECTIONS: ConfigTemplateSection[] = [
     key: 'jimaku',
   },
   {
-    title: 'Animetosho',
+    title: 'TsukiHime',
     description: [
-      'Animetosho subtitle search configuration (English and Japanese). No API key required.',
+      'TsukiHime subtitle search configuration for Japanese primary and configured secondary subtitles. No API key required.',
     ],
-    notes: ['Hot-reload: Animetosho changes apply to the next Animetosho request.'],
-    key: 'animetosho',
+    notes: ['Hot-reload: TsukiHime changes apply to the next TsukiHime request.'],
+    key: 'tsukihime',
   },
   {
     title: 'YouTube Playback Settings',
diff --git a/src/config/resolve/core-domains.ts b/src/config/resolve/core-domains.ts
index ff1f4436..c531fc52 100644
--- a/src/config/resolve/core-domains.ts
+++ b/src/config/resolve/core-domains.ts
@@ -236,7 +236,7 @@ export function applyCoreDomainConfig(context: ResolveContext): void {
       'openCharacterDictionaryManager',
       'openRuntimeOptions',
       'openJimaku',
-      'openAnimetosho',
+      'openTsukihime',
       'openSessionHelp',
       'openControllerSelect',
       'openControllerDebug',
@@ -254,6 +254,20 @@ export function applyCoreDomainConfig(context: ResolveContext): void {
       }
     }
 
+    if (src.shortcuts.openTsukihime === undefined) {
+      const legacyOpenTsukihime = src.shortcuts.openAnimetosho;
+      if (typeof legacyOpenTsukihime === 'string' || legacyOpenTsukihime === null) {
+        resolved.shortcuts.openTsukihime = legacyOpenTsukihime;
+      } else if (legacyOpenTsukihime !== undefined) {
+        warn(
+          'shortcuts.openAnimetosho',
+          legacyOpenTsukihime,
+          resolved.shortcuts.openTsukihime,
+          'Expected string or null.',
+        );
+      }
+    }
+
     const timeout = asNumber(src.shortcuts.multiCopyTimeoutMs);
     if (timeout !== undefined && timeout > 0) {
       resolved.shortcuts.multiCopyTimeoutMs = Math.floor(timeout);
diff --git a/src/config/resolve/subtitle-domains.ts b/src/config/resolve/subtitle-domains.ts
index 2f45a33e..8d07e410 100644
--- a/src/config/resolve/subtitle-domains.ts
+++ b/src/config/resolve/subtitle-domains.ts
@@ -80,18 +80,27 @@ export function applySubtitleDomainConfig(context: ResolveContext): void {
     }
   }
 
-  if (isObject(src.animetosho)) {
-    const apiBaseUrl = asString(src.animetosho.apiBaseUrl);
-    if (apiBaseUrl !== undefined) resolved.animetosho.apiBaseUrl = apiBaseUrl;
+  const currentTsukihimeSource = isObject(src.tsukihime) ? src.tsukihime : null;
+  if (src.tsukihime !== undefined && !currentTsukihimeSource) {
+    warn('tsukihime', src.tsukihime, resolved.tsukihime, 'Expected object.');
+  }
 
-    const maxSearchResults = asNumber(src.animetosho.maxSearchResults);
+  const legacyTsukihimeSource =
+    src.tsukihime === undefined && isObject(src.animetosho) ? src.animetosho : null;
+  const tsukihimeSource = currentTsukihimeSource ?? legacyTsukihimeSource;
+  const tsukihimeSourcePath = currentTsukihimeSource ? 'tsukihime' : 'animetosho';
+  if (tsukihimeSource) {
+    const apiBaseUrl = asString(tsukihimeSource.apiBaseUrl);
+    if (apiBaseUrl !== undefined) resolved.tsukihime.apiBaseUrl = apiBaseUrl;
+
+    const maxSearchResults = asNumber(tsukihimeSource.maxSearchResults);
     if (maxSearchResults !== undefined && Math.floor(maxSearchResults) > 0) {
-      resolved.animetosho.maxSearchResults = Math.floor(maxSearchResults);
-    } else if (src.animetosho.maxSearchResults !== undefined) {
+      resolved.tsukihime.maxSearchResults = Math.floor(maxSearchResults);
+    } else if (tsukihimeSource.maxSearchResults !== undefined) {
       warn(
-        'animetosho.maxSearchResults',
-        src.animetosho.maxSearchResults,
-        resolved.animetosho.maxSearchResults,
+        `${tsukihimeSourcePath}.maxSearchResults`,
+        tsukihimeSource.maxSearchResults,
+        resolved.tsukihime.maxSearchResults,
         'Expected positive number.',
       );
     }
diff --git a/src/config/resolve/top-level.ts b/src/config/resolve/top-level.ts
index 3380581c..e0df7892 100644
--- a/src/config/resolve/top-level.ts
+++ b/src/config/resolve/top-level.ts
@@ -3,7 +3,7 @@ import { asBoolean } from './shared';
 
 export function applyTopLevelConfig(context: ResolveContext): void {
   const { src, resolved, warn } = context;
-  const knownTopLevelKeys = new Set(Object.keys(resolved));
+  const knownTopLevelKeys = new Set([...Object.keys(resolved), 'animetosho']);
   for (const key of Object.keys(src)) {
     if (!knownTopLevelKeys.has(key)) {
       warn(key, src[key], undefined, 'Unknown top-level config key; ignored.');
diff --git a/src/config/resolve/tsukihime-compat.test.ts b/src/config/resolve/tsukihime-compat.test.ts
new file mode 100644
index 00000000..39f21ae5
--- /dev/null
+++ b/src/config/resolve/tsukihime-compat.test.ts
@@ -0,0 +1,63 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { resolveConfig } from '../resolve';
+
+test('resolveConfig maps legacy Animetosho settings to TsukiHime', () => {
+  const { resolved, warnings } = resolveConfig({
+    animetosho: {
+      apiBaseUrl: 'https://legacy.example/v1',
+      maxSearchResults: 23,
+    },
+    shortcuts: {
+      openAnimetosho: 'Ctrl+Alt+T',
+    },
+  });
+
+  assert.equal(resolved.tsukihime.apiBaseUrl, 'https://legacy.example/v1');
+  assert.equal(resolved.tsukihime.maxSearchResults, 23);
+  assert.equal(resolved.shortcuts.openTsukihime, 'Ctrl+Alt+T');
+  assert.deepEqual(warnings, []);
+});
+
+test('resolveConfig gives current TsukiHime settings precedence over legacy aliases', () => {
+  const { resolved, warnings } = resolveConfig({
+    animetosho: {
+      apiBaseUrl: 'https://legacy.example/v1',
+      maxSearchResults: 23,
+    },
+    tsukihime: {
+      apiBaseUrl: 'https://current.example/v1',
+      maxSearchResults: 7,
+    },
+    shortcuts: {
+      openAnimetosho: 'Ctrl+Alt+T',
+      openTsukihime: null,
+    },
+  });
+
+  assert.equal(resolved.tsukihime.apiBaseUrl, 'https://current.example/v1');
+  assert.equal(resolved.tsukihime.maxSearchResults, 7);
+  assert.equal(resolved.shortcuts.openTsukihime, null);
+  assert.deepEqual(warnings, []);
+});
+
+test('resolveConfig does not fall back when the current TsukiHime setting is invalid', () => {
+  const { resolved, warnings } = resolveConfig({
+    animetosho: {
+      apiBaseUrl: 'https://legacy.example/v1',
+      maxSearchResults: 23,
+    },
+    tsukihime: 'invalid' as never,
+  });
+
+  assert.equal(resolved.tsukihime.apiBaseUrl, 'https://api.tsukihime.org/v1');
+  assert.equal(resolved.tsukihime.maxSearchResults, 10);
+  assert.deepEqual(warnings, [
+    {
+      path: 'tsukihime',
+      value: 'invalid',
+      fallback: resolved.tsukihime,
+      message: 'Expected object.',
+    },
+  ]);
+});
diff --git a/src/config/settings/registry.test.ts b/src/config/settings/registry.test.ts
index a806d993..e8390dba 100644
--- a/src/config/settings/registry.test.ts
+++ b/src/config/settings/registry.test.ts
@@ -247,6 +247,8 @@ test('settings registry routes playback-related integrations into integrations',
   assert.equal(field('jimaku.apiBaseUrl').section, 'Jimaku');
   assert.equal(field('subsync.replace').category, 'integrations');
   assert.equal(field('subsync.replace').section, 'Subtitle Sync');
+  assert.equal(field('tsukihime.apiBaseUrl').category, 'integrations');
+  assert.equal(field('tsukihime.apiBaseUrl').section, 'TsukiHime');
 });
 
 test('settings registry puts feature toggles first, then other toggles alphabetically', () => {
diff --git a/src/config/settings/registry.ts b/src/config/settings/registry.ts
index 43c91299..980b9145 100644
--- a/src/config/settings/registry.ts
+++ b/src/config/settings/registry.ts
@@ -422,7 +422,7 @@ function categoryAndSection(path: string): { category: ConfigSettingsCategory; s
   if (path.startsWith('mpv.') || path.startsWith('youtube.')) {
     return { category: 'behavior', section: topSection(path) };
   }
-  if (path.startsWith('jimaku.')) {
+  if (path.startsWith('jimaku.') || path.startsWith('tsukihime.')) {
     return { category: 'integrations', section: topSection(path) };
   }
   if (path.startsWith('subsync.')) {
@@ -486,6 +486,7 @@ function topSection(path: string): string {
     notifications: 'Notifications',
     subsync: 'Subtitle Sync',
     texthooker: 'Texthooker',
+    tsukihime: 'TsukiHime',
     updates: 'Updates',
     websocket: 'WebSocket server',
     yomitan: 'Yomitan',
@@ -594,7 +595,7 @@ function subsectionForPath(path: string): string | undefined {
       leaf === 'openCharacterDictionaryManager' ||
       leaf === 'openRuntimeOptions' ||
       leaf === 'openJimaku' ||
-      leaf === 'openAnimetosho' ||
+      leaf === 'openTsukihime' ||
       leaf === 'openSessionHelp' ||
       leaf === 'openControllerSelect' ||
       leaf === 'openControllerDebug'
diff --git a/src/core/services/anki-jimaku-ipc.test.ts b/src/core/services/anki-jimaku-ipc.test.ts
index e9a555e3..b189206d 100644
--- a/src/core/services/anki-jimaku-ipc.test.ts
+++ b/src/core/services/anki-jimaku-ipc.test.ts
@@ -55,10 +55,10 @@ test('anki/jimaku IPC handlers reject malformed invoke payloads', async () => {
       isRemoteMediaPath: () => false,
       downloadToFile: async () => ({ ok: true, path: '/tmp/sub.ass' }),
       onDownloadedSubtitle: () => {},
-      searchAnimetoshoEntries: async () => ({ ok: true, data: [] }),
-      listAnimetoshoFiles: async () => ({ ok: true, data: [] }),
-      downloadAnimetoshoSubtitle: async () => ({ ok: true, path: '/tmp/sub.en.ass' }),
-      getAnimetoshoSecondaryLanguages: () => ['en'],
+      searchTsukihimeEntries: async () => ({ ok: true, data: [] }),
+      listTsukihimeFiles: async () => ({ ok: true, data: [] }),
+      downloadTsukihimeSubtitle: async () => ({ ok: true, path: '/tmp/sub.en.ass' }),
+      getTsukihimeSecondaryLanguages: () => ['en'],
       onDownloadedSecondarySubtitle: () => {},
     },
     registrar,
@@ -98,41 +98,41 @@ test('anki/jimaku IPC handlers reject malformed invoke payloads', async () => {
     error: { error: 'Invalid Jimaku download query payload', code: 400 },
   });
 
-  const animetoshoSearchHandler = handleHandlers.get(IPC_CHANNELS.request.animetoshoSearchEntries);
-  assert.ok(animetoshoSearchHandler);
-  const invalidAnimetoshoSearch = await animetoshoSearchHandler!({}, { query: 12 });
-  assert.deepEqual(invalidAnimetoshoSearch, {
+  const tsukihimeSearchHandler = handleHandlers.get(IPC_CHANNELS.request.tsukihimeSearchEntries);
+  assert.ok(tsukihimeSearchHandler);
+  const invalidTsukihimeSearch = await tsukihimeSearchHandler!({}, { query: 12 });
+  assert.deepEqual(invalidTsukihimeSearch, {
     ok: false,
-    error: { error: 'Invalid Animetosho search query payload', code: 400 },
+    error: { error: 'Invalid TsukiHime search query payload', code: 400 },
   });
 
-  const animetoshoFilesHandler = handleHandlers.get(IPC_CHANNELS.request.animetoshoListFiles);
-  assert.ok(animetoshoFilesHandler);
-  const invalidAnimetoshoFiles = await animetoshoFilesHandler!({}, { entryId: 'x' });
-  assert.deepEqual(invalidAnimetoshoFiles, {
+  const tsukihimeFilesHandler = handleHandlers.get(IPC_CHANNELS.request.tsukihimeListFiles);
+  assert.ok(tsukihimeFilesHandler);
+  const invalidTsukihimeFiles = await tsukihimeFilesHandler!({}, { entryId: 'x' });
+  assert.deepEqual(invalidTsukihimeFiles, {
     ok: false,
-    error: { error: 'Invalid Animetosho files query payload', code: 400 },
+    error: { error: 'Invalid TsukiHime files query payload', code: 400 },
   });
 
-  const animetoshoDownloadHandler = handleHandlers.get(IPC_CHANNELS.request.animetoshoDownloadFile);
-  assert.ok(animetoshoDownloadHandler);
-  const invalidAnimetoshoDownload = await animetoshoDownloadHandler!({}, { entryId: 1, url: '/x' });
-  assert.deepEqual(invalidAnimetoshoDownload, {
+  const tsukihimeDownloadHandler = handleHandlers.get(IPC_CHANNELS.request.tsukihimeDownloadFile);
+  assert.ok(tsukihimeDownloadHandler);
+  const invalidTsukihimeDownload = await tsukihimeDownloadHandler!({}, { entryId: 1, url: '/x' });
+  assert.deepEqual(invalidTsukihimeDownload, {
     ok: false,
-    error: { error: 'Invalid Animetosho download query payload', code: 400 },
+    error: { error: 'Invalid TsukiHime download query payload', code: 400 },
   });
 
-  const foreignUrlDownload = await animetoshoDownloadHandler!(
+  const foreignUrlDownload = await tsukihimeDownloadHandler!(
     {},
     { entryId: 1, url: 'https://evil.example/attach/00000001/1.xz', name: 'sub.ass' },
   );
   assert.deepEqual(foreignUrlDownload, {
     ok: false,
-    error: { error: 'Refusing to download subtitle from a non-Animetosho URL.', code: 400 },
+    error: { error: 'Refusing to download subtitle from a non-TsukiHime URL.', code: 400 },
   });
 });
 
-test('animetosho downloads route by language: secondary for eng, primary for jpn', async () => {
+test('tsukihime downloads always route Japanese as primary', async () => {
   const { registrar, handleHandlers } = createFakeRegistrar();
   const primaryLoads: string[] = [];
   const secondaryLoads: string[] = [];
@@ -160,10 +160,10 @@ test('animetosho downloads route by language: secondary for eng, primary for jpn
       onDownloadedSubtitle: (path) => {
         primaryLoads.push(path);
       },
-      searchAnimetoshoEntries: async () => ({ ok: true, data: [] }),
-      listAnimetoshoFiles: async () => ({ ok: true, data: [] }),
-      downloadAnimetoshoSubtitle: async (_url, destPath) => ({ ok: true, path: destPath }),
-      getAnimetoshoSecondaryLanguages: () => ['en'],
+      searchTsukihimeEntries: async () => ({ ok: true, data: [] }),
+      listTsukihimeFiles: async () => ({ ok: true, data: [] }),
+      downloadTsukihimeSubtitle: async (_url, destPath) => ({ ok: true, path: destPath }),
+      getTsukihimeSecondaryLanguages: () => ['ja'],
       onDownloadedSecondarySubtitle: (path) => {
         secondaryLoads.push(path);
       },
@@ -171,13 +171,13 @@ test('animetosho downloads route by language: secondary for eng, primary for jpn
     registrar,
   );
 
-  const downloadHandler = handleHandlers.get(IPC_CHANNELS.request.animetoshoDownloadFile)!;
+  const downloadHandler = handleHandlers.get(IPC_CHANNELS.request.tsukihimeDownloadFile)!;
 
   const engResult = (await downloadHandler!(
     {},
     {
       entryId: 1,
-      url: 'https://animetosho.org/storage/attach/00000001/1.xz',
+      url: 'https://storage.tsukihime.org/attach/00000001/1.xz',
       name: 'episode.eng.ass',
       lang: 'eng',
     },
@@ -191,7 +191,7 @@ test('animetosho downloads route by language: secondary for eng, primary for jpn
     {},
     {
       entryId: 1,
-      url: 'https://animetosho.org/storage/attach/00000002/2.xz',
+      url: 'https://storage.tsukihime.org/attach/00000002/2.xz',
       name: 'episode.jpn.ass',
       lang: 'jpn',
     },
@@ -232,10 +232,10 @@ test('anki/jimaku IPC command handlers ignore malformed payloads', () => {
       isRemoteMediaPath: () => false,
       downloadToFile: async () => ({ ok: true, path: '/tmp/sub.ass' }),
       onDownloadedSubtitle: () => {},
-      searchAnimetoshoEntries: async () => ({ ok: true, data: [] }),
-      listAnimetoshoFiles: async () => ({ ok: true, data: [] }),
-      downloadAnimetoshoSubtitle: async () => ({ ok: true, path: '/tmp/sub.en.ass' }),
-      getAnimetoshoSecondaryLanguages: () => ['en'],
+      searchTsukihimeEntries: async () => ({ ok: true, data: [] }),
+      listTsukihimeFiles: async () => ({ ok: true, data: [] }),
+      downloadTsukihimeSubtitle: async () => ({ ok: true, path: '/tmp/sub.en.ass' }),
+      getTsukihimeSecondaryLanguages: () => ['en'],
       onDownloadedSecondarySubtitle: () => {},
     },
     registrar,
diff --git a/src/core/services/anki-jimaku-ipc.ts b/src/core/services/anki-jimaku-ipc.ts
index e06b2286..22fd9b58 100644
--- a/src/core/services/anki-jimaku-ipc.ts
+++ b/src/core/services/anki-jimaku-ipc.ts
@@ -4,12 +4,12 @@ import * as path from 'path';
 import * as os from 'os';
 import { createLogger } from '../../logger';
 import {
-  AnimetoshoApiResponse,
-  AnimetoshoDownloadResult,
-  AnimetoshoEntry,
-  AnimetoshoFilesQuery,
-  AnimetoshoSearchQuery,
-  AnimetoshoSubtitleFile,
+  TsukihimeApiResponse,
+  TsukihimeDownloadResult,
+  TsukihimeEntry,
+  TsukihimeFilesQuery,
+  TsukihimeSearchQuery,
+  TsukihimeSubtitleFile,
   JimakuApiResponse,
   JimakuDownloadResult,
   JimakuEntry,
@@ -23,9 +23,9 @@ import {
 } from '../../types';
 import { IPC_CHANNELS } from '../../shared/ipc/contracts';
 import {
-  parseAnimetoshoDownloadQuery,
-  parseAnimetoshoFilesQuery,
-  parseAnimetoshoSearchQuery,
+  parseTsukihimeDownloadQuery,
+  parseTsukihimeFilesQuery,
+  parseTsukihimeSearchQuery,
   parseJimakuDownloadQuery,
   parseJimakuFilesQuery,
   parseJimakuSearchQuery,
@@ -33,7 +33,7 @@ import {
   parseKikuMergePreviewRequest,
 } from '../../shared/ipc/validators';
 import { buildJimakuSubtitleFilenameFromMediaPath } from './jimaku-download-path';
-import { animetoshoLangToFilenameSuffix, isAnimetoshoDownloadUrl } from '../../animetosho/utils';
+import { tsukihimeLangToFilenameSuffix, isTsukihimeDownloadUrl } from '../../tsukihime/utils';
 
 const { ipcMain } = electron;
 
@@ -57,14 +57,14 @@ export interface AnkiJimakuIpcDeps {
     headers: Record<string, string>,
   ) => Promise<JimakuDownloadResult>;
   onDownloadedSubtitle: (pathToSubtitle: string) => void;
-  searchAnimetoshoEntries: (
-    query: AnimetoshoSearchQuery,
-  ) => Promise<AnimetoshoApiResponse<AnimetoshoEntry[]>>;
-  listAnimetoshoFiles: (
-    query: AnimetoshoFilesQuery,
-  ) => Promise<AnimetoshoApiResponse<AnimetoshoSubtitleFile[]>>;
-  downloadAnimetoshoSubtitle: (url: string, destPath: string) => Promise<AnimetoshoDownloadResult>;
-  getAnimetoshoSecondaryLanguages: () => string[];
+  searchTsukihimeEntries: (
+    query: TsukihimeSearchQuery,
+  ) => Promise<TsukihimeApiResponse<TsukihimeEntry[]>>;
+  listTsukihimeFiles: (
+    query: TsukihimeFilesQuery,
+  ) => Promise<TsukihimeApiResponse<TsukihimeSubtitleFile[]>>;
+  downloadTsukihimeSubtitle: (url: string, destPath: string) => Promise<TsukihimeDownloadResult>;
+  getTsukihimeSecondaryLanguages: () => string[];
   onDownloadedSecondarySubtitle: (pathToSubtitle: string) => void | Promise<void>;
 }
 
@@ -206,50 +206,50 @@ export function registerAnkiJimakuIpcHandlers(
     },
   );
 
-  ipc.handle(IPC_CHANNELS.request.animetoshoGetSecondaryLanguages, (): string[] => {
-    return deps.getAnimetoshoSecondaryLanguages();
+  ipc.handle(IPC_CHANNELS.request.tsukihimeGetSecondaryLanguages, (): string[] => {
+    return deps.getTsukihimeSecondaryLanguages();
   });
 
   ipc.handle(
-    IPC_CHANNELS.request.animetoshoSearchEntries,
-    async (_event, query: unknown): Promise<AnimetoshoApiResponse<AnimetoshoEntry[]>> => {
-      const parsedQuery = parseAnimetoshoSearchQuery(query);
+    IPC_CHANNELS.request.tsukihimeSearchEntries,
+    async (_event, query: unknown): Promise<TsukihimeApiResponse<TsukihimeEntry[]>> => {
+      const parsedQuery = parseTsukihimeSearchQuery(query);
       if (!parsedQuery) {
         return {
           ok: false,
-          error: { error: 'Invalid Animetosho search query payload', code: 400 },
+          error: { error: 'Invalid TsukiHime search query payload', code: 400 },
         };
       }
-      return deps.searchAnimetoshoEntries(parsedQuery);
+      return deps.searchTsukihimeEntries(parsedQuery);
     },
   );
 
   ipc.handle(
-    IPC_CHANNELS.request.animetoshoListFiles,
-    async (_event, query: unknown): Promise<AnimetoshoApiResponse<AnimetoshoSubtitleFile[]>> => {
-      const parsedQuery = parseAnimetoshoFilesQuery(query);
+    IPC_CHANNELS.request.tsukihimeListFiles,
+    async (_event, query: unknown): Promise<TsukihimeApiResponse<TsukihimeSubtitleFile[]>> => {
+      const parsedQuery = parseTsukihimeFilesQuery(query);
       if (!parsedQuery) {
-        return { ok: false, error: { error: 'Invalid Animetosho files query payload', code: 400 } };
+        return { ok: false, error: { error: 'Invalid TsukiHime files query payload', code: 400 } };
       }
-      return deps.listAnimetoshoFiles(parsedQuery);
+      return deps.listTsukihimeFiles(parsedQuery);
     },
   );
 
   ipc.handle(
-    IPC_CHANNELS.request.animetoshoDownloadFile,
-    async (_event, query: unknown): Promise<AnimetoshoDownloadResult> => {
-      const parsedQuery = parseAnimetoshoDownloadQuery(query);
+    IPC_CHANNELS.request.tsukihimeDownloadFile,
+    async (_event, query: unknown): Promise<TsukihimeDownloadResult> => {
+      const parsedQuery = parseTsukihimeDownloadQuery(query);
       if (!parsedQuery) {
         return {
           ok: false,
-          error: { error: 'Invalid Animetosho download query payload', code: 400 },
+          error: { error: 'Invalid TsukiHime download query payload', code: 400 },
         };
       }
 
-      if (!isAnimetoshoDownloadUrl(parsedQuery.url)) {
+      if (!isTsukihimeDownloadUrl(parsedQuery.url)) {
         return {
           ok: false,
-          error: { error: 'Refusing to download subtitle from a non-Animetosho URL.', code: 400 },
+          error: { error: 'Refusing to download subtitle from a non-TsukiHime URL.', code: 400 },
         };
       }
 
@@ -259,13 +259,13 @@ export function registerAnkiJimakuIpcHandlers(
       }
 
       const mediaDir = deps.isRemoteMediaPath(currentMediaPath)
-        ? fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-animetosho-'))
+        ? fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-tsukihime-'))
         : path.dirname(path.resolve(currentMediaPath));
       const safeName = path.basename(parsedQuery.name);
       if (!safeName) {
         return { ok: false, error: { error: 'Invalid subtitle filename.' } };
       }
-      const languageSuffix = animetoshoLangToFilenameSuffix(parsedQuery.lang);
+      const languageSuffix = tsukihimeLangToFilenameSuffix(parsedQuery.lang);
       const subtitleFilename = buildJimakuSubtitleFilenameFromMediaPath(
         currentMediaPath,
         safeName,
@@ -276,24 +276,24 @@ export function registerAnkiJimakuIpcHandlers(
       const baseName = ext ? subtitleFilename.slice(0, -ext.length) : subtitleFilename;
       let targetPath = path.join(mediaDir, subtitleFilename);
       if (fs.existsSync(targetPath)) {
-        targetPath = path.join(mediaDir, `${baseName} (animetosho-${parsedQuery.entryId})${ext}`);
+        targetPath = path.join(mediaDir, `${baseName} (tsukihime-${parsedQuery.entryId})${ext}`);
         let counter = 2;
         while (fs.existsSync(targetPath)) {
           targetPath = path.join(
             mediaDir,
-            `${baseName} (animetosho-${parsedQuery.entryId}-${counter})${ext}`,
+            `${baseName} (tsukihime-${parsedQuery.entryId}-${counter})${ext}`,
           );
           counter += 1;
         }
       }
 
       logger.info(
-        `[animetosho] download-file name="${parsedQuery.name}" entryId=${parsedQuery.entryId}`,
+        `[tsukihime] download-file name="${parsedQuery.name}" entryId=${parsedQuery.entryId}`,
       );
-      const result = await deps.downloadAnimetoshoSubtitle(parsedQuery.url, targetPath);
+      const result = await deps.downloadTsukihimeSubtitle(parsedQuery.url, targetPath);
 
       if (result.ok) {
-        logger.info(`[animetosho] download-file saved to ${result.path}`);
+        logger.info(`[tsukihime] download-file saved to ${result.path}`);
         // Japanese tracks take the primary slot; anything else loads as the
         // secondary subtitle so the Japanese primary stays in place.
         if (languageSuffix === 'ja') {
@@ -303,7 +303,7 @@ export function registerAnkiJimakuIpcHandlers(
         }
       } else {
         logger.error(
-          `[animetosho] download-file failed: ${result.error?.error ?? 'unknown error'}`,
+          `[tsukihime] download-file failed: ${result.error?.error ?? 'unknown error'}`,
         );
       }
 
diff --git a/src/core/services/anki-jimaku.test.ts b/src/core/services/anki-jimaku.test.ts
index f1553109..fe820288 100644
--- a/src/core/services/anki-jimaku.test.ts
+++ b/src/core/services/anki-jimaku.test.ts
@@ -11,7 +11,7 @@ interface RuntimeHarness {
     patches: boolean[];
     broadcasts: number;
     fetchCalls: Array<{ endpoint: string; query?: Record<string, unknown> }>;
-    animetoshoFetchCalls: Array<{ endpoint: string; query?: Record<string, unknown> }>;
+    tsukihimeFetchCalls: Array<{ endpoint: string; query?: Record<string, unknown> }>;
     sentCommands: Array<{ command: (string | number)[] }>;
   };
 }
@@ -26,7 +26,7 @@ function createHarness(): RuntimeHarness {
       endpoint: string;
       query?: Record<string, unknown>;
     }>,
-    animetoshoFetchCalls: [] as Array<{
+    tsukihimeFetchCalls: [] as Array<{
       endpoint: string;
       query?: Record<string, unknown>;
     }>,
@@ -37,17 +37,18 @@ function createHarness(): RuntimeHarness {
     patchAnkiConnectEnabled: (enabled) => {
       state.patches.push(enabled);
     },
-    getResolvedConfig: () => ({ animetosho: { maxSearchResults: 2 } }),
+    getResolvedConfig: () => ({ tsukihime: { maxSearchResults: 2 } }),
     getRuntimeOptionsManager: () => null,
-    animetoshoFetchJson: async (endpoint, query) => {
-      state.animetoshoFetchCalls.push({
+    tsukihimeFetchJson: async (endpoint, query) => {
+      state.tsukihimeFetchCalls.push({
         endpoint,
         query: query as Record<string, unknown>,
       });
-      if ((query as Record<string, unknown>)?.show === 'torrent') {
+      if (endpoint.startsWith('/torrents/')) {
         return {
           ok: true,
           data: {
+            id: 606713,
             files: [
               {
                 id: 9,
@@ -55,9 +56,8 @@ function createHarness(): RuntimeHarness {
                 attachments: [
                   {
                     id: 1955356,
-                    type: 'subtitle',
-                    info: { codec: 'ASS', lang: 'eng', name: 'English subs' },
-                    size: 33075,
+                    type: 1,
+                    info: { codec: 'ASS', lang: 'en', name: 'English subs' },
                   },
                 ],
               },
@@ -67,11 +67,13 @@ function createHarness(): RuntimeHarness {
       }
       return {
         ok: true,
-        data: [
-          { id: 1, title: 'release a' },
-          { id: 2, title: 'release b' },
-          { id: 3, title: 'release c' },
-        ] as never,
+        data: {
+          results: [
+            { id: 1, name: 'release a' },
+            { id: 2, name: 'release b' },
+            { id: 3, name: 'release c' },
+          ],
+        } as never,
       };
     },
     getSubtitleTimingTracker: () => null,
@@ -172,9 +174,9 @@ test('registerAnkiJimakuIpcRuntime provides full handler surface', () => {
     'isRemoteMediaPath',
     'downloadToFile',
     'onDownloadedSubtitle',
-    'searchAnimetoshoEntries',
-    'listAnimetoshoFiles',
-    'downloadAnimetoshoSubtitle',
+    'searchTsukihimeEntries',
+    'listTsukihimeFiles',
+    'downloadTsukihimeSubtitle',
     'onDownloadedSecondarySubtitle',
   ];
 
@@ -365,14 +367,14 @@ test('onDownloadedSecondarySubtitle retries until mpv reports the new track', as
   });
 });
 
-test('searchAnimetoshoEntries caps results using animetosho.maxSearchResults', async () => {
+test('searchTsukihimeEntries caps results using tsukihime.maxSearchResults', async () => {
   const { registered, state } = createHarness();
 
-  const searchResult = await registered.searchAnimetoshoEntries!({ query: 'frieren 28' });
-  assert.deepEqual(state.animetoshoFetchCalls, [
+  const searchResult = await registered.searchTsukihimeEntries!({ query: 'frieren 28' });
+  assert.deepEqual(state.tsukihimeFetchCalls, [
     {
-      endpoint: '/json',
-      query: { q: 'frieren 28', qx: 1 },
+      endpoint: '/search/torrents',
+      query: { q: 'frieren 28', limit: 2 },
     },
   ]);
   assert.equal((searchResult as { ok: boolean }).ok, true);
@@ -384,20 +386,20 @@ test('searchAnimetoshoEntries caps results using animetosho.maxSearchResults', a
   );
 });
 
-test('listAnimetoshoFiles extracts subtitle attachments from torrent detail', async () => {
+test('listTsukihimeFiles extracts subtitle attachments from torrent detail', async () => {
   const { registered, state } = createHarness();
 
-  const filesResult = await registered.listAnimetoshoFiles!({ entryId: 606713 });
-  assert.deepEqual(state.animetoshoFetchCalls, [
+  const filesResult = await registered.listTsukihimeFiles!({ entryId: 606713 });
+  assert.deepEqual(state.tsukihimeFetchCalls, [
     {
-      endpoint: '/json',
-      query: { show: 'torrent', id: 606713 },
+      endpoint: '/torrents/606713',
+      query: {},
     },
   ]);
   assert.equal((filesResult as { ok: boolean }).ok, true);
   const files = (filesResult as { data: Array<Record<string, unknown>> }).data;
   assert.equal(files.length, 1);
   assert.equal(files[0]!.attachmentId, 1955356);
-  assert.equal(files[0]!.filename, 'episode.eng.ass');
-  assert.equal(files[0]!.url, 'https://animetosho.org/storage/attach/001dd61c/1955356.xz');
+  assert.equal(files[0]!.filename, 'episode.en.ass');
+  assert.equal(files[0]!.url, 'https://storage.tsukihime.org/attach/001dd61c/1955356.xz');
 });
diff --git a/src/core/services/anki-jimaku.ts b/src/core/services/anki-jimaku.ts
index fe427459..479b72e2 100644
--- a/src/core/services/anki-jimaku.ts
+++ b/src/core/services/anki-jimaku.ts
@@ -3,8 +3,8 @@ import { AnkiIntegration } from '../../anki-integration';
 import { mergeAiConfig } from '../../ai/config';
 import {
   AiConfig,
-  AnimetoshoApiResponse,
-  AnimetoshoConfig,
+  TsukihimeApiResponse,
+  TsukihimeConfig,
   AnkiConnectConfig,
   JimakuApiResponse,
   JimakuEntry,
@@ -17,13 +17,13 @@ import {
 } from '../../types';
 import { sortJimakuFiles } from '../../jimaku/utils';
 import {
-  ANIMETOSHO_FEED_BASE_URL,
-  animetoshoFetchJson as animetoshoFetchJsonRequest,
+  TSUKIHIME_API_BASE_URL,
+  tsukihimeFetchJson as tsukihimeFetchJsonRequest,
   decompressXzFile,
-  extractAnimetoshoSubtitleFiles,
-  isAnimetoshoDownloadUrl,
-  mapAnimetoshoSearchResults,
-} from '../../animetosho/utils';
+  extractTsukihimeSubtitleFiles,
+  isTsukihimeDownloadUrl,
+  mapTsukihimeSearchResults,
+} from '../../tsukihime/utils';
 import type { AnkiJimakuIpcDeps } from './anki-jimaku-ipc';
 import { createLogger } from '../../logger';
 
@@ -48,7 +48,7 @@ export interface AnkiJimakuIpcRuntimeOptions {
   getResolvedConfig: () => {
     ankiConnect?: AnkiConnectConfig;
     ai?: AiConfig;
-    animetosho?: AnimetoshoConfig;
+    tsukihime?: TsukihimeConfig;
     secondarySub?: { secondarySubLanguages?: string[] };
   };
   getRuntimeOptionsManager: () => RuntimeOptionsManagerLike | null;
@@ -77,10 +77,10 @@ export interface AnkiJimakuIpcRuntimeOptions {
     endpoint: string,
     query?: Record<string, string | number | boolean | null | undefined>,
   ) => Promise<JimakuApiResponse<T>>;
-  animetoshoFetchJson?: <T>(
+  tsukihimeFetchJson?: <T>(
     endpoint: string,
     query?: Record<string, string | number | boolean | null | undefined>,
-  ) => Promise<AnimetoshoApiResponse<T>>;
+  ) => Promise<TsukihimeApiResponse<T>>;
   getJimakuMaxEntryResults: () => number;
   getJimakuLanguagePreference: () => JimakuLanguagePreference;
   resolveJimakuApiKey: () => Promise<string | null>;
@@ -101,7 +101,7 @@ export interface AnkiJimakuIpcRuntimeOptions {
 
 const logger = createLogger('main:anki-jimaku');
 
-const DEFAULT_ANIMETOSHO_MAX_SEARCH_RESULTS = 10;
+const DEFAULT_TSUKIHIME_MAX_SEARCH_RESULTS = 10;
 const SECONDARY_TRACK_LOOKUP_ATTEMPTS = 5;
 const SECONDARY_TRACK_LOOKUP_RETRY_MS = 100;
 
@@ -109,24 +109,24 @@ function delay(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-function getAnimetoshoMaxSearchResults(options: AnkiJimakuIpcRuntimeOptions): number {
-  const value = options.getResolvedConfig().animetosho?.maxSearchResults;
+function getTsukihimeMaxSearchResults(options: AnkiJimakuIpcRuntimeOptions): number {
+  const value = options.getResolvedConfig().tsukihime?.maxSearchResults;
   if (typeof value === 'number' && Number.isFinite(value) && value > 0) {
     return Math.floor(value);
   }
-  return DEFAULT_ANIMETOSHO_MAX_SEARCH_RESULTS;
+  return DEFAULT_TSUKIHIME_MAX_SEARCH_RESULTS;
 }
 
-function animetoshoFetch<T>(
+function tsukihimeFetch<T>(
   options: AnkiJimakuIpcRuntimeOptions,
   endpoint: string,
   query: Record<string, string | number | boolean | null | undefined>,
-): Promise<AnimetoshoApiResponse<T>> {
-  if (options.animetoshoFetchJson) {
-    return options.animetoshoFetchJson<T>(endpoint, query);
+): Promise<TsukihimeApiResponse<T>> {
+  if (options.tsukihimeFetchJson) {
+    return options.tsukihimeFetchJson<T>(endpoint, query);
   }
-  const baseUrl = options.getResolvedConfig().animetosho?.apiBaseUrl || ANIMETOSHO_FEED_BASE_URL;
-  return animetoshoFetchJsonRequest<T>(endpoint, query, { baseUrl });
+  const baseUrl = options.getResolvedConfig().tsukihime?.apiBaseUrl || TSUKIHIME_API_BASE_URL;
+  return tsukihimeFetchJsonRequest<T>(endpoint, query, { baseUrl });
 }
 
 export function registerAnkiJimakuIpcRuntime(
@@ -242,39 +242,41 @@ export function registerAnkiJimakuIpcRuntime(
     isRemoteMediaPath: (mediaPath) => options.isRemoteMediaPath(mediaPath),
     downloadToFile: (url, destPath, headers) => options.downloadToFile(url, destPath, headers),
 
-    searchAnimetoshoEntries: async (query) => {
-      logger.info(`[animetosho] search-entries query: "${query.query}"`);
-      const response = await animetoshoFetch<unknown>(options, '/json', {
+    searchTsukihimeEntries: async (query) => {
+      logger.info(`[tsukihime] search-entries query: "${query.query}"`);
+      const maxResults = getTsukihimeMaxSearchResults(options);
+      const response = await tsukihimeFetch<unknown>(options, '/search/torrents', {
         q: query.query,
-        qx: 1,
+        // The API caps limit at 100.
+        limit: Math.min(maxResults, 100),
       });
       if (!response.ok) return response;
-      const maxResults = getAnimetoshoMaxSearchResults(options);
-      const entries = mapAnimetoshoSearchResults(response.data, maxResults);
-      logger.info(`[animetosho] search-entries returned ${entries.length} results`);
+      const entries = mapTsukihimeSearchResults(response.data, maxResults);
+      logger.info(`[tsukihime] search-entries returned ${entries.length} results`);
       return { ok: true, data: entries };
     },
-    listAnimetoshoFiles: async (query) => {
-      logger.info(`[animetosho] list-files entryId=${query.entryId}`);
-      const response = await animetoshoFetch<unknown>(options, '/json', {
-        show: 'torrent',
-        id: query.entryId,
-      });
+    listTsukihimeFiles: async (query) => {
+      logger.info(`[tsukihime] list-files entryId=${query.entryId}`);
+      const response = await tsukihimeFetch<unknown>(
+        options,
+        `/torrents/${encodeURIComponent(query.entryId)}`,
+        {},
+      );
       if (!response.ok) return response;
-      const files = extractAnimetoshoSubtitleFiles(response.data);
-      logger.info(`[animetosho] list-files returned ${files.length} subtitle attachments`);
+      const files = extractTsukihimeSubtitleFiles(response.data);
+      logger.info(`[tsukihime] list-files returned ${files.length} subtitle attachments`);
       return { ok: true, data: files };
     },
-    getAnimetoshoSecondaryLanguages: () =>
+    getTsukihimeSecondaryLanguages: () =>
       options.getResolvedConfig().secondarySub?.secondarySubLanguages ?? [],
-    downloadAnimetoshoSubtitle: async (url, destPath) => {
+    downloadTsukihimeSubtitle: async (url, destPath) => {
       const tempXzPath = `${destPath}.xz`;
       const downloaded = await options.downloadToFile(
         url,
         tempXzPath,
         { 'User-Agent': 'SubMiner' },
-        // animetosho.org redirects to storage.animetosho.org; keep the hop in-domain.
-        { isAllowedRedirect: (redirectUrl) => isAnimetoshoDownloadUrl(redirectUrl) },
+        // The /tosho/ mirror 302s to storage.animetosho.org; keep the hop in-allowlist.
+        { isAllowedRedirect: (redirectUrl) => isTsukihimeDownloadUrl(redirectUrl) },
       );
       if (!downloaded.ok) return downloaded;
       const result = await decompressXzFile(tempXzPath, destPath);
@@ -310,14 +312,14 @@ export function registerAnkiJimakuIpcRuntime(
             return;
           }
         } catch (error) {
-          logger.warn('[animetosho] failed to select downloaded subtitle as secondary:', error);
+          logger.warn('[tsukihime] failed to select downloaded subtitle as secondary:', error);
           return;
         }
         await delay(SECONDARY_TRACK_LOOKUP_RETRY_MS);
       }
 
       logger.warn(
-        `[animetosho] could not find downloaded subtitle in track-list: ${pathToSubtitle}`,
+        `[tsukihime] could not find downloaded subtitle in track-list: ${pathToSubtitle}`,
       );
     },
   });
diff --git a/src/core/services/app-lifecycle.test.ts b/src/core/services/app-lifecycle.test.ts
index 61863470..5b17bfc5 100644
--- a/src/core/services/app-lifecycle.test.ts
+++ b/src/core/services/app-lifecycle.test.ts
@@ -40,7 +40,7 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
     openControllerSelect: false,
     openControllerDebug: false,
     openJimaku: false,
-    openAnimetosho: false,
+    openTsukihime: false,
     openYoutubePicker: false,
     openPlaylistBrowser: false,
     replayCurrentSubtitle: false,
diff --git a/src/core/services/cli-command.test.ts b/src/core/services/cli-command.test.ts
index 5e747012..5d23f3dd 100644
--- a/src/core/services/cli-command.test.ts
+++ b/src/core/services/cli-command.test.ts
@@ -45,7 +45,7 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
     openControllerSelect: false,
     openControllerDebug: false,
     openJimaku: false,
-    openAnimetosho: false,
+    openTsukihime: false,
     openYoutubePicker: false,
     openPlaylistBrowser: false,
     togglePrimarySubtitleBar: false,
diff --git a/src/core/services/cli-command.ts b/src/core/services/cli-command.ts
index 53a66849..35b1a7e4 100644
--- a/src/core/services/cli-command.ts
+++ b/src/core/services/cli-command.ts
@@ -544,11 +544,11 @@ export function handleCliCommand(
     );
   } else if (args.openJimaku) {
     dispatchCliSessionAction({ actionId: 'openJimaku' }, 'openJimaku', 'Open jimaku failed');
-  } else if (args.openAnimetosho) {
+  } else if (args.openTsukihime) {
     dispatchCliSessionAction(
-      { actionId: 'openAnimetosho' },
-      'openAnimetosho',
-      'Open animetosho failed',
+      { actionId: 'openTsukihime' },
+      'openTsukihime',
+      'Open tsukihime failed',
     );
   } else if (args.openYoutubePicker) {
     dispatchCliSessionAction(
diff --git a/src/core/services/ipc-command.test.ts b/src/core/services/ipc-command.test.ts
index 2041f345..c2484ede 100644
--- a/src/core/services/ipc-command.test.ts
+++ b/src/core/services/ipc-command.test.ts
@@ -13,6 +13,7 @@ function createOptions(overrides: Partial<Parameters<typeof handleMpvCommandFrom
       RUNTIME_OPTIONS_OPEN: '__runtime-options-open',
       JIMAKU_OPEN: '__jimaku-open',
       ANIMETOSHO_OPEN: '__animetosho-open',
+      TSUKIHIME_OPEN: '__tsukihime-open',
       RUNTIME_OPTION_CYCLE_PREFIX: '__runtime-option-cycle:',
       REPLAY_SUBTITLE: '__replay-subtitle',
       PLAY_NEXT_SUBTITLE: '__play-next-subtitle',
@@ -28,8 +29,8 @@ function createOptions(overrides: Partial<Parameters<typeof handleMpvCommandFrom
     openJimaku: () => {
       calls.push('jimaku');
     },
-    openAnimetosho: () => {
-      calls.push('animetosho');
+    openTsukihime: () => {
+      calls.push('tsukihime');
     },
     openYoutubeTrackPicker: () => {
       calls.push('youtube-picker');
@@ -152,6 +153,15 @@ test('handleMpvCommandFromIpc dispatches special jimaku open command', () => {
   assert.deepEqual(osd, []);
 });
 
+test('handleMpvCommandFromIpc keeps the legacy Animetosho command as a TsukiHime alias', () => {
+  const { options, calls, sentCommands } = createOptions();
+
+  handleMpvCommandFromIpc(['__animetosho-open'], options);
+
+  assert.deepEqual(calls, ['tsukihime']);
+  assert.deepEqual(sentCommands, []);
+});
+
 test('handleMpvCommandFromIpc dispatches special playlist browser open command', async () => {
   const { options, calls, sentCommands, osd } = createOptions();
   handleMpvCommandFromIpc(['__playlist-browser-open'], options);
diff --git a/src/core/services/ipc-command.ts b/src/core/services/ipc-command.ts
index 6716bd6d..1cad075d 100644
--- a/src/core/services/ipc-command.ts
+++ b/src/core/services/ipc-command.ts
@@ -11,6 +11,7 @@ export interface HandleMpvCommandFromIpcOptions {
     RUNTIME_OPTIONS_OPEN: string;
     JIMAKU_OPEN: string;
     ANIMETOSHO_OPEN: string;
+    TSUKIHIME_OPEN: string;
     RUNTIME_OPTION_CYCLE_PREFIX: string;
     REPLAY_SUBTITLE: string;
     PLAY_NEXT_SUBTITLE: string;
@@ -20,7 +21,7 @@ export interface HandleMpvCommandFromIpcOptions {
   triggerSubsyncFromConfig: () => void;
   openRuntimeOptionsPalette: () => void;
   openJimaku: () => void;
-  openAnimetosho: () => void;
+  openTsukihime: () => void;
   openYoutubeTrackPicker: () => void | Promise<void>;
   openPlaylistBrowser: () => void | Promise<void>;
   runtimeOptionsCycle: (id: RuntimeOptionId, direction: 1 | -1) => RuntimeOptionApplyResult;
@@ -114,8 +115,11 @@ export function handleMpvCommandFromIpc(
     return;
   }
 
-  if (first === options.specialCommands.ANIMETOSHO_OPEN) {
-    options.openAnimetosho();
+  if (
+    first === options.specialCommands.TSUKIHIME_OPEN ||
+    first === options.specialCommands.ANIMETOSHO_OPEN
+  ) {
+    options.openTsukihime();
     return;
   }
 
diff --git a/src/core/services/overlay-shortcut-handler.test.ts b/src/core/services/overlay-shortcut-handler.test.ts
index c47daf85..f6fff56e 100644
--- a/src/core/services/overlay-shortcut-handler.test.ts
+++ b/src/core/services/overlay-shortcut-handler.test.ts
@@ -28,7 +28,7 @@ function makeShortcuts(overrides: Partial<ConfiguredShortcuts> = {}): Configured
     openCharacterDictionaryManager: null,
     openRuntimeOptions: null,
     openJimaku: null,
-    openAnimetosho: null,
+    openTsukihime: null,
     openSessionHelp: null,
     openControllerSelect: null,
     openControllerDebug: null,
@@ -55,8 +55,8 @@ function createDeps(overrides: Partial<OverlayShortcutRuntimeDeps> = {}) {
     openJimaku: () => {
       calls.push('openJimaku');
     },
-    openAnimetosho: () => {
-      calls.push('openAnimetosho');
+    openTsukihime: () => {
+      calls.push('openTsukihime');
     },
     markAudioCard: async () => {
       calls.push('markAudioCard');
@@ -168,7 +168,7 @@ test('runOverlayShortcutLocalFallback dispatches matching single-step actions',
       openRuntimeOptions: () => handled.push('openRuntimeOptions'),
       openCharacterDictionaryManager: () => handled.push('openCharacterDictionaryManager'),
       openJimaku: () => handled.push('openJimaku'),
-      openAnimetosho: () => handled.push('openAnimetosho'),
+      openTsukihime: () => handled.push('openTsukihime'),
       markAudioCard: () => handled.push('markAudioCard'),
       copySubtitleMultiple: (timeoutMs) => handled.push(`copySubtitleMultiple:${timeoutMs}`),
       copySubtitle: () => handled.push('copySubtitle'),
@@ -202,7 +202,7 @@ test('runOverlayShortcutLocalFallback leaves multi-step numeric shortcuts for re
       openRuntimeOptions: () => handled.push('openRuntimeOptions'),
       openCharacterDictionaryManager: () => handled.push('openCharacterDictionaryManager'),
       openJimaku: () => handled.push('openJimaku'),
-      openAnimetosho: () => handled.push('openAnimetosho'),
+      openTsukihime: () => handled.push('openTsukihime'),
       markAudioCard: () => handled.push('markAudioCard'),
       copySubtitleMultiple: (timeoutMs) => handled.push(`copySubtitleMultiple:${timeoutMs}`),
       copySubtitle: () => handled.push('copySubtitle'),
@@ -223,7 +223,7 @@ test('runOverlayShortcutLocalFallback leaves multi-step numeric shortcuts for re
       openRuntimeOptions: () => handled.push('openRuntimeOptions'),
       openCharacterDictionaryManager: () => handled.push('openCharacterDictionaryManager'),
       openJimaku: () => handled.push('openJimaku'),
-      openAnimetosho: () => handled.push('openAnimetosho'),
+      openTsukihime: () => handled.push('openTsukihime'),
       markAudioCard: () => handled.push('markAudioCard'),
       copySubtitleMultiple: (timeoutMs) => handled.push(`copySubtitleMultiple:${timeoutMs}`),
       copySubtitle: () => handled.push('copySubtitle'),
@@ -261,7 +261,7 @@ test('runOverlayShortcutLocalFallback passes allowWhenRegistered for secondary-s
       openRuntimeOptions: () => {},
       openCharacterDictionaryManager: () => {},
       openJimaku: () => {},
-      openAnimetosho: () => {},
+      openTsukihime: () => {},
       markAudioCard: () => {},
       copySubtitleMultiple: () => {},
       copySubtitle: () => {},
@@ -298,7 +298,7 @@ test('runOverlayShortcutLocalFallback allows registered-global jimaku shortcut',
       openRuntimeOptions: () => {},
       openCharacterDictionaryManager: () => {},
       openJimaku: () => {},
-      openAnimetosho: () => {},
+      openTsukihime: () => {},
       markAudioCard: () => {},
       copySubtitleMultiple: () => {},
       copySubtitle: () => {},
@@ -331,7 +331,7 @@ test('runOverlayShortcutLocalFallback returns false when no action matches', ()
     openJimaku: () => {
       called = true;
     },
-    openAnimetosho: () => {
+    openTsukihime: () => {
       called = true;
     },
     markAudioCard: () => {
@@ -416,7 +416,7 @@ test('registerOverlayShortcutsRuntime reports active shortcuts when configured',
       openCharacterDictionaryManager: () => {},
       openRuntimeOptions: () => {},
       openJimaku: () => {},
-      openAnimetosho: () => {},
+      openTsukihime: () => {},
     }),
     cancelPendingMultiCopy: () => {},
     cancelPendingMineSentenceMultiple: () => {},
@@ -444,7 +444,7 @@ test('unregisterOverlayShortcutsRuntime clears pending shortcut work when active
       openCharacterDictionaryManager: () => {},
       openRuntimeOptions: () => {},
       openJimaku: () => {},
-      openAnimetosho: () => {},
+      openTsukihime: () => {},
     }),
     cancelPendingMultiCopy: () => {
       calls.push('cancel-multi-copy');
diff --git a/src/core/services/overlay-shortcut-handler.ts b/src/core/services/overlay-shortcut-handler.ts
index 8dda3598..e1c0e0aa 100644
--- a/src/core/services/overlay-shortcut-handler.ts
+++ b/src/core/services/overlay-shortcut-handler.ts
@@ -8,7 +8,7 @@ export interface OverlayShortcutFallbackHandlers {
   openRuntimeOptions: () => void;
   openCharacterDictionaryManager: () => void;
   openJimaku: () => void;
-  openAnimetosho: () => void;
+  openTsukihime: () => void;
   markAudioCard: () => void;
   copySubtitleMultiple: (timeoutMs: number) => void;
   copySubtitle: () => void;
@@ -25,7 +25,7 @@ export interface OverlayShortcutRuntimeDeps {
   openRuntimeOptions: () => void;
   openCharacterDictionaryManager: () => void;
   openJimaku: () => void;
-  openAnimetosho: () => void;
+  openTsukihime: () => void;
   markAudioCard: () => Promise<void>;
   copySubtitleMultiple: (timeoutMs: number) => void;
   copySubtitle: () => void;
@@ -105,8 +105,8 @@ export function createOverlayShortcutRuntimeHandlers(deps: OverlayShortcutRuntim
     openJimaku: () => {
       deps.openJimaku();
     },
-    openAnimetosho: () => {
-      deps.openAnimetosho();
+    openTsukihime: () => {
+      deps.openTsukihime();
     },
   };
 
@@ -114,7 +114,7 @@ export function createOverlayShortcutRuntimeHandlers(deps: OverlayShortcutRuntim
     openRuntimeOptions: overlayHandlers.openRuntimeOptions,
     openCharacterDictionaryManager: overlayHandlers.openCharacterDictionaryManager,
     openJimaku: overlayHandlers.openJimaku,
-    openAnimetosho: overlayHandlers.openAnimetosho,
+    openTsukihime: overlayHandlers.openTsukihime,
     markAudioCard: overlayHandlers.markAudioCard,
     copySubtitleMultiple: overlayHandlers.copySubtitleMultiple,
     copySubtitle: overlayHandlers.copySubtitle,
@@ -160,9 +160,9 @@ export function runOverlayShortcutLocalFallback(
       allowWhenRegistered: true,
     },
     {
-      accelerator: shortcuts.openAnimetosho,
+      accelerator: shortcuts.openTsukihime,
       run: () => {
-        handlers.openAnimetosho();
+        handlers.openTsukihime();
       },
       allowWhenRegistered: true,
     },
diff --git a/src/core/services/overlay-shortcut.test.ts b/src/core/services/overlay-shortcut.test.ts
index d8c3ecb9..8daa1867 100644
--- a/src/core/services/overlay-shortcut.test.ts
+++ b/src/core/services/overlay-shortcut.test.ts
@@ -23,7 +23,7 @@ function createShortcuts(overrides: Partial<ConfiguredShortcuts> = {}): Configur
     openCharacterDictionaryManager: null,
     openRuntimeOptions: null,
     openJimaku: null,
-    openAnimetosho: null,
+    openTsukihime: null,
     openSessionHelp: null,
     openControllerSelect: null,
     openControllerDebug: null,
@@ -49,7 +49,7 @@ test('registerOverlayShortcuts reports active overlay shortcuts when configured'
       openCharacterDictionaryManager: () => {},
       openRuntimeOptions: () => {},
       openJimaku: () => {},
-      openAnimetosho: () => {},
+      openTsukihime: () => {},
     }),
     true,
   );
@@ -70,7 +70,7 @@ test('registerOverlayShortcuts stays inactive when overlay shortcuts are absent'
       openCharacterDictionaryManager: () => {},
       openRuntimeOptions: () => {},
       openJimaku: () => {},
-      openAnimetosho: () => {},
+      openTsukihime: () => {},
     }),
     false,
   );
@@ -93,7 +93,7 @@ test('syncOverlayShortcutsRuntime deactivates cleanly when shortcuts were active
       openCharacterDictionaryManager: () => {},
       openRuntimeOptions: () => {},
       openJimaku: () => {},
-      openAnimetosho: () => {},
+      openTsukihime: () => {},
     }),
     cancelPendingMultiCopy: () => {
       calls.push('cancel-multi-copy');
diff --git a/src/core/services/overlay-shortcut.ts b/src/core/services/overlay-shortcut.ts
index e58ad2c9..e12af393 100644
--- a/src/core/services/overlay-shortcut.ts
+++ b/src/core/services/overlay-shortcut.ts
@@ -13,7 +13,7 @@ export interface OverlayShortcutHandlers {
   openCharacterDictionaryManager: () => void;
   openRuntimeOptions: () => void;
   openJimaku: () => void;
-  openAnimetosho: () => void;
+  openTsukihime: () => void;
 }
 
 export interface OverlayShortcutLifecycleDeps {
@@ -36,7 +36,7 @@ const OVERLAY_SHORTCUT_KEYS: Array<keyof Omit<ConfiguredShortcuts, 'multiCopyTim
   'openCharacterDictionaryManager',
   'openRuntimeOptions',
   'openJimaku',
-  'openAnimetosho',
+  'openTsukihime',
 ];
 
 function hasConfiguredOverlayShortcuts(shortcuts: ConfiguredShortcuts): boolean {
diff --git a/src/core/services/session-actions.test.ts b/src/core/services/session-actions.test.ts
index f8a8fefb..863dbff0 100644
--- a/src/core/services/session-actions.test.ts
+++ b/src/core/services/session-actions.test.ts
@@ -40,7 +40,7 @@ function createDeps(overrides: Partial<SessionActionExecutorDeps> = {}) {
     openControllerSelect: () => calls.push('controller-select'),
     openControllerDebug: () => calls.push('controller-debug'),
     openJimaku: () => calls.push('jimaku'),
-    openAnimetosho: () => calls.push('animetosho'),
+    openTsukihime: () => calls.push('tsukihime'),
     openYoutubeTrackPicker: () => {
       calls.push('youtube');
     },
diff --git a/src/core/services/session-actions.ts b/src/core/services/session-actions.ts
index 5407aa5f..9e22775b 100644
--- a/src/core/services/session-actions.ts
+++ b/src/core/services/session-actions.ts
@@ -24,7 +24,7 @@ export interface SessionActionExecutorDeps {
   openControllerSelect: () => void;
   openControllerDebug: () => void;
   openJimaku: () => void;
-  openAnimetosho: () => void;
+  openTsukihime: () => void;
   openYoutubeTrackPicker: () => void | Promise<void>;
   openPlaylistBrowser: () => boolean | void | Promise<boolean | void>;
   replayCurrentSubtitle: () => void;
@@ -116,8 +116,8 @@ export async function dispatchSessionAction(
     case 'openJimaku':
       deps.openJimaku();
       return;
-    case 'openAnimetosho':
-      deps.openAnimetosho();
+    case 'openTsukihime':
+      deps.openTsukihime();
       return;
     case 'openYoutubePicker':
       await deps.openYoutubeTrackPicker();
diff --git a/src/core/services/session-bindings.test.ts b/src/core/services/session-bindings.test.ts
index fe4e0399..b22d0a6f 100644
--- a/src/core/services/session-bindings.test.ts
+++ b/src/core/services/session-bindings.test.ts
@@ -22,7 +22,7 @@ function createShortcuts(overrides: Partial<ConfiguredShortcuts> = {}): Configur
     openCharacterDictionaryManager: null,
     openRuntimeOptions: null,
     openJimaku: null,
-    openAnimetosho: null,
+    openTsukihime: null,
     openSessionHelp: null,
     openControllerSelect: null,
     openControllerDebug: null,
@@ -320,6 +320,21 @@ test('compileSessionBindings wires every default keybinding to an overlay or mpv
   }
 });
 
+test('compileSessionBindings maps the legacy Animetosho command to the TsukiHime action', () => {
+  const result = compileSessionBindings({
+    shortcuts: createShortcuts(),
+    keybindings: [createKeybinding('Ctrl+Alt+T', ['__animetosho-open'])],
+    platform: 'linux',
+  });
+
+  assert.deepEqual(result.warnings, []);
+  assert.equal(result.bindings[0]?.actionType, 'session-action');
+  assert.equal(
+    result.bindings[0]?.actionType === 'session-action' ? result.bindings[0].actionId : null,
+    'openTsukihime',
+  );
+});
+
 test('compileSessionBindings leaves retired subtitle-delay shift tokens as mpv commands', () => {
   const result = compileSessionBindings({
     shortcuts: createShortcuts(),
diff --git a/src/core/services/session-bindings.ts b/src/core/services/session-bindings.ts
index 584d2ca9..7bbbc3b6 100644
--- a/src/core/services/session-bindings.ts
+++ b/src/core/services/session-bindings.ts
@@ -55,7 +55,7 @@ const SESSION_SHORTCUT_ACTIONS: Array<{
   { key: 'openCharacterDictionaryManager', actionId: 'openCharacterDictionaryManager' },
   { key: 'openRuntimeOptions', actionId: 'openRuntimeOptions' },
   { key: 'openJimaku', actionId: 'openJimaku' },
-  { key: 'openAnimetosho', actionId: 'openAnimetosho' },
+  { key: 'openTsukihime', actionId: 'openTsukihime' },
   { key: 'openSessionHelp', actionId: 'openSessionHelp' },
   { key: 'openControllerSelect', actionId: 'openControllerSelect' },
   { key: 'openControllerDebug', actionId: 'openControllerDebug' },
@@ -305,9 +305,9 @@ function resolveCommandBinding(
     if (command.length !== 1) return null;
     return { actionType: 'session-action', actionId: 'openJimaku' };
   }
-  if (first === SPECIAL_COMMANDS.ANIMETOSHO_OPEN) {
+  if (first === SPECIAL_COMMANDS.TSUKIHIME_OPEN || first === SPECIAL_COMMANDS.ANIMETOSHO_OPEN) {
     if (command.length !== 1) return null;
-    return { actionType: 'session-action', actionId: 'openAnimetosho' };
+    return { actionType: 'session-action', actionId: 'openTsukihime' };
   }
   if (first === SPECIAL_COMMANDS.YOUTUBE_PICKER_OPEN) {
     if (command.length !== 1) return null;
diff --git a/src/core/services/startup-bootstrap.test.ts b/src/core/services/startup-bootstrap.test.ts
index 7b760446..e2082fde 100644
--- a/src/core/services/startup-bootstrap.test.ts
+++ b/src/core/services/startup-bootstrap.test.ts
@@ -40,7 +40,7 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
     openControllerSelect: false,
     openControllerDebug: false,
     openJimaku: false,
-    openAnimetosho: false,
+    openTsukihime: false,
     openYoutubePicker: false,
     openPlaylistBrowser: false,
     replayCurrentSubtitle: false,
diff --git a/src/core/utils/shortcut-config.ts b/src/core/utils/shortcut-config.ts
index 7c07ec19..b45deeb3 100644
--- a/src/core/utils/shortcut-config.ts
+++ b/src/core/utils/shortcut-config.ts
@@ -15,7 +15,7 @@ export interface ConfiguredShortcuts {
   openCharacterDictionaryManager: string | null | undefined;
   openRuntimeOptions: string | null | undefined;
   openJimaku: string | null | undefined;
-  openAnimetosho: string | null | undefined;
+  openTsukihime: string | null | undefined;
   openSessionHelp: string | null | undefined;
   openControllerSelect: string | null | undefined;
   openControllerDebug: string | null | undefined;
@@ -66,7 +66,7 @@ export function resolveConfiguredShortcuts(
     ),
     openRuntimeOptions: normalizeShortcut(shortcutValue('openRuntimeOptions')),
     openJimaku: normalizeShortcut(shortcutValue('openJimaku')),
-    openAnimetosho: normalizeShortcut(shortcutValue('openAnimetosho')),
+    openTsukihime: normalizeShortcut(shortcutValue('openTsukihime')),
     openSessionHelp: normalizeShortcut(shortcutValue('openSessionHelp')),
     openControllerSelect: normalizeShortcut(shortcutValue('openControllerSelect')),
     openControllerDebug: normalizeShortcut(shortcutValue('openControllerDebug')),
diff --git a/src/main.ts b/src/main.ts
index 67bde6af..fa05f1f1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -467,7 +467,7 @@ import { createOverlayModalInputState } from './main/runtime/overlay-modal-input
 import { openYoutubeTrackPicker } from './main/runtime/youtube-picker-open';
 import { openRuntimeOptionsModal as openRuntimeOptionsModalRuntime } from './main/runtime/runtime-options-open';
 import { openJimakuModal as openJimakuModalRuntime } from './main/runtime/jimaku-open';
-import { openAnimetoshoModal as openAnimetoshoModalRuntime } from './main/runtime/animetosho-open';
+import { openTsukihimeModal as openTsukihimeModalRuntime } from './main/runtime/tsukihime-open';
 import { openSubsyncManualModal as openSubsyncManualModalRuntime } from './main/runtime/subsync-open';
 import { openSessionHelpModal as openSessionHelpModalRuntime } from './main/runtime/session-help-open';
 import { openCharacterDictionaryManagerModal as openCharacterDictionaryManagerModalRuntime } from './main/runtime/character-dictionary-open';
@@ -2068,8 +2068,8 @@ const overlayShortcutsRuntime = createOverlayShortcutsRuntimeService(
     openJimaku: () => {
       openJimakuOverlay();
     },
-    openAnimetosho: () => {
-      openAnimetoshoOverlay();
+    openTsukihime: () => {
+      openTsukihimeOverlay();
     },
     markAudioCard: () => markLastCardAsAudioCard(),
     copySubtitleMultiple: (timeoutMs: number) => {
@@ -3001,11 +3001,11 @@ function openJimakuOverlay(): void {
   );
 }
 
-function openAnimetoshoOverlay(): void {
+function openTsukihimeOverlay(): void {
   openOverlayHostedModalWithOsd(
-    openAnimetoshoModalRuntime,
-    'Animetosho overlay unavailable.',
-    'Failed to open Animetosho overlay.',
+    openTsukihimeModalRuntime,
+    'TsukiHime overlay unavailable.',
+    'Failed to open TsukiHime overlay.',
   );
 }
 
@@ -5528,7 +5528,7 @@ async function dispatchSessionAction(request: SessionActionDispatchRequest): Pro
     },
     openRuntimeOptionsPalette: () => openRuntimeOptionsPalette(),
     openJimaku: () => openJimakuOverlay(),
-    openAnimetosho: () => openAnimetoshoOverlay(),
+    openTsukihime: () => openTsukihimeOverlay(),
     openSessionHelp: () => openSessionHelpOverlay(),
     openCharacterDictionaryManager: () => openCharacterDictionaryManagerOverlay(),
     openControllerSelect: () => openControllerSelectOverlay(),
@@ -5562,7 +5562,7 @@ const { registerIpcRuntimeHandlers } = composeIpcRuntimeHandlers({
     triggerSubsyncFromConfig: () => triggerSubsyncFromConfig(),
     openRuntimeOptionsPalette: () => openRuntimeOptionsPalette(),
     openJimaku: () => openJimakuOverlay(),
-    openAnimetosho: () => openAnimetoshoOverlay(),
+    openTsukihime: () => openTsukihimeOverlay(),
     openYoutubeTrackPicker: () => openYoutubeTrackPickerFromPlayback(),
     openPlaylistBrowser: () => openPlaylistBrowser(),
     cycleRuntimeOption: (id, direction) => {
diff --git a/src/main/dependencies.ts b/src/main/dependencies.ts
index e72aee43..9f7a1f71 100644
--- a/src/main/dependencies.ts
+++ b/src/main/dependencies.ts
@@ -229,7 +229,7 @@ export interface MpvCommandRuntimeServiceDepsParams {
   triggerSubsyncFromConfig: HandleMpvCommandFromIpcOptions['triggerSubsyncFromConfig'];
   openRuntimeOptionsPalette: HandleMpvCommandFromIpcOptions['openRuntimeOptionsPalette'];
   openJimaku: HandleMpvCommandFromIpcOptions['openJimaku'];
-  openAnimetosho: HandleMpvCommandFromIpcOptions['openAnimetosho'];
+  openTsukihime: HandleMpvCommandFromIpcOptions['openTsukihime'];
   openYoutubeTrackPicker: HandleMpvCommandFromIpcOptions['openYoutubeTrackPicker'];
   openPlaylistBrowser: HandleMpvCommandFromIpcOptions['openPlaylistBrowser'];
   showMpvOsd: HandleMpvCommandFromIpcOptions['showMpvOsd'];
@@ -437,7 +437,7 @@ export function createMpvCommandRuntimeServiceDeps(
     triggerSubsyncFromConfig: params.triggerSubsyncFromConfig,
     openRuntimeOptionsPalette: params.openRuntimeOptionsPalette,
     openJimaku: params.openJimaku,
-    openAnimetosho: params.openAnimetosho,
+    openTsukihime: params.openTsukihime,
     openYoutubeTrackPicker: params.openYoutubeTrackPicker,
     openPlaylistBrowser: params.openPlaylistBrowser,
     runtimeOptionsCycle: params.runtimeOptionsCycle,
diff --git a/src/main/ipc-mpv-command.ts b/src/main/ipc-mpv-command.ts
index c60390d1..abae5df3 100644
--- a/src/main/ipc-mpv-command.ts
+++ b/src/main/ipc-mpv-command.ts
@@ -13,7 +13,7 @@ export interface MpvCommandFromIpcRuntimeDeps {
   triggerSubsyncFromConfig: () => void;
   openRuntimeOptionsPalette: () => void;
   openJimaku: () => void;
-  openAnimetosho: () => void;
+  openTsukihime: () => void;
   openYoutubeTrackPicker: () => void | Promise<void>;
   openPlaylistBrowser: () => void | Promise<void>;
   cycleRuntimeOption: (id: RuntimeOptionId, direction: 1 | -1) => RuntimeOptionApplyResult;
@@ -39,7 +39,7 @@ export function handleMpvCommandFromIpcRuntime(
       triggerSubsyncFromConfig: deps.triggerSubsyncFromConfig,
       openRuntimeOptionsPalette: deps.openRuntimeOptionsPalette,
       openJimaku: deps.openJimaku,
-      openAnimetosho: deps.openAnimetosho,
+      openTsukihime: deps.openTsukihime,
       openYoutubeTrackPicker: deps.openYoutubeTrackPicker,
       openPlaylistBrowser: deps.openPlaylistBrowser,
       runtimeOptionsCycle: deps.cycleRuntimeOption,
diff --git a/src/main/overlay-runtime.ts b/src/main/overlay-runtime.ts
index 5bafc606..d35c98e6 100644
--- a/src/main/overlay-runtime.ts
+++ b/src/main/overlay-runtime.ts
@@ -49,7 +49,7 @@ export interface OverlayModalRuntime {
   ) => boolean;
   openRuntimeOptionsPalette: () => void;
   openJimaku: () => void;
-  openAnimetosho: () => void;
+  openTsukihime: () => void;
   handleOverlayModalClosed: (modal: OverlayHostedModal) => void;
   notifyOverlayModalOpened: (modal: OverlayHostedModal) => void;
   waitForModalOpen: (modal: OverlayHostedModal, timeoutMs: number) => Promise<boolean>;
@@ -433,9 +433,9 @@ export function createOverlayModalRuntimeService(
     });
   };
 
-  const openAnimetosho = (): void => {
-    sendToActiveOverlayWindow('animetosho:open', undefined, {
-      restoreOnModalClose: 'animetosho',
+  const openTsukihime = (): void => {
+    sendToActiveOverlayWindow('tsukihime:open', undefined, {
+      restoreOnModalClose: 'tsukihime',
     });
   };
 
@@ -518,7 +518,7 @@ export function createOverlayModalRuntimeService(
     sendToActiveOverlayWindow,
     openRuntimeOptionsPalette,
     openJimaku,
-    openAnimetosho,
+    openTsukihime,
     handleOverlayModalClosed,
     notifyOverlayModalOpened,
     waitForModalOpen,
diff --git a/src/main/overlay-shortcuts-runtime.ts b/src/main/overlay-shortcuts-runtime.ts
index e52643f4..4fcaf2ad 100644
--- a/src/main/overlay-shortcuts-runtime.ts
+++ b/src/main/overlay-shortcuts-runtime.ts
@@ -21,7 +21,7 @@ export interface OverlayShortcutRuntimeServiceInput {
   openRuntimeOptionsPalette: () => void;
   openCharacterDictionaryManager: () => void;
   openJimaku: () => void;
-  openAnimetosho: () => void;
+  openTsukihime: () => void;
   markAudioCard: () => Promise<void>;
   copySubtitleMultiple: (timeoutMs: number) => void;
   copySubtitle: () => void;
@@ -57,8 +57,8 @@ export function createOverlayShortcutsRuntimeService(
     openJimaku: () => {
       input.openJimaku();
     },
-    openAnimetosho: () => {
-      input.openAnimetosho();
+    openTsukihime: () => {
+      input.openTsukihime();
     },
     markAudioCard: () => {
       return input.markAudioCard();
diff --git a/src/main/runtime/composers/ipc-runtime-composer.test.ts b/src/main/runtime/composers/ipc-runtime-composer.test.ts
index bd49e0e6..8a20a477 100644
--- a/src/main/runtime/composers/ipc-runtime-composer.test.ts
+++ b/src/main/runtime/composers/ipc-runtime-composer.test.ts
@@ -11,7 +11,7 @@ test('composeIpcRuntimeHandlers returns callable IPC handlers and registration b
       triggerSubsyncFromConfig: async () => {},
       openRuntimeOptionsPalette: () => {},
       openJimaku: () => {},
-      openAnimetosho: () => {},
+      openTsukihime: () => {},
       openYoutubeTrackPicker: () => {},
       openPlaylistBrowser: () => {},
       cycleRuntimeOption: () => ({ ok: true }),
diff --git a/src/main/runtime/first-run-setup-service.test.ts b/src/main/runtime/first-run-setup-service.test.ts
index ecc85e11..ec7ce28d 100644
--- a/src/main/runtime/first-run-setup-service.test.ts
+++ b/src/main/runtime/first-run-setup-service.test.ts
@@ -55,7 +55,7 @@ function makeArgs(overrides: Partial<CliArgs> = {}): CliArgs {
     openControllerSelect: false,
     openControllerDebug: false,
     openJimaku: false,
-    openAnimetosho: false,
+    openTsukihime: false,
     openYoutubePicker: false,
     openPlaylistBrowser: false,
     replayCurrentSubtitle: false,
diff --git a/src/main/runtime/first-run-setup-service.ts b/src/main/runtime/first-run-setup-service.ts
index 299f77f7..8a9f1241 100644
--- a/src/main/runtime/first-run-setup-service.ts
+++ b/src/main/runtime/first-run-setup-service.ts
@@ -97,7 +97,7 @@ function hasAnyStartupCommandBeyondSetup(args: CliArgs): boolean {
     args.openControllerSelect ||
     args.openControllerDebug ||
     args.openJimaku ||
-    args.openAnimetosho ||
+    args.openTsukihime ||
     args.openYoutubePicker ||
     args.openPlaylistBrowser ||
     args.replayCurrentSubtitle ||
diff --git a/src/main/runtime/global-shortcuts-runtime-handlers.test.ts b/src/main/runtime/global-shortcuts-runtime-handlers.test.ts
index c4fa6579..76431508 100644
--- a/src/main/runtime/global-shortcuts-runtime-handlers.test.ts
+++ b/src/main/runtime/global-shortcuts-runtime-handlers.test.ts
@@ -19,7 +19,7 @@ function createShortcuts(): ConfiguredShortcuts {
     openCharacterDictionaryManager: null,
     openRuntimeOptions: null,
     openJimaku: null,
-    openAnimetosho: null,
+    openTsukihime: null,
     openSessionHelp: null,
     openControllerSelect: null,
     openControllerDebug: null,
diff --git a/src/main/runtime/global-shortcuts.test.ts b/src/main/runtime/global-shortcuts.test.ts
index 5a33377b..f144ef22 100644
--- a/src/main/runtime/global-shortcuts.test.ts
+++ b/src/main/runtime/global-shortcuts.test.ts
@@ -23,7 +23,7 @@ function createShortcuts(): ConfiguredShortcuts {
     openCharacterDictionaryManager: null,
     openRuntimeOptions: null,
     openJimaku: null,
-    openAnimetosho: null,
+    openTsukihime: null,
     openSessionHelp: null,
     openControllerSelect: null,
     openControllerDebug: null,
diff --git a/src/main/runtime/ipc-bridge-actions-main-deps.test.ts b/src/main/runtime/ipc-bridge-actions-main-deps.test.ts
index 4bffd1f7..a4ba896a 100644
--- a/src/main/runtime/ipc-bridge-actions-main-deps.test.ts
+++ b/src/main/runtime/ipc-bridge-actions-main-deps.test.ts
@@ -14,7 +14,7 @@ test('ipc bridge action main deps builders map callbacks', async () => {
       triggerSubsyncFromConfig: async () => {},
       openRuntimeOptionsPalette: () => {},
       openJimaku: () => {},
-      openAnimetosho: () => {},
+      openTsukihime: () => {},
       openYoutubeTrackPicker: () => {},
       openPlaylistBrowser: () => {},
       cycleRuntimeOption: () => ({ ok: false as const, error: 'x' }),
diff --git a/src/main/runtime/ipc-bridge-actions.test.ts b/src/main/runtime/ipc-bridge-actions.test.ts
index 6e1bf974..2579a205 100644
--- a/src/main/runtime/ipc-bridge-actions.test.ts
+++ b/src/main/runtime/ipc-bridge-actions.test.ts
@@ -11,7 +11,7 @@ test('handle mpv command handler forwards command and built deps', () => {
     triggerSubsyncFromConfig: () => {},
     openRuntimeOptionsPalette: () => {},
     openJimaku: () => {},
-    openAnimetosho: () => {},
+    openTsukihime: () => {},
     openYoutubeTrackPicker: () => {},
     openPlaylistBrowser: () => {},
     cycleRuntimeOption: () => ({ ok: false as const, error: 'x' }),
diff --git a/src/main/runtime/ipc-mpv-command-main-deps.test.ts b/src/main/runtime/ipc-mpv-command-main-deps.test.ts
index ee7cc009..013f886c 100644
--- a/src/main/runtime/ipc-mpv-command-main-deps.test.ts
+++ b/src/main/runtime/ipc-mpv-command-main-deps.test.ts
@@ -8,7 +8,7 @@ test('ipc mpv command main deps builder maps callbacks', () => {
     triggerSubsyncFromConfig: () => calls.push('subsync'),
     openRuntimeOptionsPalette: () => calls.push('palette'),
     openJimaku: () => calls.push('jimaku'),
-    openAnimetosho: () => calls.push('animetosho'),
+    openTsukihime: () => calls.push('tsukihime'),
     openYoutubeTrackPicker: () => {
       calls.push('youtube-picker');
     },
@@ -30,7 +30,7 @@ test('ipc mpv command main deps builder maps callbacks', () => {
   deps.triggerSubsyncFromConfig();
   deps.openRuntimeOptionsPalette();
   deps.openJimaku();
-  deps.openAnimetosho();
+  deps.openTsukihime();
   void deps.openYoutubeTrackPicker();
   void deps.openPlaylistBrowser();
   assert.deepEqual(deps.cycleRuntimeOption('anki.nPlusOneMatchMode', 1), { ok: false, error: 'x' });
@@ -47,7 +47,7 @@ test('ipc mpv command main deps builder maps callbacks', () => {
     'subsync',
     'palette',
     'jimaku',
-    'animetosho',
+    'tsukihime',
     'youtube-picker',
     'playlist-browser',
     'osd:hello',
diff --git a/src/main/runtime/ipc-mpv-command-main-deps.ts b/src/main/runtime/ipc-mpv-command-main-deps.ts
index 4dae4876..189e0b5b 100644
--- a/src/main/runtime/ipc-mpv-command-main-deps.ts
+++ b/src/main/runtime/ipc-mpv-command-main-deps.ts
@@ -10,7 +10,7 @@ export function createBuildMpvCommandFromIpcRuntimeMainDepsHandler(
       triggerSubsyncFromConfig: () => deps.triggerSubsyncFromConfig(),
       openRuntimeOptionsPalette: () => deps.openRuntimeOptionsPalette(),
       openJimaku: () => deps.openJimaku(),
-      openAnimetosho: () => deps.openAnimetosho(),
+      openTsukihime: () => deps.openTsukihime(),
       openYoutubeTrackPicker: () => deps.openYoutubeTrackPicker(),
       openPlaylistBrowser: () => deps.openPlaylistBrowser(),
       cycleRuntimeOption: (id, direction) => deps.cycleRuntimeOption(id, direction),
diff --git a/src/main/runtime/overlay-shortcuts-runtime-main-deps.test.ts b/src/main/runtime/overlay-shortcuts-runtime-main-deps.test.ts
index f574ea62..a1ad1e53 100644
--- a/src/main/runtime/overlay-shortcuts-runtime-main-deps.test.ts
+++ b/src/main/runtime/overlay-shortcuts-runtime-main-deps.test.ts
@@ -18,7 +18,7 @@ test('overlay shortcuts runtime main deps builder maps lifecycle and action call
     openRuntimeOptionsPalette: () => calls.push('runtime-options'),
     openCharacterDictionaryManager: () => calls.push('character-dictionary-manager'),
     openJimaku: () => calls.push('jimaku'),
-    openAnimetosho: () => calls.push('animetosho'),
+    openTsukihime: () => calls.push('tsukihime'),
     markAudioCard: async () => {
       calls.push('mark-audio');
     },
diff --git a/src/main/runtime/overlay-shortcuts-runtime-main-deps.ts b/src/main/runtime/overlay-shortcuts-runtime-main-deps.ts
index 81de3e21..238cffe0 100644
--- a/src/main/runtime/overlay-shortcuts-runtime-main-deps.ts
+++ b/src/main/runtime/overlay-shortcuts-runtime-main-deps.ts
@@ -13,7 +13,7 @@ export function createBuildOverlayShortcutsRuntimeMainDepsHandler(
     openRuntimeOptionsPalette: () => deps.openRuntimeOptionsPalette(),
     openCharacterDictionaryManager: () => deps.openCharacterDictionaryManager(),
     openJimaku: () => deps.openJimaku(),
-    openAnimetosho: () => deps.openAnimetosho(),
+    openTsukihime: () => deps.openTsukihime(),
     markAudioCard: () => deps.markAudioCard(),
     copySubtitleMultiple: (timeoutMs: number) => deps.copySubtitleMultiple(timeoutMs),
     copySubtitle: () => deps.copySubtitle(),
diff --git a/src/main/runtime/animetosho-open.ts b/src/main/runtime/tsukihime-open.ts
similarity index 74%
rename from src/main/runtime/animetosho-open.ts
rename to src/main/runtime/tsukihime-open.ts
index 0a498ca8..f9fc04fa 100644
--- a/src/main/runtime/animetosho-open.ts
+++ b/src/main/runtime/tsukihime-open.ts
@@ -2,10 +2,10 @@ import type { OverlayHostedModal } from '../../shared/ipc/contracts';
 import { IPC_CHANNELS } from '../../shared/ipc/contracts';
 import { openOverlayHostedModal, retryOverlayModalOpen } from './overlay-hosted-modal-open';
 
-const ANIMETOSHO_MODAL: OverlayHostedModal = 'animetosho';
-const ANIMETOSHO_OPEN_TIMEOUT_MS = 1500;
+const TSUKIHIME_MODAL: OverlayHostedModal = 'tsukihime';
+const TSUKIHIME_OPEN_TIMEOUT_MS = 1500;
 
-export async function openAnimetoshoModal(deps: {
+export async function openTsukihimeModal(deps: {
   ensureOverlayStartupPrereqs: () => void;
   ensureOverlayWindowsReadyForVisibilityActions: () => void;
   sendToActiveOverlayWindow: (
@@ -25,10 +25,10 @@ export async function openAnimetoshoModal(deps: {
       logWarn: deps.logWarn,
     },
     {
-      modal: ANIMETOSHO_MODAL,
-      timeoutMs: ANIMETOSHO_OPEN_TIMEOUT_MS,
+      modal: TSUKIHIME_MODAL,
+      timeoutMs: TSUKIHIME_OPEN_TIMEOUT_MS,
       retryWarning:
-        'Animetosho modal did not acknowledge modal open on first attempt; retrying dedicated modal window.',
+        'Tsukihime modal did not acknowledge modal open on first attempt; retrying dedicated modal window.',
       sendOpen: () =>
         openOverlayHostedModal(
           {
@@ -38,8 +38,8 @@ export async function openAnimetoshoModal(deps: {
             sendToActiveOverlayWindow: deps.sendToActiveOverlayWindow,
           },
           {
-            channel: IPC_CHANNELS.event.animetoshoOpen,
-            modal: ANIMETOSHO_MODAL,
+            channel: IPC_CHANNELS.event.tsukihimeOpen,
+            modal: TSUKIHIME_MODAL,
             preferModalWindow: true,
           },
         ),
diff --git a/src/preload.ts b/src/preload.ts
index 925dfe0f..b64819b6 100644
--- a/src/preload.ts
+++ b/src/preload.ts
@@ -34,13 +34,13 @@ import type {
   JimakuFileEntry,
   JimakuApiResponse,
   JimakuDownloadResult,
-  AnimetoshoSearchQuery,
-  AnimetoshoFilesQuery,
-  AnimetoshoDownloadQuery,
-  AnimetoshoEntry,
-  AnimetoshoSubtitleFile,
-  AnimetoshoApiResponse,
-  AnimetoshoDownloadResult,
+  TsukihimeSearchQuery,
+  TsukihimeFilesQuery,
+  TsukihimeDownloadQuery,
+  TsukihimeEntry,
+  TsukihimeSubtitleFile,
+  TsukihimeApiResponse,
+  TsukihimeDownloadResult,
   SubsyncManualPayload,
   SubsyncManualRunRequest,
   SubsyncResult,
@@ -174,7 +174,7 @@ const onOpenControllerSelectEvent = createQueuedIpcListener(
 );
 const onOpenControllerDebugEvent = createQueuedIpcListener(IPC_CHANNELS.event.controllerDebugOpen);
 const onOpenJimakuEvent = createQueuedIpcListener(IPC_CHANNELS.event.jimakuOpen);
-const onOpenAnimetoshoEvent = createQueuedIpcListener(IPC_CHANNELS.event.animetoshoOpen);
+const onOpenTsukihimeEvent = createQueuedIpcListener(IPC_CHANNELS.event.tsukihimeOpen);
 const onOpenYoutubeTrackPickerEvent = createQueuedIpcListenerWithPayload<YoutubePickerOpenPayload>(
   IPC_CHANNELS.event.youtubePickerOpen,
   (payload) => payload as YoutubePickerOpenPayload,
@@ -358,18 +358,18 @@ const electronAPI: ElectronAPI = {
   jimakuDownloadFile: (query: JimakuDownloadQuery): Promise<JimakuDownloadResult> =>
     ipcRenderer.invoke(IPC_CHANNELS.request.jimakuDownloadFile, query),
 
-  animetoshoSearchEntries: (
-    query: AnimetoshoSearchQuery,
-  ): Promise<AnimetoshoApiResponse<AnimetoshoEntry[]>> =>
-    ipcRenderer.invoke(IPC_CHANNELS.request.animetoshoSearchEntries, query),
-  animetoshoListFiles: (
-    query: AnimetoshoFilesQuery,
-  ): Promise<AnimetoshoApiResponse<AnimetoshoSubtitleFile[]>> =>
-    ipcRenderer.invoke(IPC_CHANNELS.request.animetoshoListFiles, query),
-  animetoshoDownloadFile: (query: AnimetoshoDownloadQuery): Promise<AnimetoshoDownloadResult> =>
-    ipcRenderer.invoke(IPC_CHANNELS.request.animetoshoDownloadFile, query),
-  animetoshoGetSecondaryLanguages: (): Promise<string[]> =>
-    ipcRenderer.invoke(IPC_CHANNELS.request.animetoshoGetSecondaryLanguages),
+  tsukihimeSearchEntries: (
+    query: TsukihimeSearchQuery,
+  ): Promise<TsukihimeApiResponse<TsukihimeEntry[]>> =>
+    ipcRenderer.invoke(IPC_CHANNELS.request.tsukihimeSearchEntries, query),
+  tsukihimeListFiles: (
+    query: TsukihimeFilesQuery,
+  ): Promise<TsukihimeApiResponse<TsukihimeSubtitleFile[]>> =>
+    ipcRenderer.invoke(IPC_CHANNELS.request.tsukihimeListFiles, query),
+  tsukihimeDownloadFile: (query: TsukihimeDownloadQuery): Promise<TsukihimeDownloadResult> =>
+    ipcRenderer.invoke(IPC_CHANNELS.request.tsukihimeDownloadFile, query),
+  tsukihimeGetSecondaryLanguages: (): Promise<string[]> =>
+    ipcRenderer.invoke(IPC_CHANNELS.request.tsukihimeGetSecondaryLanguages),
 
   quitApp: () => {
     ipcRenderer.send(IPC_CHANNELS.command.quitApp);
@@ -450,7 +450,7 @@ const electronAPI: ElectronAPI = {
   onOpenControllerSelect: onOpenControllerSelectEvent,
   onOpenControllerDebug: onOpenControllerDebugEvent,
   onOpenJimaku: onOpenJimakuEvent,
-  onOpenAnimetosho: onOpenAnimetoshoEvent,
+  onOpenTsukihime: onOpenTsukihimeEvent,
   onOpenYoutubeTrackPicker: onOpenYoutubeTrackPickerEvent,
   onOpenPlaylistBrowser: onOpenPlaylistBrowserEvent,
   onOpenCharacterDictionaryManager: onOpenCharacterDictionaryManagerEvent,
diff --git a/src/renderer/handlers/keyboard.test.ts b/src/renderer/handlers/keyboard.test.ts
index b173ac55..8c3b532f 100644
--- a/src/renderer/handlers/keyboard.test.ts
+++ b/src/renderer/handlers/keyboard.test.ts
@@ -90,7 +90,7 @@ function createEmptyShortcuts(): ConfiguredShortcuts {
     openCharacterDictionaryManager: null,
     openRuntimeOptions: null,
     openJimaku: null,
-    openAnimetosho: null,
+    openTsukihime: null,
     openSessionHelp: null,
     openControllerSelect: null,
     openControllerDebug: null,
@@ -492,7 +492,7 @@ function createKeyboardHandlerHarness() {
     handleSubsyncKeydown: () => false,
     handleKikuKeydown: () => false,
     handleJimakuKeydown: () => false,
-    handleAnimetoshoKeydown: () => false,
+    handleTsukihimeKeydown: () => false,
     handleControllerSelectKeydown: () => {
       controllerSelectKeydownCount += 1;
       return true;
diff --git a/src/renderer/handlers/keyboard.ts b/src/renderer/handlers/keyboard.ts
index 5bc50156..6dc7f0f7 100644
--- a/src/renderer/handlers/keyboard.ts
+++ b/src/renderer/handlers/keyboard.ts
@@ -16,7 +16,7 @@ export function createKeyboardHandlers(
     handleSubsyncKeydown: (e: KeyboardEvent) => boolean;
     handleKikuKeydown: (e: KeyboardEvent) => boolean;
     handleJimakuKeydown: (e: KeyboardEvent) => boolean;
-    handleAnimetoshoKeydown: (e: KeyboardEvent) => boolean;
+    handleTsukihimeKeydown: (e: KeyboardEvent) => boolean;
     handleYoutubePickerKeydown: (e: KeyboardEvent) => boolean;
     handlePlaylistBrowserKeydown: (e: KeyboardEvent) => boolean;
     handleControllerSelectKeydown: (e: KeyboardEvent) => boolean;
@@ -1120,8 +1120,8 @@ export function createKeyboardHandlers(
         options.handleJimakuKeydown(e);
         return;
       }
-      if (ctx.state.animetoshoModalOpen) {
-        options.handleAnimetoshoKeydown(e);
+      if (ctx.state.tsukihimeModalOpen) {
+        options.handleTsukihimeKeydown(e);
         return;
       }
       if (ctx.state.youtubePickerModalOpen) {
diff --git a/src/renderer/index.html b/src/renderer/index.html
index 3049f4c0..39d7aa26 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -116,40 +116,52 @@
           </div>
         </div>
       </div>
-      <div id="animetoshoModal" class="modal hidden" aria-hidden="true">
+      <div id="tsukihimeModal" class="modal hidden" aria-hidden="true">
         <div class="modal-content">
           <div class="modal-header">
-            <div class="modal-title">Animetosho Subtitles</div>
-            <button id="animetoshoClose" class="modal-close" type="button">Close</button>
+            <div class="modal-title">TsukiHime Subtitles</div>
+            <button id="tsukihimeClose" class="modal-close" type="button">Close</button>
           </div>
           <div class="modal-body">
-            <div class="animetosho-tabs">
-              <button id="animetoshoTabEnglish" class="animetosho-tab active" type="button">
+            <div class="tsukihime-tabs" role="tablist">
+              <button
+                id="tsukihimeTabSecondary"
+                class="tsukihime-tab active"
+                type="button"
+                role="tab"
+                aria-selected="true"
+              >
                 English
               </button>
-              <button id="animetoshoTabJapanese" class="animetosho-tab" type="button">
+              <button
+                id="tsukihimeTabPrimary"
+                class="tsukihime-tab"
+                type="button"
+                role="tab"
+                aria-selected="false"
+              >
                 Japanese
               </button>
             </div>
             <div class="jimaku-form">
               <label class="jimaku-field">
                 <span>Title</span>
-                <input id="animetoshoTitle" type="text" placeholder="Anime title" />
+                <input id="tsukihimeTitle" type="text" placeholder="Anime title" />
               </label>
               <label class="jimaku-field">
                 <span>Episode</span>
-                <input id="animetoshoEpisode" type="number" min="1" placeholder="1" />
+                <input id="tsukihimeEpisode" type="number" min="1" placeholder="1" />
               </label>
-              <button id="animetoshoSearch" class="jimaku-button" type="button">Search</button>
+              <button id="tsukihimeSearch" class="jimaku-button" type="button">Search</button>
             </div>
-            <div id="animetoshoStatus" class="jimaku-status"></div>
-            <div id="animetoshoEntriesSection" class="jimaku-section hidden">
+            <div id="tsukihimeStatus" class="jimaku-status"></div>
+            <div id="tsukihimeEntriesSection" class="jimaku-section hidden">
               <div class="jimaku-section-title">Releases</div>
-              <ul id="animetoshoEntries" class="jimaku-list"></ul>
+              <ul id="tsukihimeEntries" class="jimaku-list"></ul>
             </div>
-            <div id="animetoshoFilesSection" class="jimaku-section hidden">
+            <div id="tsukihimeFilesSection" class="jimaku-section hidden">
               <div class="jimaku-section-title">Subtitle tracks</div>
-              <ul id="animetoshoFiles" class="jimaku-list"></ul>
+              <ul id="tsukihimeFiles" class="jimaku-list"></ul>
             </div>
           </div>
         </div>
diff --git a/src/renderer/modals/animetosho.test.ts b/src/renderer/modals/animetosho.test.ts
deleted file mode 100644
index cc5a2315..00000000
--- a/src/renderer/modals/animetosho.test.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-
-import type { AnimetoshoSubtitleFile, ElectronAPI } from '../../types';
-import { createRendererState } from '../state.js';
-import { createAnimetoshoModal } from './animetosho.js';
-
-function createClassList(initialTokens: string[] = []) {
-  const tokens = new Set(initialTokens);
-  return {
-    add: (...entries: string[]) => {
-      for (const entry of entries) {
-        tokens.add(entry);
-      }
-    },
-    remove: (...entries: string[]) => {
-      for (const entry of entries) {
-        tokens.delete(entry);
-      }
-    },
-    contains: (entry: string) => tokens.has(entry),
-  };
-}
-
-function createElementStub() {
-  const classList = createClassList();
-  return {
-    textContent: '',
-    className: '',
-    style: {},
-    classList,
-    children: [] as unknown[],
-    appendChild(child: unknown) {
-      this.children.push(child);
-    },
-    addEventListener: () => {},
-  };
-}
-
-function createListStub() {
-  return {
-    innerHTML: '',
-    children: [] as unknown[],
-    appendChild(child: unknown) {
-      this.children.push(child);
-    },
-  };
-}
-
-function flushAsyncWork(): Promise<void> {
-  return new Promise((resolve) => {
-    setTimeout(resolve, 0);
-  });
-}
-
-const ENGLISH_TRACK: AnimetoshoSubtitleFile = {
-  attachmentId: 1955356,
-  filename: 'episode01.eng.ass',
-  lang: 'eng',
-  trackName: 'English subs',
-  size: 33075,
-  url: 'https://animetosho.org/storage/attach/001dd61c/1955356.xz',
-  sourceFilename: 'episode01.mkv',
-};
-
-const JAPANESE_TRACK: AnimetoshoSubtitleFile = {
-  attachmentId: 1955400,
-  filename: 'episode01.jpn.ass',
-  lang: 'jpn',
-  trackName: 'Japanese subs',
-  size: 41000,
-  url: 'https://animetosho.org/storage/attach/001dd648/1955400.xz',
-  sourceFilename: 'episode01.mkv',
-};
-
-const GERMAN_TRACK: AnimetoshoSubtitleFile = {
-  attachmentId: 1955500,
-  filename: 'episode01.ger.ass',
-  lang: 'ger',
-  trackName: 'Deutsch',
-  size: 28000,
-  url: 'https://animetosho.org/storage/attach/001dd6ac/1955500.xz',
-  sourceFilename: 'episode01.mkv',
-};
-
-interface ModalHarness {
-  modal: ReturnType<typeof createAnimetoshoModal>;
-  state: ReturnType<typeof createRendererState>;
-  downloadQueries: unknown[];
-  modalCloseNotifications: string[];
-  overlayClassList: ReturnType<typeof createClassList>;
-  animetoshoModalClassList: ReturnType<typeof createClassList>;
-  restoreGlobals: () => void;
-}
-
-function createModalHarness(
-  files: AnimetoshoSubtitleFile[],
-  options: {
-    secondaryLanguages?: string[];
-    listFiles?: (entryId: number) => Promise<unknown>;
-  } = {},
-): ModalHarness {
-  const globals = globalThis as typeof globalThis & { window?: unknown; document?: unknown };
-  const hadWindow = Object.prototype.hasOwnProperty.call(globalThis, 'window');
-  const hadDocument = Object.prototype.hasOwnProperty.call(globalThis, 'document');
-  const previousWindow = globals.window;
-  const previousDocument = globals.document;
-
-  const modalCloseNotifications: string[] = [];
-  const downloadQueries: unknown[] = [];
-
-  const electronAPI = {
-    animetoshoDownloadFile: async (query: unknown) => {
-      downloadQueries.push(query);
-      return { ok: true, path: '/tmp/subtitles/episode01.en.ass' };
-    },
-    animetoshoGetSecondaryLanguages: async () => options.secondaryLanguages ?? ['en', 'eng'],
-    animetoshoListFiles: async ({ entryId }: { entryId: number }) =>
-      options.listFiles ? options.listFiles(entryId) : { ok: true, data: [] },
-    getJimakuMediaInfo: async () => ({
-      title: '',
-      season: null,
-      episode: null,
-      confidence: 'low',
-      filename: '',
-      rawTitle: '',
-    }),
-    notifyOverlayModalClosed: (modal: string) => {
-      modalCloseNotifications.push(modal);
-    },
-  } as unknown as ElectronAPI;
-
-  Object.defineProperty(globalThis, 'window', {
-    configurable: true,
-    value: { electronAPI },
-  });
-  Object.defineProperty(globalThis, 'document', {
-    configurable: true,
-    value: {
-      activeElement: null,
-      createElement: () => createElementStub(),
-    },
-  });
-
-  const overlayClassList = createClassList(['interactive']);
-  const animetoshoModalClassList = createClassList();
-  const state = createRendererState();
-  state.animetoshoModalOpen = true;
-  state.currentAnimetoshoEntryId = 606713;
-  state.selectedAnimetoshoFileIndex = 0;
-  state.animetoshoFiles = files;
-
-  const ctx = {
-    dom: {
-      overlay: { classList: overlayClassList },
-      animetoshoModal: {
-        classList: animetoshoModalClassList,
-        setAttribute: () => {},
-      },
-      animetoshoTitleInput: { value: '' },
-      animetoshoEpisodeInput: { value: '' },
-      animetoshoSearchButton: { addEventListener: () => {} },
-      animetoshoCloseButton: { addEventListener: () => {} },
-      animetoshoTabEnglishButton: {
-        textContent: 'English',
-        classList: createClassList(['active']),
-        addEventListener: () => {},
-      },
-      animetoshoTabJapaneseButton: {
-        textContent: 'Japanese',
-        classList: createClassList(),
-        addEventListener: () => {},
-      },
-      animetoshoStatus: { textContent: '', style: { color: '' } },
-      animetoshoEntriesSection: { classList: createClassList(['hidden']) },
-      animetoshoEntriesList: createListStub(),
-      animetoshoFilesSection: { classList: createClassList() },
-      animetoshoFilesList: createListStub(),
-    },
-    state,
-  };
-
-  const modal = createAnimetoshoModal(ctx as never, {
-    modalStateReader: { isAnyModalOpen: () => false },
-    syncSettingsModalSubtitleSuppression: () => {},
-  });
-
-  return {
-    modal,
-    state,
-    downloadQueries,
-    modalCloseNotifications,
-    overlayClassList,
-    animetoshoModalClassList,
-    restoreGlobals: () => {
-      const target = globalThis as unknown as Record<string, unknown>;
-      if (hadWindow) {
-        Object.defineProperty(globalThis, 'window', { configurable: true, value: previousWindow });
-      } else {
-        delete target.window;
-      }
-      if (hadDocument) {
-        Object.defineProperty(globalThis, 'document', {
-          configurable: true,
-          value: previousDocument,
-        });
-      } else {
-        delete target.document;
-      }
-    },
-  };
-}
-
-function pressKey(harness: ModalHarness, key: string): boolean {
-  let prevented = false;
-  harness.modal.handleAnimetoshoKeydown({
-    key,
-    preventDefault: () => {
-      prevented = true;
-    },
-  } as KeyboardEvent);
-  return prevented;
-}
-
-test('successful Animetosho subtitle selection closes modal', async () => {
-  const harness = createModalHarness([ENGLISH_TRACK, JAPANESE_TRACK]);
-  try {
-    const prevented = pressKey(harness, 'Enter');
-    await flushAsyncWork();
-
-    assert.equal(prevented, true);
-    assert.equal(harness.state.animetoshoModalOpen, false);
-    assert.equal(harness.animetoshoModalClassList.contains('hidden'), true);
-    assert.equal(harness.overlayClassList.contains('interactive'), false);
-    assert.deepEqual(harness.modalCloseNotifications, ['animetosho']);
-    assert.deepEqual(harness.downloadQueries, [
-      {
-        entryId: 606713,
-        url: ENGLISH_TRACK.url,
-        name: ENGLISH_TRACK.filename,
-        lang: 'eng',
-      },
-    ]);
-  } finally {
-    harness.restoreGlobals();
-  }
-});
-
-test('English tab hides non-English languages, not just Japanese', async () => {
-  const harness = createModalHarness([GERMAN_TRACK, ENGLISH_TRACK, JAPANESE_TRACK]);
-  try {
-    // With German visible this would move selection onto it; English-only
-    // filtering must clamp to the single English track instead.
-    pressKey(harness, 'ArrowDown');
-    pressKey(harness, 'Enter');
-    await flushAsyncWork();
-
-    assert.deepEqual(harness.downloadQueries, [
-      {
-        entryId: 606713,
-        url: ENGLISH_TRACK.url,
-        name: ENGLISH_TRACK.filename,
-        lang: 'eng',
-      },
-    ]);
-  } finally {
-    harness.restoreGlobals();
-  }
-});
-
-test('Japanese tab filters tracks so Enter downloads the Japanese one', async () => {
-  const harness = createModalHarness([ENGLISH_TRACK, JAPANESE_TRACK]);
-  try {
-    assert.equal(harness.state.animetoshoActiveTab, 'en');
-    pressKey(harness, 'ArrowRight');
-    assert.equal(harness.state.animetoshoActiveTab, 'ja');
-
-    pressKey(harness, 'Enter');
-    await flushAsyncWork();
-
-    assert.deepEqual(harness.downloadQueries, [
-      {
-        entryId: 606713,
-        url: JAPANESE_TRACK.url,
-        name: JAPANESE_TRACK.filename,
-        lang: 'jpn',
-      },
-    ]);
-  } finally {
-    harness.restoreGlobals();
-  }
-});
-
-test('secondary tab follows configured secondarySub languages', async () => {
-  const harness = createModalHarness([GERMAN_TRACK, ENGLISH_TRACK, JAPANESE_TRACK], {
-    secondaryLanguages: ['de'],
-  });
-  try {
-    // Re-open through the API so the modal fetches the configured languages.
-    harness.state.animetoshoModalOpen = false;
-    harness.modal.openAnimetoshoModal();
-    await flushAsyncWork();
-
-    harness.state.animetoshoFiles = [GERMAN_TRACK, ENGLISH_TRACK, JAPANESE_TRACK];
-    harness.state.currentAnimetoshoEntryId = 606713;
-
-    pressKey(harness, 'Enter');
-    await flushAsyncWork();
-
-    assert.deepEqual(harness.downloadQueries, [
-      {
-        entryId: 606713,
-        url: GERMAN_TRACK.url,
-        name: GERMAN_TRACK.filename,
-        lang: 'ger',
-      },
-    ]);
-  } finally {
-    harness.restoreGlobals();
-  }
-});
-
-test('a slow release response does not overwrite the newly selected release', async () => {
-  const STALE_TRACK: AnimetoshoSubtitleFile = {
-    ...ENGLISH_TRACK,
-    attachmentId: 999,
-    filename: 'stale.eng.ass',
-  };
-  const SECOND_ENGLISH_TRACK: AnimetoshoSubtitleFile = {
-    ...ENGLISH_TRACK,
-    attachmentId: 1955357,
-    filename: 'episode01.eng.sdh.ass',
-  };
-  const resolvers: Array<(value: unknown) => void> = [];
-
-  const harness = createModalHarness([], {
-    listFiles: (entryId) =>
-      new Promise((resolve) => {
-        if (entryId === 1) {
-          // Entry 1 answers late, after the user has moved on to entry 2.
-          resolvers.push(() => resolve({ ok: true, data: [STALE_TRACK] }));
-        } else {
-          // Two tracks, so the modal does not auto-download a lone match.
-          resolve({ ok: true, data: [ENGLISH_TRACK, SECOND_ENGLISH_TRACK] });
-        }
-      }),
-  });
-
-  try {
-    harness.state.animetoshoEntries = [
-      { id: 1, title: 'slow release', timestamp: null, totalSize: null, numFiles: 1 },
-      { id: 2, title: 'fast release', timestamp: null, totalSize: null, numFiles: 1 },
-    ];
-
-    harness.modal.selectAnimetoshoEntry(0);
-    harness.modal.selectAnimetoshoEntry(1);
-    await flushAsyncWork();
-
-    // Entry 2's tracks are on screen; now entry 1 finally answers.
-    assert.deepEqual(
-      harness.state.animetoshoFiles.map((file) => file.attachmentId),
-      [ENGLISH_TRACK.attachmentId, SECOND_ENGLISH_TRACK.attachmentId],
-    );
-
-    resolvers.forEach((resolve) => resolve(undefined));
-    await flushAsyncWork();
-
-    assert.equal(harness.state.currentAnimetoshoEntryId, 2);
-    assert.deepEqual(
-      harness.state.animetoshoFiles.map((file) => file.attachmentId),
-      [ENGLISH_TRACK.attachmentId, SECOND_ENGLISH_TRACK.attachmentId],
-    );
-  } finally {
-    harness.restoreGlobals();
-  }
-});
-
-test('ArrowLeft switches back to the English tab', () => {
-  const harness = createModalHarness([ENGLISH_TRACK, JAPANESE_TRACK]);
-  try {
-    pressKey(harness, 'ArrowRight');
-    assert.equal(harness.state.animetoshoActiveTab, 'ja');
-    pressKey(harness, 'ArrowLeft');
-    assert.equal(harness.state.animetoshoActiveTab, 'en');
-  } finally {
-    harness.restoreGlobals();
-  }
-});
diff --git a/src/renderer/modals/animetosho.ts b/src/renderer/modals/animetosho.ts
deleted file mode 100644
index e920ac14..00000000
--- a/src/renderer/modals/animetosho.ts
+++ /dev/null
@@ -1,487 +0,0 @@
-import type {
-  AnimetoshoApiResponse,
-  AnimetoshoDownloadResult,
-  AnimetoshoEntry,
-  AnimetoshoSubtitleFile,
-  JimakuMediaInfo,
-} from '../../types';
-import {
-  animetoshoTrackMatchesLanguages,
-  describeAnimetoshoTabLanguages,
-  normalizeAnimetoshoLangCode,
-} from '../../animetosho/lang.js';
-import type { ModalStateReader, RendererContext } from '../context';
-
-export function createAnimetoshoModal(
-  ctx: RendererContext,
-  options: {
-    modalStateReader: Pick<ModalStateReader, 'isAnyModalOpen'>;
-    syncSettingsModalSubtitleSuppression: () => void;
-  },
-) {
-  function setAnimetoshoStatus(message: string, isError = false): void {
-    ctx.dom.animetoshoStatus.textContent = message;
-    ctx.dom.animetoshoStatus.style.color = isError
-      ? 'rgba(255, 120, 120, 0.95)'
-      : 'rgba(255, 255, 255, 0.8)';
-  }
-
-  function resetAnimetoshoLists(): void {
-    ctx.state.animetoshoEntries = [];
-    ctx.state.animetoshoFiles = [];
-    ctx.state.selectedAnimetoshoEntryIndex = 0;
-    ctx.state.selectedAnimetoshoFileIndex = 0;
-    ctx.state.currentAnimetoshoEntryId = null;
-
-    ctx.dom.animetoshoEntriesList.innerHTML = '';
-    ctx.dom.animetoshoFilesList.innerHTML = '';
-    ctx.dom.animetoshoEntriesSection.classList.add('hidden');
-    ctx.dom.animetoshoFilesSection.classList.add('hidden');
-  }
-
-  // Defaults to English until the configured secondarySub languages arrive.
-  let secondaryLanguages: string[] = ['en'];
-
-  function secondaryTabLabel(): string {
-    return describeAnimetoshoTabLanguages(secondaryLanguages);
-  }
-
-  function isJapaneseTrack(file: AnimetoshoSubtitleFile): boolean {
-    return normalizeAnimetoshoLangCode(file.lang) === 'ja';
-  }
-
-  function getVisibleFiles(): AnimetoshoSubtitleFile[] {
-    if (ctx.state.animetoshoActiveTab === 'ja') {
-      return ctx.state.animetoshoFiles.filter(isJapaneseTrack);
-    }
-    return ctx.state.animetoshoFiles.filter(
-      (file) =>
-        !isJapaneseTrack(file) && animetoshoTrackMatchesLanguages(file.lang, secondaryLanguages),
-    );
-  }
-
-  function renderTabs(): void {
-    if (ctx.state.animetoshoActiveTab === 'ja') {
-      ctx.dom.animetoshoTabEnglishButton.classList.remove('active');
-      ctx.dom.animetoshoTabJapaneseButton.classList.add('active');
-    } else {
-      ctx.dom.animetoshoTabEnglishButton.classList.add('active');
-      ctx.dom.animetoshoTabJapaneseButton.classList.remove('active');
-    }
-  }
-
-  function describeEmptyTab(): string {
-    const hiddenCount = ctx.state.animetoshoFiles.length;
-    if (ctx.state.animetoshoActiveTab === 'ja') {
-      return hiddenCount > 0
-        ? `No Japanese tracks in this release. Switch to the ${secondaryTabLabel()} tab.`
-        : 'No Japanese tracks in this release.';
-    }
-    return hiddenCount > 0
-      ? `No ${secondaryTabLabel()} tracks in this release. Switch to the Japanese tab.`
-      : `No ${secondaryTabLabel()} tracks in this release.`;
-  }
-
-  function setActiveTab(tab: 'en' | 'ja'): void {
-    if (ctx.state.animetoshoActiveTab === tab) return;
-    ctx.state.animetoshoActiveTab = tab;
-    ctx.state.selectedAnimetoshoFileIndex = 0;
-    renderTabs();
-
-    if (ctx.state.animetoshoFiles.length === 0) return;
-    renderFiles();
-    if (getVisibleFiles().length === 0) {
-      setAnimetoshoStatus(describeEmptyTab());
-    } else {
-      setAnimetoshoStatus('Select a subtitle track.');
-    }
-  }
-
-  function formatBytes(size: number): string {
-    if (!Number.isFinite(size)) return '';
-    const units = ['B', 'KB', 'MB', 'GB'];
-    let value = size;
-    let idx = 0;
-    while (value >= 1024 && idx < units.length - 1) {
-      value /= 1024;
-      idx += 1;
-    }
-    return `${value.toFixed(value >= 10 || idx === 0 ? 0 : 1)} ${units[idx]}`;
-  }
-
-  function renderEntries(): void {
-    ctx.dom.animetoshoEntriesList.innerHTML = '';
-    if (ctx.state.animetoshoEntries.length === 0) {
-      ctx.dom.animetoshoEntriesSection.classList.add('hidden');
-      return;
-    }
-
-    ctx.dom.animetoshoEntriesSection.classList.remove('hidden');
-    ctx.state.animetoshoEntries.forEach((entry, index) => {
-      const li = document.createElement('li');
-      li.textContent = entry.title;
-
-      const details: string[] = [];
-      if (entry.totalSize !== null) details.push(formatBytes(entry.totalSize));
-      if (entry.numFiles !== null) {
-        details.push(`${entry.numFiles} file${entry.numFiles === 1 ? '' : 's'}`);
-      }
-      if (details.length > 0) {
-        const sub = document.createElement('div');
-        sub.className = 'jimaku-subtext';
-        sub.textContent = details.join(' • ');
-        li.appendChild(sub);
-      }
-
-      if (index === ctx.state.selectedAnimetoshoEntryIndex) {
-        li.classList.add('active');
-      }
-
-      li.addEventListener('click', () => {
-        selectEntry(index);
-      });
-
-      ctx.dom.animetoshoEntriesList.appendChild(li);
-    });
-  }
-
-  function renderFiles(): void {
-    ctx.dom.animetoshoFilesList.innerHTML = '';
-    const visibleFiles = getVisibleFiles();
-    if (visibleFiles.length === 0) {
-      ctx.dom.animetoshoFilesSection.classList.add('hidden');
-      return;
-    }
-
-    ctx.dom.animetoshoFilesSection.classList.remove('hidden');
-    visibleFiles.forEach((file, index) => {
-      const li = document.createElement('li');
-      li.textContent = file.filename;
-
-      const details: string[] = [];
-      if (file.lang) details.push(file.lang);
-      if (file.trackName) details.push(file.trackName);
-      details.push(formatBytes(file.size));
-      const sub = document.createElement('div');
-      sub.className = 'jimaku-subtext';
-      sub.textContent = details.filter(Boolean).join(' • ');
-      li.appendChild(sub);
-
-      if (index === ctx.state.selectedAnimetoshoFileIndex) {
-        li.classList.add('active');
-      }
-
-      li.addEventListener('click', () => {
-        void selectFile(index);
-      });
-
-      ctx.dom.animetoshoFilesList.appendChild(li);
-    });
-  }
-
-  function getSearchQuery(): string {
-    const title = ctx.dom.animetoshoTitleInput.value.trim();
-    if (!title) return '';
-    const episodeValue = ctx.dom.animetoshoEpisodeInput.value
-      ? Number.parseInt(ctx.dom.animetoshoEpisodeInput.value, 10)
-      : null;
-    if (episodeValue !== null && Number.isFinite(episodeValue)) {
-      return `${title} ${String(episodeValue).padStart(2, '0')}`;
-    }
-    return title;
-  }
-
-  async function performAnimetoshoSearch(): Promise<void> {
-    const query = getSearchQuery();
-    if (!query) {
-      setAnimetoshoStatus('Enter a title before searching.', true);
-      return;
-    }
-
-    resetAnimetoshoLists();
-    setAnimetoshoStatus('Searching Animetosho...');
-
-    const response: AnimetoshoApiResponse<AnimetoshoEntry[]> =
-      await window.electronAPI.animetoshoSearchEntries({ query });
-    if (!response.ok) {
-      setAnimetoshoStatus(response.error.error, true);
-      return;
-    }
-
-    ctx.state.animetoshoEntries = response.data;
-    ctx.state.selectedAnimetoshoEntryIndex = 0;
-
-    if (ctx.state.animetoshoEntries.length === 0) {
-      setAnimetoshoStatus('No releases found.');
-      return;
-    }
-
-    setAnimetoshoStatus('Select a release.');
-    renderEntries();
-    if (ctx.state.animetoshoEntries.length === 1) {
-      selectEntry(0);
-    }
-  }
-
-  async function loadFiles(entryId: number): Promise<void> {
-    setAnimetoshoStatus('Loading subtitle tracks...');
-    ctx.state.animetoshoFiles = [];
-    ctx.state.selectedAnimetoshoFileIndex = 0;
-
-    ctx.dom.animetoshoFilesList.innerHTML = '';
-    ctx.dom.animetoshoFilesSection.classList.add('hidden');
-
-    const response: AnimetoshoApiResponse<AnimetoshoSubtitleFile[]> =
-      await window.electronAPI.animetoshoListFiles({ entryId });
-    // The user may have picked another release while this was in flight.
-    if (ctx.state.currentAnimetoshoEntryId !== entryId) return;
-    if (!response.ok) {
-      setAnimetoshoStatus(response.error.error, true);
-      return;
-    }
-
-    ctx.state.animetoshoFiles = response.data;
-    if (ctx.state.animetoshoFiles.length === 0) {
-      const entry = ctx.state.animetoshoEntries.find((candidate) => candidate.id === entryId);
-      // The feed API omits per-file attachment data for multi-file torrents.
-      if (entry && entry.numFiles !== null && entry.numFiles > 1) {
-        setAnimetoshoStatus(
-          'Batch releases are not supported. Pick a single-episode release instead.',
-        );
-      } else {
-        setAnimetoshoStatus('No text subtitle tracks in this release. Try another one.');
-      }
-      return;
-    }
-
-    const visibleFiles = getVisibleFiles();
-    if (visibleFiles.length === 0) {
-      setAnimetoshoStatus(describeEmptyTab());
-      return;
-    }
-
-    setAnimetoshoStatus('Select a subtitle track.');
-    renderFiles();
-    if (visibleFiles.length === 1) {
-      await selectFile(0);
-    }
-  }
-
-  function selectEntry(index: number): void {
-    if (index < 0 || index >= ctx.state.animetoshoEntries.length) return;
-
-    ctx.state.selectedAnimetoshoEntryIndex = index;
-    ctx.state.currentAnimetoshoEntryId = ctx.state.animetoshoEntries[index]!.id;
-    renderEntries();
-
-    if (ctx.state.currentAnimetoshoEntryId !== null) {
-      void loadFiles(ctx.state.currentAnimetoshoEntryId);
-    }
-  }
-
-  async function selectFile(index: number): Promise<void> {
-    const visibleFiles = getVisibleFiles();
-    if (index < 0 || index >= visibleFiles.length) return;
-
-    ctx.state.selectedAnimetoshoFileIndex = index;
-    renderFiles();
-
-    if (ctx.state.currentAnimetoshoEntryId === null) {
-      setAnimetoshoStatus('Select a release first.', true);
-      return;
-    }
-
-    const file = visibleFiles[index]!;
-    setAnimetoshoStatus('Downloading subtitle...');
-
-    const result: AnimetoshoDownloadResult = await window.electronAPI.animetoshoDownloadFile({
-      entryId: ctx.state.currentAnimetoshoEntryId,
-      url: file.url,
-      name: file.filename,
-      lang: file.lang,
-    });
-
-    if (result.ok) {
-      setAnimetoshoStatus(`Downloaded and loaded: ${result.path}`);
-      closeAnimetoshoModal();
-      return;
-    }
-
-    setAnimetoshoStatus(result.error.error, true);
-  }
-
-  function isTextInputFocused(): boolean {
-    const active = document.activeElement;
-    if (!active) return false;
-    const tag = active.tagName.toLowerCase();
-    return tag === 'input' || tag === 'textarea';
-  }
-
-  async function loadSecondaryLanguages(): Promise<void> {
-    try {
-      const languages = await window.electronAPI.animetoshoGetSecondaryLanguages();
-      secondaryLanguages = languages.length > 0 ? languages : ['en'];
-    } catch {
-      secondaryLanguages = ['en'];
-    }
-    ctx.dom.animetoshoTabEnglishButton.textContent = secondaryTabLabel();
-    // Tracks may already be on screen if the languages arrived late.
-    if (ctx.state.animetoshoFiles.length > 0) {
-      renderFiles();
-    }
-  }
-
-  function openAnimetoshoModal(): void {
-    if (ctx.state.animetoshoModalOpen) return;
-
-    ctx.state.animetoshoModalOpen = true;
-    ctx.state.animetoshoActiveTab = 'en';
-    options.syncSettingsModalSubtitleSuppression();
-    ctx.dom.overlay.classList.add('interactive');
-    ctx.dom.animetoshoModal.classList.remove('hidden');
-    ctx.dom.animetoshoModal.setAttribute('aria-hidden', 'false');
-
-    setAnimetoshoStatus('Loading media info...');
-    resetAnimetoshoLists();
-    renderTabs();
-
-    const secondaryLanguagesReady = loadSecondaryLanguages();
-
-    window.electronAPI
-      .getJimakuMediaInfo()
-      .then(async (info: JimakuMediaInfo) => {
-        ctx.dom.animetoshoTitleInput.value = info.title || '';
-        ctx.dom.animetoshoEpisodeInput.value = info.episode ? String(info.episode) : '';
-
-        if (info.confidence === 'high' && info.title && info.episode) {
-          await secondaryLanguagesReady;
-          void performAnimetoshoSearch();
-        } else if (info.title) {
-          setAnimetoshoStatus('Check title/episode and press Search.');
-        } else {
-          setAnimetoshoStatus('Enter title/episode and press Search.');
-        }
-      })
-      .catch(() => {
-        setAnimetoshoStatus('Failed to load media info.', true);
-      });
-  }
-
-  function closeAnimetoshoModal(): void {
-    if (!ctx.state.animetoshoModalOpen) return;
-
-    ctx.state.animetoshoModalOpen = false;
-    options.syncSettingsModalSubtitleSuppression();
-    ctx.dom.animetoshoModal.classList.add('hidden');
-    ctx.dom.animetoshoModal.setAttribute('aria-hidden', 'true');
-    window.electronAPI.notifyOverlayModalClosed('animetosho');
-
-    if (!ctx.state.isOverSubtitle && !options.modalStateReader.isAnyModalOpen()) {
-      ctx.dom.overlay.classList.remove('interactive');
-    }
-
-    resetAnimetoshoLists();
-  }
-
-  function handleAnimetoshoKeydown(e: KeyboardEvent): boolean {
-    if (e.key === 'Escape') {
-      e.preventDefault();
-      closeAnimetoshoModal();
-      return true;
-    }
-
-    if (isTextInputFocused()) {
-      if (e.key === 'Enter') {
-        e.preventDefault();
-        void performAnimetoshoSearch();
-      }
-      return true;
-    }
-
-    if (e.key === 'ArrowLeft') {
-      e.preventDefault();
-      setActiveTab('en');
-      return true;
-    }
-
-    if (e.key === 'ArrowRight') {
-      e.preventDefault();
-      setActiveTab('ja');
-      return true;
-    }
-
-    if (e.key === 'ArrowDown') {
-      e.preventDefault();
-      const visibleFiles = getVisibleFiles();
-      if (visibleFiles.length > 0) {
-        ctx.state.selectedAnimetoshoFileIndex = Math.min(
-          visibleFiles.length - 1,
-          ctx.state.selectedAnimetoshoFileIndex + 1,
-        );
-        renderFiles();
-      } else if (ctx.state.animetoshoEntries.length > 0) {
-        ctx.state.selectedAnimetoshoEntryIndex = Math.min(
-          ctx.state.animetoshoEntries.length - 1,
-          ctx.state.selectedAnimetoshoEntryIndex + 1,
-        );
-        renderEntries();
-      }
-      return true;
-    }
-
-    if (e.key === 'ArrowUp') {
-      e.preventDefault();
-      if (getVisibleFiles().length > 0) {
-        ctx.state.selectedAnimetoshoFileIndex = Math.max(
-          0,
-          ctx.state.selectedAnimetoshoFileIndex - 1,
-        );
-        renderFiles();
-      } else if (ctx.state.animetoshoEntries.length > 0) {
-        ctx.state.selectedAnimetoshoEntryIndex = Math.max(
-          0,
-          ctx.state.selectedAnimetoshoEntryIndex - 1,
-        );
-        renderEntries();
-      }
-      return true;
-    }
-
-    if (e.key === 'Enter') {
-      e.preventDefault();
-      if (getVisibleFiles().length > 0) {
-        void selectFile(ctx.state.selectedAnimetoshoFileIndex);
-      } else if (ctx.state.animetoshoEntries.length > 0) {
-        selectEntry(ctx.state.selectedAnimetoshoEntryIndex);
-      } else {
-        void performAnimetoshoSearch();
-      }
-      return true;
-    }
-
-    return true;
-  }
-
-  function wireDomEvents(): void {
-    ctx.dom.animetoshoSearchButton.addEventListener('click', () => {
-      void performAnimetoshoSearch();
-    });
-    ctx.dom.animetoshoCloseButton.addEventListener('click', () => {
-      closeAnimetoshoModal();
-    });
-    ctx.dom.animetoshoTabEnglishButton.addEventListener('click', () => {
-      setActiveTab('en');
-    });
-    ctx.dom.animetoshoTabJapaneseButton.addEventListener('click', () => {
-      setActiveTab('ja');
-    });
-  }
-
-  return {
-    closeAnimetoshoModal,
-    handleAnimetoshoKeydown,
-    openAnimetoshoModal,
-    selectAnimetoshoEntry: selectEntry,
-    wireDomEvents,
-  };
-}
diff --git a/src/renderer/modals/session-help-sections.ts b/src/renderer/modals/session-help-sections.ts
index 0e6e28d2..7395190b 100644
--- a/src/renderer/modals/session-help-sections.ts
+++ b/src/renderer/modals/session-help-sections.ts
@@ -104,7 +104,7 @@ function describeCommand(command: (string | number)[]): string {
   if (first === SPECIAL_COMMANDS.SUBSYNC_TRIGGER) return 'Open subtitle sync controls';
   if (first === SPECIAL_COMMANDS.RUNTIME_OPTIONS_OPEN) return 'Open runtime options';
   if (first === SPECIAL_COMMANDS.JIMAKU_OPEN) return 'Open jimaku';
-  if (first === SPECIAL_COMMANDS.ANIMETOSHO_OPEN) return 'Open animetosho';
+  if (first === SPECIAL_COMMANDS.TSUKIHIME_OPEN) return 'Open TsukiHime';
   if (first === SPECIAL_COMMANDS.PLAYLIST_BROWSER_OPEN) return 'Open playlist browser';
   if (first === SPECIAL_COMMANDS.REPLAY_SUBTITLE) return 'Replay current subtitle';
   if (first === SPECIAL_COMMANDS.PLAY_NEXT_SUBTITLE) return 'Play next subtitle';
@@ -149,7 +149,7 @@ function sectionForCommand(command: (string | number)[]): string {
   if (
     first === SPECIAL_COMMANDS.RUNTIME_OPTIONS_OPEN ||
     first === SPECIAL_COMMANDS.JIMAKU_OPEN ||
-    first === SPECIAL_COMMANDS.ANIMETOSHO_OPEN ||
+    first === SPECIAL_COMMANDS.TSUKIHIME_OPEN ||
     first === SPECIAL_COMMANDS.PLAYLIST_BROWSER_OPEN ||
     first.startsWith(SPECIAL_COMMANDS.RUNTIME_OPTION_CYCLE_PREFIX)
   ) {
@@ -223,8 +223,8 @@ function describeSessionAction(
       return 'Open controller debug';
     case 'openJimaku':
       return 'Open jimaku';
-    case 'openAnimetosho':
-      return 'Open animetosho';
+    case 'openTsukihime':
+      return 'Open TsukiHime';
     case 'openYoutubePicker':
       return 'Open YouTube subtitle picker';
     case 'openPlaylistBrowser':
@@ -264,7 +264,7 @@ function sectionForSessionBinding(binding: CompiledSessionBinding): string {
       return 'Subtitle sync';
     case 'openRuntimeOptions':
     case 'openJimaku':
-    case 'openAnimetosho':
+    case 'openTsukihime':
     case 'openCharacterDictionaryManager':
     case 'openControllerSelect':
     case 'openControllerDebug':
diff --git a/src/renderer/modals/tsukihime.test.ts b/src/renderer/modals/tsukihime.test.ts
new file mode 100644
index 00000000..905aca8c
--- /dev/null
+++ b/src/renderer/modals/tsukihime.test.ts
@@ -0,0 +1,615 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs';
+import path from 'node:path';
+import test from 'node:test';
+
+import type { TsukihimeSubtitleFile, ElectronAPI } from '../../types';
+import { createRendererState } from '../state.js';
+import { createTsukihimeModal } from './tsukihime.js';
+
+function createClassList(initialTokens: string[] = []) {
+  const tokens = new Set(initialTokens);
+  return {
+    add: (...entries: string[]) => {
+      for (const entry of entries) {
+        tokens.add(entry);
+      }
+    },
+    remove: (...entries: string[]) => {
+      for (const entry of entries) {
+        tokens.delete(entry);
+      }
+    },
+    contains: (entry: string) => tokens.has(entry),
+  };
+}
+
+function createElementStub() {
+  const classList = createClassList();
+  return {
+    textContent: '',
+    className: '',
+    style: {},
+    classList,
+    children: [] as unknown[],
+    appendChild(child: unknown) {
+      this.children.push(child);
+    },
+    addEventListener: () => {},
+  };
+}
+
+function createListStub() {
+  return {
+    innerHTML: '',
+    children: [] as unknown[],
+    appendChild(child: unknown) {
+      this.children.push(child);
+    },
+  };
+}
+
+function createTabStub(active: boolean) {
+  const attributes = new Map<string, string>();
+  return {
+    textContent: '',
+    classList: createClassList(active ? ['active'] : []),
+    attributes,
+    setAttribute(name: string, value: string) {
+      attributes.set(name, value);
+    },
+    addEventListener: () => {},
+  };
+}
+
+function flushAsyncWork(): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(resolve, 0);
+  });
+}
+
+const ENGLISH_TRACK: TsukihimeSubtitleFile = {
+  attachmentId: 1955356,
+  filename: 'episode01.eng.ass',
+  lang: 'eng',
+  trackName: 'English subs',
+  size: 33075,
+  url: 'https://storage.tsukihime.org/attach/001dd61c/1955356.xz',
+  sourceFilename: 'episode01.mkv',
+};
+
+const JAPANESE_TRACK: TsukihimeSubtitleFile = {
+  attachmentId: 1955400,
+  filename: 'episode01.jpn.ass',
+  lang: 'jpn',
+  trackName: 'Japanese subs',
+  size: 41000,
+  url: 'https://storage.tsukihime.org/attach/001dd648/1955400.xz',
+  sourceFilename: 'episode01.mkv',
+};
+
+const GERMAN_TRACK: TsukihimeSubtitleFile = {
+  attachmentId: 1955500,
+  filename: 'episode01.ger.ass',
+  lang: 'ger',
+  trackName: 'Deutsch',
+  size: 28000,
+  url: 'https://storage.tsukihime.org/attach/001dd6ac/1955500.xz',
+  sourceFilename: 'episode01.mkv',
+};
+
+interface ModalHarness {
+  modal: ReturnType<typeof createTsukihimeModal>;
+  state: ReturnType<typeof createRendererState>;
+  downloadQueries: unknown[];
+  modalCloseNotifications: string[];
+  overlayClassList: ReturnType<typeof createClassList>;
+  tsukihimeModalClassList: ReturnType<typeof createClassList>;
+  titleInput: { value: string };
+  status: { textContent: string; style: { color: string } };
+  entriesList: ReturnType<typeof createListStub>;
+  filesList: ReturnType<typeof createListStub>;
+  secondaryTab: ReturnType<typeof createTabStub>;
+  primaryTab: ReturnType<typeof createTabStub>;
+  restoreGlobals: () => void;
+}
+
+function createModalHarness(
+  files: TsukihimeSubtitleFile[],
+  options: {
+    secondaryLanguages?: string[];
+    downloadFile?: (query: unknown) => Promise<unknown>;
+    listFiles?: (entryId: number) => Promise<unknown>;
+    searchEntries?: (query: unknown) => Promise<unknown>;
+  } = {},
+): ModalHarness {
+  const globals = globalThis as typeof globalThis & { window?: unknown; document?: unknown };
+  const hadWindow = Object.prototype.hasOwnProperty.call(globalThis, 'window');
+  const hadDocument = Object.prototype.hasOwnProperty.call(globalThis, 'document');
+  const previousWindow = globals.window;
+  const previousDocument = globals.document;
+
+  const modalCloseNotifications: string[] = [];
+  const downloadQueries: unknown[] = [];
+
+  const electronAPI = {
+    tsukihimeDownloadFile: async (query: unknown) => {
+      downloadQueries.push(query);
+      if (options.downloadFile) return options.downloadFile(query);
+      return { ok: true, path: '/tmp/subtitles/episode01.en.ass' };
+    },
+    tsukihimeGetSecondaryLanguages: async () => options.secondaryLanguages ?? ['en', 'eng'],
+    tsukihimeListFiles: async ({ entryId }: { entryId: number }) =>
+      options.listFiles ? options.listFiles(entryId) : { ok: true, data: [] },
+    tsukihimeSearchEntries: async (query: unknown) =>
+      options.searchEntries ? options.searchEntries(query) : { ok: true, data: [] },
+    getJimakuMediaInfo: async () => ({
+      title: '',
+      season: null,
+      episode: null,
+      confidence: 'low',
+      filename: '',
+      rawTitle: '',
+    }),
+    notifyOverlayModalClosed: (modal: string) => {
+      modalCloseNotifications.push(modal);
+    },
+  } as unknown as ElectronAPI;
+
+  Object.defineProperty(globalThis, 'window', {
+    configurable: true,
+    value: { electronAPI },
+  });
+  Object.defineProperty(globalThis, 'document', {
+    configurable: true,
+    value: {
+      activeElement: null,
+      createElement: () => createElementStub(),
+    },
+  });
+
+  const overlayClassList = createClassList(['interactive']);
+  const tsukihimeModalClassList = createClassList();
+  const state = createRendererState();
+  state.tsukihimeModalOpen = true;
+  state.currentTsukihimeEntryId = 606713;
+  state.selectedTsukihimeFileIndex = 0;
+  state.tsukihimeFiles = files;
+  const secondaryTab = createTabStub(true);
+  secondaryTab.textContent = 'English';
+  const primaryTab = createTabStub(false);
+  primaryTab.textContent = 'Japanese';
+
+  const ctx = {
+    dom: {
+      overlay: { classList: overlayClassList },
+      tsukihimeModal: {
+        classList: tsukihimeModalClassList,
+        setAttribute: () => {},
+      },
+      tsukihimeTitleInput: { value: '' },
+      tsukihimeEpisodeInput: { value: '' },
+      tsukihimeSearchButton: { addEventListener: () => {} },
+      tsukihimeCloseButton: { addEventListener: () => {} },
+      tsukihimeTabSecondaryButton: secondaryTab,
+      tsukihimeTabPrimaryButton: primaryTab,
+      tsukihimeStatus: { textContent: '', style: { color: '' } },
+      tsukihimeEntriesSection: { classList: createClassList(['hidden']) },
+      tsukihimeEntriesList: createListStub(),
+      tsukihimeFilesSection: { classList: createClassList() },
+      tsukihimeFilesList: createListStub(),
+    },
+    state,
+  };
+
+  const modal = createTsukihimeModal(ctx as never, {
+    modalStateReader: { isAnyModalOpen: () => false },
+    syncSettingsModalSubtitleSuppression: () => {},
+  });
+
+  return {
+    modal,
+    state,
+    downloadQueries,
+    modalCloseNotifications,
+    overlayClassList,
+    tsukihimeModalClassList,
+    titleInput: ctx.dom.tsukihimeTitleInput,
+    status: ctx.dom.tsukihimeStatus,
+    entriesList: ctx.dom.tsukihimeEntriesList,
+    filesList: ctx.dom.tsukihimeFilesList,
+    secondaryTab,
+    primaryTab,
+    restoreGlobals: () => {
+      const target = globalThis as unknown as Record<string, unknown>;
+      if (hadWindow) {
+        Object.defineProperty(globalThis, 'window', { configurable: true, value: previousWindow });
+      } else {
+        delete target.window;
+      }
+      if (hadDocument) {
+        Object.defineProperty(globalThis, 'document', {
+          configurable: true,
+          value: previousDocument,
+        });
+      } else {
+        delete target.document;
+      }
+    },
+  };
+}
+
+test('TsukiHime language tabs expose tab semantics in the renderer markup', () => {
+  const html = fs.readFileSync(path.join(process.cwd(), 'src', 'renderer', 'index.html'), 'utf8');
+  const tabs = html.match(/<div class="tsukihime-tabs"[\s\S]*?<\/div>/)?.[0];
+
+  assert.ok(tabs);
+  assert.match(tabs, /<div class="tsukihime-tabs" role="tablist">/);
+  assert.match(tabs, /id="tsukihimeTabSecondary"[\s\S]*?role="tab"[\s\S]*?aria-selected="true"/);
+  assert.match(tabs, /id="tsukihimeTabPrimary"[\s\S]*?role="tab"[\s\S]*?aria-selected="false"/);
+});
+
+test('switching TsukiHime language tabs synchronizes aria-selected', () => {
+  const harness = createModalHarness([ENGLISH_TRACK, JAPANESE_TRACK]);
+  try {
+    pressKey(harness, 'ArrowRight');
+
+    assert.equal(harness.secondaryTab.attributes.get('aria-selected'), 'false');
+    assert.equal(harness.primaryTab.attributes.get('aria-selected'), 'true');
+
+    pressKey(harness, 'ArrowLeft');
+
+    assert.equal(harness.secondaryTab.attributes.get('aria-selected'), 'true');
+    assert.equal(harness.primaryTab.attributes.get('aria-selected'), 'false');
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+function pressKey(harness: ModalHarness, key: string): boolean {
+  let prevented = false;
+  harness.modal.handleTsukihimeKeydown({
+    key,
+    preventDefault: () => {
+      prevented = true;
+    },
+  } as KeyboardEvent);
+  return prevented;
+}
+
+test('successful Tsukihime subtitle selection closes modal', async () => {
+  const harness = createModalHarness([ENGLISH_TRACK, JAPANESE_TRACK]);
+  try {
+    const prevented = pressKey(harness, 'Enter');
+    await flushAsyncWork();
+
+    assert.equal(prevented, true);
+    assert.equal(harness.state.tsukihimeModalOpen, false);
+    assert.equal(harness.tsukihimeModalClassList.contains('hidden'), true);
+    assert.equal(harness.overlayClassList.contains('interactive'), false);
+    assert.deepEqual(harness.modalCloseNotifications, ['tsukihime']);
+    assert.deepEqual(harness.downloadQueries, [
+      {
+        entryId: 606713,
+        url: ENGLISH_TRACK.url,
+        name: ENGLISH_TRACK.filename,
+        lang: 'eng',
+      },
+    ]);
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('a download from a prior modal session cannot close a reopened modal', async () => {
+  let resolveDownload!: (value: unknown) => void;
+  const harness = createModalHarness([ENGLISH_TRACK, JAPANESE_TRACK], {
+    downloadFile: () =>
+      new Promise((resolve) => {
+        resolveDownload = resolve;
+      }),
+  });
+  try {
+    pressKey(harness, 'Enter');
+    harness.modal.closeTsukihimeModal();
+    harness.modal.openTsukihimeModal();
+    await flushAsyncWork();
+    harness.state.currentTsukihimeEntryId = 606713;
+    harness.status.textContent = 'Fresh modal session';
+
+    resolveDownload({ ok: true, path: '/tmp/subtitles/stale.ass' });
+    await flushAsyncWork();
+
+    assert.equal(harness.state.tsukihimeModalOpen, true);
+    assert.equal(harness.status.textContent, 'Fresh modal session');
+    assert.deepEqual(harness.modalCloseNotifications, ['tsukihime']);
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('a download cannot affect a newly selected release', async () => {
+  let resolveDownload!: (value: unknown) => void;
+  const harness = createModalHarness([ENGLISH_TRACK, JAPANESE_TRACK], {
+    downloadFile: () =>
+      new Promise((resolve) => {
+        resolveDownload = resolve;
+      }),
+  });
+  try {
+    pressKey(harness, 'Enter');
+    harness.state.tsukihimeEntries = [
+      {
+        id: 999,
+        title: 'new release',
+        timestamp: null,
+        totalSize: null,
+        numFiles: 1,
+        sublangs: [],
+      },
+    ];
+    harness.modal.selectTsukihimeEntry(0);
+    await flushAsyncWork();
+    const currentStatus = harness.status.textContent;
+
+    resolveDownload({ ok: false, error: { error: 'stale failure' } });
+    await flushAsyncWork();
+
+    assert.equal(harness.state.tsukihimeModalOpen, true);
+    assert.equal(harness.state.currentTsukihimeEntryId, 999);
+    assert.equal(harness.status.textContent, currentStatus);
+    assert.deepEqual(harness.modalCloseNotifications, []);
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('secondary tab hides languages outside its configured defaults', async () => {
+  const harness = createModalHarness([GERMAN_TRACK, ENGLISH_TRACK, JAPANESE_TRACK]);
+  try {
+    // With German visible this would move selection onto it; English-only
+    // filtering must clamp to the single English track instead.
+    pressKey(harness, 'ArrowDown');
+    pressKey(harness, 'Enter');
+    await flushAsyncWork();
+
+    assert.deepEqual(harness.downloadQueries, [
+      {
+        entryId: 606713,
+        url: ENGLISH_TRACK.url,
+        name: ENGLISH_TRACK.filename,
+        lang: 'eng',
+      },
+    ]);
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('primary tab defaults to Japanese tracks', async () => {
+  const harness = createModalHarness([ENGLISH_TRACK, JAPANESE_TRACK]);
+  try {
+    assert.equal(harness.state.tsukihimeActiveTab, 'secondary');
+    pressKey(harness, 'ArrowRight');
+    assert.equal(harness.state.tsukihimeActiveTab, 'primary');
+
+    pressKey(harness, 'Enter');
+    await flushAsyncWork();
+
+    assert.deepEqual(harness.downloadQueries, [
+      {
+        entryId: 606713,
+        url: JAPANESE_TRACK.url,
+        name: JAPANESE_TRACK.filename,
+        lang: 'jpn',
+      },
+    ]);
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('secondary tab follows configured secondarySub languages', async () => {
+  const harness = createModalHarness([GERMAN_TRACK, ENGLISH_TRACK, JAPANESE_TRACK], {
+    secondaryLanguages: ['de'],
+  });
+  try {
+    // Re-open through the API so the modal fetches the configured languages.
+    harness.state.tsukihimeModalOpen = false;
+    harness.modal.openTsukihimeModal();
+    await flushAsyncWork();
+
+    harness.state.tsukihimeFiles = [GERMAN_TRACK, ENGLISH_TRACK, JAPANESE_TRACK];
+    harness.state.currentTsukihimeEntryId = 606713;
+
+    pressKey(harness, 'Enter');
+    await flushAsyncWork();
+
+    assert.deepEqual(harness.downloadQueries, [
+      {
+        entryId: 606713,
+        url: GERMAN_TRACK.url,
+        name: GERMAN_TRACK.filename,
+        lang: 'ger',
+      },
+    ]);
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('primary tab remains Japanese when the release includes other languages', async () => {
+  const harness = createModalHarness([GERMAN_TRACK, ENGLISH_TRACK, JAPANESE_TRACK], {
+    secondaryLanguages: ['en'],
+  });
+  try {
+    harness.state.tsukihimeModalOpen = false;
+    harness.modal.openTsukihimeModal();
+    await flushAsyncWork();
+
+    harness.state.tsukihimeFiles = [GERMAN_TRACK, ENGLISH_TRACK, JAPANESE_TRACK];
+    harness.state.currentTsukihimeEntryId = 606713;
+
+    pressKey(harness, 'ArrowRight');
+    pressKey(harness, 'Enter');
+    await flushAsyncWork();
+
+    assert.deepEqual(harness.downloadQueries, [
+      {
+        entryId: 606713,
+        url: JAPANESE_TRACK.url,
+        name: JAPANESE_TRACK.filename,
+        lang: 'jpn',
+      },
+    ]);
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('a slow release response does not overwrite the newly selected release', async () => {
+  const STALE_TRACK: TsukihimeSubtitleFile = {
+    ...ENGLISH_TRACK,
+    attachmentId: 999,
+    filename: 'stale.eng.ass',
+  };
+  const SECOND_ENGLISH_TRACK: TsukihimeSubtitleFile = {
+    ...ENGLISH_TRACK,
+    attachmentId: 1955357,
+    filename: 'episode01.eng.sdh.ass',
+  };
+  const resolvers: Array<(value: unknown) => void> = [];
+
+  const harness = createModalHarness([], {
+    listFiles: (entryId) =>
+      new Promise((resolve) => {
+        if (entryId === 1) {
+          // Entry 1 answers late, after the user has moved on to entry 2.
+          resolvers.push(() => resolve({ ok: true, data: [STALE_TRACK] }));
+        } else {
+          // Two tracks, so the modal does not auto-download a lone match.
+          resolve({ ok: true, data: [ENGLISH_TRACK, SECOND_ENGLISH_TRACK] });
+        }
+      }),
+  });
+
+  try {
+    harness.state.tsukihimeEntries = [
+      { id: 1, title: 'slow release', timestamp: null, totalSize: null, numFiles: 1, sublangs: [] },
+      { id: 2, title: 'fast release', timestamp: null, totalSize: null, numFiles: 1, sublangs: [] },
+    ];
+
+    harness.modal.selectTsukihimeEntry(0);
+    harness.modal.selectTsukihimeEntry(1);
+    await flushAsyncWork();
+
+    // Entry 2's tracks are on screen; now entry 1 finally answers.
+    assert.deepEqual(
+      harness.state.tsukihimeFiles.map((file) => file.attachmentId),
+      [ENGLISH_TRACK.attachmentId, SECOND_ENGLISH_TRACK.attachmentId],
+    );
+
+    resolvers.forEach((resolve) => resolve(undefined));
+    await flushAsyncWork();
+
+    assert.equal(harness.state.currentTsukihimeEntryId, 2);
+    assert.deepEqual(
+      harness.state.tsukihimeFiles.map((file) => file.attachmentId),
+      [ENGLISH_TRACK.attachmentId, SECOND_ENGLISH_TRACK.attachmentId],
+    );
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('ArrowLeft switches back to the secondary-language tab', () => {
+  const harness = createModalHarness([ENGLISH_TRACK, JAPANESE_TRACK]);
+  try {
+    pressKey(harness, 'ArrowRight');
+    assert.equal(harness.state.tsukihimeActiveTab, 'primary');
+    pressKey(harness, 'ArrowLeft');
+    assert.equal(harness.state.tsukihimeActiveTab, 'secondary');
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('searching reports TsukiHime as the backend and lists sublangs per release', async () => {
+  const harness = createModalHarness([], {
+    searchEntries: async () => ({
+      ok: true,
+      data: [
+        {
+          id: 12255,
+          title: '[DKB] Futsutsuka na Akujo - S01E01 [Multi-Subs]',
+          timestamp: null,
+          totalSize: 423868898,
+          numFiles: 1,
+          sublangs: ['en-US', 'ja'],
+        },
+        {
+          id: 12256,
+          title: 'release without langs',
+          timestamp: null,
+          totalSize: null,
+          numFiles: null,
+          sublangs: [],
+        },
+      ],
+    }),
+  });
+  try {
+    harness.state.tsukihimeFiles = [];
+    harness.state.currentTsukihimeEntryId = null;
+    harness.titleInput.value = 'Futsutsuka na Akujo';
+
+    const seenStatuses: string[] = [];
+    const status = harness.status;
+    Object.defineProperty(status, 'textContent', {
+      get: () => seenStatuses.at(-1) ?? '',
+      set: (value: string) => {
+        seenStatuses.push(value);
+      },
+    });
+
+    pressKey(harness, 'Enter');
+    await flushAsyncWork();
+
+    assert.equal(
+      seenStatuses.some((message) => message.includes('TsukiHime')),
+      true,
+    );
+    assert.equal(
+      seenStatuses.some((message) => message.includes('Tsukihime')),
+      false,
+    );
+
+    const firstEntry = harness.entriesList.children[0] as {
+      children: Array<{ textContent: string }>;
+    };
+    assert.equal(firstEntry.children.length, 1);
+    assert.match(firstEntry.children[0]!.textContent, /en-US, ja/);
+  } finally {
+    harness.restoreGlobals();
+  }
+});
+
+test('renderFiles omits the size detail when the API does not report one', () => {
+  const zeroSizeTrack: TsukihimeSubtitleFile = {
+    ...ENGLISH_TRACK,
+    size: 0,
+  };
+  const harness = createModalHarness([zeroSizeTrack, JAPANESE_TRACK]);
+  try {
+    pressKey(harness, 'ArrowDown');
+
+    const firstFile = harness.filesList.children[0] as {
+      children: Array<{ textContent: string }>;
+    };
+    assert.equal(firstFile.children.length, 1);
+    assert.equal(firstFile.children[0]!.textContent.includes('0 B'), false);
+    assert.match(firstFile.children[0]!.textContent, /English subs/);
+  } finally {
+    harness.restoreGlobals();
+  }
+});
diff --git a/src/renderer/modals/tsukihime.ts b/src/renderer/modals/tsukihime.ts
new file mode 100644
index 00000000..1f30e182
--- /dev/null
+++ b/src/renderer/modals/tsukihime.ts
@@ -0,0 +1,506 @@
+import type {
+  TsukihimeApiResponse,
+  TsukihimeDownloadResult,
+  TsukihimeEntry,
+  TsukihimeSubtitleFile,
+  JimakuMediaInfo,
+} from '../../types';
+import {
+  tsukihimeTrackMatchesLanguages,
+  describeTsukihimeTabLanguages,
+  normalizeTsukihimeLangCode,
+} from '../../tsukihime/lang.js';
+import type { ModalStateReader, RendererContext } from '../context';
+
+export function createTsukihimeModal(
+  ctx: RendererContext,
+  options: {
+    modalStateReader: Pick<ModalStateReader, 'isAnyModalOpen'>;
+    syncSettingsModalSubtitleSuppression: () => void;
+  },
+) {
+  function setTsukihimeStatus(message: string, isError = false): void {
+    ctx.dom.tsukihimeStatus.textContent = message;
+    ctx.dom.tsukihimeStatus.style.color = isError
+      ? 'rgba(255, 120, 120, 0.95)'
+      : 'rgba(255, 255, 255, 0.8)';
+  }
+
+  function resetTsukihimeLists(): void {
+    ctx.state.tsukihimeEntries = [];
+    ctx.state.tsukihimeFiles = [];
+    ctx.state.selectedTsukihimeEntryIndex = 0;
+    ctx.state.selectedTsukihimeFileIndex = 0;
+    ctx.state.currentTsukihimeEntryId = null;
+
+    ctx.dom.tsukihimeEntriesList.innerHTML = '';
+    ctx.dom.tsukihimeFilesList.innerHTML = '';
+    ctx.dom.tsukihimeEntriesSection.classList.add('hidden');
+    ctx.dom.tsukihimeFilesSection.classList.add('hidden');
+  }
+
+  // Defaults to English until the configured secondary languages arrive.
+  let secondaryLanguages: string[] = ['en'];
+  let activeDownloadToken = 0;
+
+  function secondaryTabLabel(): string {
+    return describeTsukihimeTabLanguages(secondaryLanguages);
+  }
+
+  function isPrimaryTrack(file: TsukihimeSubtitleFile): boolean {
+    return normalizeTsukihimeLangCode(file.lang) === 'ja';
+  }
+
+  function getVisibleFiles(): TsukihimeSubtitleFile[] {
+    if (ctx.state.tsukihimeActiveTab === 'primary') {
+      return ctx.state.tsukihimeFiles.filter(isPrimaryTrack);
+    }
+    return ctx.state.tsukihimeFiles.filter(
+      (file) =>
+        !isPrimaryTrack(file) && tsukihimeTrackMatchesLanguages(file.lang, secondaryLanguages),
+    );
+  }
+
+  function renderTabs(): void {
+    const primaryActive = ctx.state.tsukihimeActiveTab === 'primary';
+    ctx.dom.tsukihimeTabSecondaryButton.setAttribute(
+      'aria-selected',
+      primaryActive ? 'false' : 'true',
+    );
+    ctx.dom.tsukihimeTabPrimaryButton.setAttribute(
+      'aria-selected',
+      primaryActive ? 'true' : 'false',
+    );
+    if (primaryActive) {
+      ctx.dom.tsukihimeTabSecondaryButton.classList.remove('active');
+      ctx.dom.tsukihimeTabPrimaryButton.classList.add('active');
+    } else {
+      ctx.dom.tsukihimeTabSecondaryButton.classList.add('active');
+      ctx.dom.tsukihimeTabPrimaryButton.classList.remove('active');
+    }
+  }
+
+  function describeEmptyTab(): string {
+    const hiddenCount = ctx.state.tsukihimeFiles.length;
+    if (ctx.state.tsukihimeActiveTab === 'primary') {
+      return hiddenCount > 0
+        ? `No Japanese tracks in this release. Switch to the ${secondaryTabLabel()} tab.`
+        : 'No Japanese tracks in this release.';
+    }
+    return hiddenCount > 0
+      ? `No ${secondaryTabLabel()} tracks in this release. Switch to the Japanese tab.`
+      : `No ${secondaryTabLabel()} tracks in this release.`;
+  }
+
+  function setActiveTab(tab: 'secondary' | 'primary'): void {
+    if (ctx.state.tsukihimeActiveTab === tab) return;
+    ctx.state.tsukihimeActiveTab = tab;
+    ctx.state.selectedTsukihimeFileIndex = 0;
+    renderTabs();
+
+    if (ctx.state.tsukihimeFiles.length === 0) return;
+    renderFiles();
+    if (getVisibleFiles().length === 0) {
+      setTsukihimeStatus(describeEmptyTab());
+    } else {
+      setTsukihimeStatus('Select a subtitle track.');
+    }
+  }
+
+  function formatBytes(size: number): string {
+    if (!Number.isFinite(size)) return '';
+    const units = ['B', 'KB', 'MB', 'GB'];
+    let value = size;
+    let idx = 0;
+    while (value >= 1024 && idx < units.length - 1) {
+      value /= 1024;
+      idx += 1;
+    }
+    return `${value.toFixed(value >= 10 || idx === 0 ? 0 : 1)} ${units[idx]}`;
+  }
+
+  function renderEntries(): void {
+    ctx.dom.tsukihimeEntriesList.innerHTML = '';
+    if (ctx.state.tsukihimeEntries.length === 0) {
+      ctx.dom.tsukihimeEntriesSection.classList.add('hidden');
+      return;
+    }
+
+    ctx.dom.tsukihimeEntriesSection.classList.remove('hidden');
+    ctx.state.tsukihimeEntries.forEach((entry, index) => {
+      const li = document.createElement('li');
+      li.textContent = entry.title;
+
+      const details: string[] = [];
+      if (entry.totalSize !== null) details.push(formatBytes(entry.totalSize));
+      if (entry.numFiles !== null) {
+        details.push(`${entry.numFiles} file${entry.numFiles === 1 ? '' : 's'}`);
+      }
+      if (entry.sublangs?.length) details.push(`subs: ${entry.sublangs.join(', ')}`);
+      if (details.length > 0) {
+        const sub = document.createElement('div');
+        sub.className = 'jimaku-subtext';
+        sub.textContent = details.join(' • ');
+        li.appendChild(sub);
+      }
+
+      if (index === ctx.state.selectedTsukihimeEntryIndex) {
+        li.classList.add('active');
+      }
+
+      li.addEventListener('click', () => {
+        selectEntry(index);
+      });
+
+      ctx.dom.tsukihimeEntriesList.appendChild(li);
+    });
+  }
+
+  function renderFiles(): void {
+    ctx.dom.tsukihimeFilesList.innerHTML = '';
+    const visibleFiles = getVisibleFiles();
+    if (visibleFiles.length === 0) {
+      ctx.dom.tsukihimeFilesSection.classList.add('hidden');
+      return;
+    }
+
+    ctx.dom.tsukihimeFilesSection.classList.remove('hidden');
+    visibleFiles.forEach((file, index) => {
+      const li = document.createElement('li');
+      li.textContent = file.filename;
+
+      const details: string[] = [];
+      if (file.lang) details.push(file.lang);
+      if (file.trackName) details.push(file.trackName);
+      // TsukiHime does not report attachment sizes; skip a meaningless "0 B".
+      if (file.size > 0) details.push(formatBytes(file.size));
+      const sub = document.createElement('div');
+      sub.className = 'jimaku-subtext';
+      sub.textContent = details.filter(Boolean).join(' • ');
+      li.appendChild(sub);
+
+      if (index === ctx.state.selectedTsukihimeFileIndex) {
+        li.classList.add('active');
+      }
+
+      li.addEventListener('click', () => {
+        void selectFile(index);
+      });
+
+      ctx.dom.tsukihimeFilesList.appendChild(li);
+    });
+  }
+
+  function getSearchQuery(): string {
+    const title = ctx.dom.tsukihimeTitleInput.value.trim();
+    if (!title) return '';
+    const episodeValue = ctx.dom.tsukihimeEpisodeInput.value
+      ? Number.parseInt(ctx.dom.tsukihimeEpisodeInput.value, 10)
+      : null;
+    if (episodeValue !== null && Number.isFinite(episodeValue)) {
+      return `${title} ${String(episodeValue).padStart(2, '0')}`;
+    }
+    return title;
+  }
+
+  async function performTsukihimeSearch(): Promise<void> {
+    const query = getSearchQuery();
+    if (!query) {
+      setTsukihimeStatus('Enter a title before searching.', true);
+      return;
+    }
+
+    resetTsukihimeLists();
+    setTsukihimeStatus('Searching TsukiHime...');
+
+    const response: TsukihimeApiResponse<TsukihimeEntry[]> =
+      await window.electronAPI.tsukihimeSearchEntries({ query });
+    if (!response.ok) {
+      setTsukihimeStatus(response.error.error, true);
+      return;
+    }
+
+    ctx.state.tsukihimeEntries = response.data;
+    ctx.state.selectedTsukihimeEntryIndex = 0;
+
+    if (ctx.state.tsukihimeEntries.length === 0) {
+      setTsukihimeStatus('No releases found.');
+      return;
+    }
+
+    setTsukihimeStatus('Select a release.');
+    renderEntries();
+    if (ctx.state.tsukihimeEntries.length === 1) {
+      selectEntry(0);
+    }
+  }
+
+  async function loadFiles(entryId: number): Promise<void> {
+    setTsukihimeStatus('Loading subtitle tracks...');
+    ctx.state.tsukihimeFiles = [];
+    ctx.state.selectedTsukihimeFileIndex = 0;
+
+    ctx.dom.tsukihimeFilesList.innerHTML = '';
+    ctx.dom.tsukihimeFilesSection.classList.add('hidden');
+
+    const response: TsukihimeApiResponse<TsukihimeSubtitleFile[]> =
+      await window.electronAPI.tsukihimeListFiles({ entryId });
+    // The user may have picked another release while this was in flight.
+    if (ctx.state.currentTsukihimeEntryId !== entryId) return;
+    if (!response.ok) {
+      setTsukihimeStatus(response.error.error, true);
+      return;
+    }
+
+    ctx.state.tsukihimeFiles = response.data;
+    if (ctx.state.tsukihimeFiles.length === 0) {
+      const entry = ctx.state.tsukihimeEntries.find((candidate) => candidate.id === entryId);
+      // The feed API omits per-file attachment data for multi-file torrents.
+      if (entry && entry.numFiles !== null && entry.numFiles > 1) {
+        setTsukihimeStatus(
+          'Batch releases are not supported. Pick a single-episode release instead.',
+        );
+      } else {
+        setTsukihimeStatus('No text subtitle tracks in this release. Try another one.');
+      }
+      return;
+    }
+
+    const visibleFiles = getVisibleFiles();
+    if (visibleFiles.length === 0) {
+      setTsukihimeStatus(describeEmptyTab());
+      return;
+    }
+
+    setTsukihimeStatus('Select a subtitle track.');
+    renderFiles();
+    if (visibleFiles.length === 1) {
+      await selectFile(0);
+    }
+  }
+
+  function selectEntry(index: number): void {
+    if (index < 0 || index >= ctx.state.tsukihimeEntries.length) return;
+
+    ctx.state.selectedTsukihimeEntryIndex = index;
+    ctx.state.currentTsukihimeEntryId = ctx.state.tsukihimeEntries[index]!.id;
+    renderEntries();
+
+    if (ctx.state.currentTsukihimeEntryId !== null) {
+      void loadFiles(ctx.state.currentTsukihimeEntryId);
+    }
+  }
+
+  async function selectFile(index: number): Promise<void> {
+    const visibleFiles = getVisibleFiles();
+    if (index < 0 || index >= visibleFiles.length) return;
+
+    ctx.state.selectedTsukihimeFileIndex = index;
+    renderFiles();
+
+    if (ctx.state.currentTsukihimeEntryId === null) {
+      setTsukihimeStatus('Select a release first.', true);
+      return;
+    }
+
+    const entryId = ctx.state.currentTsukihimeEntryId;
+    const file = visibleFiles[index]!;
+    const downloadToken = ++activeDownloadToken;
+    setTsukihimeStatus('Downloading subtitle...');
+
+    const result: TsukihimeDownloadResult = await window.electronAPI.tsukihimeDownloadFile({
+      entryId,
+      url: file.url,
+      name: file.filename,
+      lang: file.lang,
+    });
+    if (downloadToken !== activeDownloadToken || ctx.state.currentTsukihimeEntryId !== entryId) {
+      return;
+    }
+
+    if (result.ok) {
+      setTsukihimeStatus(`Downloaded and loaded: ${result.path}`);
+      closeTsukihimeModal();
+      return;
+    }
+
+    setTsukihimeStatus(result.error.error, true);
+  }
+
+  function isTextInputFocused(): boolean {
+    const active = document.activeElement;
+    if (!active) return false;
+    const tag = active.tagName.toLowerCase();
+    return tag === 'input' || tag === 'textarea';
+  }
+
+  async function loadSecondaryLanguages(): Promise<void> {
+    try {
+      const configuredSecondary = await window.electronAPI.tsukihimeGetSecondaryLanguages();
+      secondaryLanguages = configuredSecondary.length > 0 ? configuredSecondary : ['en'];
+    } catch {
+      secondaryLanguages = ['en'];
+    }
+    ctx.dom.tsukihimeTabSecondaryButton.textContent = secondaryTabLabel();
+    ctx.dom.tsukihimeTabPrimaryButton.textContent = 'Japanese';
+    // Tracks may already be on screen if the languages arrived late.
+    if (ctx.state.tsukihimeFiles.length > 0) {
+      renderFiles();
+    }
+  }
+
+  function openTsukihimeModal(): void {
+    if (ctx.state.tsukihimeModalOpen) return;
+
+    ctx.state.tsukihimeModalOpen = true;
+    ctx.state.tsukihimeActiveTab = 'secondary';
+    options.syncSettingsModalSubtitleSuppression();
+    ctx.dom.overlay.classList.add('interactive');
+    ctx.dom.tsukihimeModal.classList.remove('hidden');
+    ctx.dom.tsukihimeModal.setAttribute('aria-hidden', 'false');
+
+    setTsukihimeStatus('Loading media info...');
+    resetTsukihimeLists();
+    renderTabs();
+
+    const secondaryLanguagesReady = loadSecondaryLanguages();
+
+    window.electronAPI
+      .getJimakuMediaInfo()
+      .then(async (info: JimakuMediaInfo) => {
+        ctx.dom.tsukihimeTitleInput.value = info.title || '';
+        ctx.dom.tsukihimeEpisodeInput.value = info.episode ? String(info.episode) : '';
+
+        if (info.confidence === 'high' && info.title && info.episode) {
+          await secondaryLanguagesReady;
+          void performTsukihimeSearch();
+        } else if (info.title) {
+          setTsukihimeStatus('Check title/episode and press Search.');
+        } else {
+          setTsukihimeStatus('Enter title/episode and press Search.');
+        }
+      })
+      .catch(() => {
+        setTsukihimeStatus('Failed to load media info.', true);
+      });
+  }
+
+  function closeTsukihimeModal(): void {
+    if (!ctx.state.tsukihimeModalOpen) return;
+
+    activeDownloadToken += 1;
+    ctx.state.tsukihimeModalOpen = false;
+    options.syncSettingsModalSubtitleSuppression();
+    ctx.dom.tsukihimeModal.classList.add('hidden');
+    ctx.dom.tsukihimeModal.setAttribute('aria-hidden', 'true');
+    window.electronAPI.notifyOverlayModalClosed('tsukihime');
+
+    if (!ctx.state.isOverSubtitle && !options.modalStateReader.isAnyModalOpen()) {
+      ctx.dom.overlay.classList.remove('interactive');
+    }
+
+    resetTsukihimeLists();
+  }
+
+  function handleTsukihimeKeydown(e: KeyboardEvent): boolean {
+    if (e.key === 'Escape') {
+      e.preventDefault();
+      closeTsukihimeModal();
+      return true;
+    }
+
+    if (isTextInputFocused()) {
+      if (e.key === 'Enter') {
+        e.preventDefault();
+        void performTsukihimeSearch();
+      }
+      return true;
+    }
+
+    if (e.key === 'ArrowLeft') {
+      e.preventDefault();
+      setActiveTab('secondary');
+      return true;
+    }
+
+    if (e.key === 'ArrowRight') {
+      e.preventDefault();
+      setActiveTab('primary');
+      return true;
+    }
+
+    if (e.key === 'ArrowDown') {
+      e.preventDefault();
+      const visibleFiles = getVisibleFiles();
+      if (visibleFiles.length > 0) {
+        ctx.state.selectedTsukihimeFileIndex = Math.min(
+          visibleFiles.length - 1,
+          ctx.state.selectedTsukihimeFileIndex + 1,
+        );
+        renderFiles();
+      } else if (ctx.state.tsukihimeEntries.length > 0) {
+        ctx.state.selectedTsukihimeEntryIndex = Math.min(
+          ctx.state.tsukihimeEntries.length - 1,
+          ctx.state.selectedTsukihimeEntryIndex + 1,
+        );
+        renderEntries();
+      }
+      return true;
+    }
+
+    if (e.key === 'ArrowUp') {
+      e.preventDefault();
+      if (getVisibleFiles().length > 0) {
+        ctx.state.selectedTsukihimeFileIndex = Math.max(
+          0,
+          ctx.state.selectedTsukihimeFileIndex - 1,
+        );
+        renderFiles();
+      } else if (ctx.state.tsukihimeEntries.length > 0) {
+        ctx.state.selectedTsukihimeEntryIndex = Math.max(
+          0,
+          ctx.state.selectedTsukihimeEntryIndex - 1,
+        );
+        renderEntries();
+      }
+      return true;
+    }
+
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      if (getVisibleFiles().length > 0) {
+        void selectFile(ctx.state.selectedTsukihimeFileIndex);
+      } else if (ctx.state.tsukihimeEntries.length > 0) {
+        selectEntry(ctx.state.selectedTsukihimeEntryIndex);
+      } else {
+        void performTsukihimeSearch();
+      }
+      return true;
+    }
+
+    return true;
+  }
+
+  function wireDomEvents(): void {
+    ctx.dom.tsukihimeSearchButton.addEventListener('click', () => {
+      void performTsukihimeSearch();
+    });
+    ctx.dom.tsukihimeCloseButton.addEventListener('click', () => {
+      closeTsukihimeModal();
+    });
+    ctx.dom.tsukihimeTabSecondaryButton.addEventListener('click', () => {
+      setActiveTab('secondary');
+    });
+    ctx.dom.tsukihimeTabPrimaryButton.addEventListener('click', () => {
+      setActiveTab('primary');
+    });
+  }
+
+  return {
+    closeTsukihimeModal,
+    handleTsukihimeKeydown,
+    openTsukihimeModal,
+    selectTsukihimeEntry: selectEntry,
+    wireDomEvents,
+  };
+}
diff --git a/src/renderer/renderer.ts b/src/renderer/renderer.ts
index 756854a4..859564d3 100644
--- a/src/renderer/renderer.ts
+++ b/src/renderer/renderer.ts
@@ -33,7 +33,7 @@ import { createControllerStatusIndicator } from './controller-status-indicator.j
 import { createControllerDebugModal } from './modals/controller-debug.js';
 import { createControllerSelectModal } from './modals/controller-select.js';
 import { createJimakuModal } from './modals/jimaku.js';
-import { createAnimetoshoModal } from './modals/animetosho.js';
+import { createTsukihimeModal } from './modals/tsukihime.js';
 import { createKikuModal } from './modals/kiku.js';
 import { prepareForKikuFieldGroupingOpen } from './kiku-open.js';
 import { createPlaylistBrowserModal } from './modals/playlist-browser.js';
@@ -102,9 +102,9 @@ const modalDescriptors = [
     suppressesSubtitles: true,
   },
   {
-    id: 'animetosho',
-    isOpen: () => ctx.state.animetoshoModalOpen,
-    close: () => animetoshoModal.closeAnimetoshoModal(),
+    id: 'tsukihime',
+    isOpen: () => ctx.state.tsukihimeModalOpen,
+    close: () => tsukihimeModal.closeTsukihimeModal(),
     suppressesSubtitles: false,
   },
   {
@@ -229,7 +229,7 @@ const jimakuModal = createJimakuModal(ctx, {
   modalStateReader: { isAnyModalOpen },
   syncSettingsModalSubtitleSuppression,
 });
-const animetoshoModal = createAnimetoshoModal(ctx, {
+const tsukihimeModal = createTsukihimeModal(ctx, {
   modalStateReader: { isAnyModalOpen },
   syncSettingsModalSubtitleSuppression,
 });
@@ -260,7 +260,7 @@ const keyboardHandlers = createKeyboardHandlers(ctx, {
   handleSubsyncKeydown: subsyncModal.handleSubsyncKeydown,
   handleKikuKeydown: kikuModal.handleKikuKeydown,
   handleJimakuKeydown: jimakuModal.handleJimakuKeydown,
-  handleAnimetoshoKeydown: animetoshoModal.handleAnimetoshoKeydown,
+  handleTsukihimeKeydown: tsukihimeModal.handleTsukihimeKeydown,
   handleYoutubePickerKeydown: youtubePickerModal.handleYoutubePickerKeydown,
   handlePlaylistBrowserKeydown: playlistBrowserModal.handlePlaylistBrowserKeydown,
   handleControllerSelectKeydown: controllerSelectModal.handleControllerSelectKeydown,
@@ -545,10 +545,10 @@ function registerModalOpenHandlers(): void {
       window.electronAPI.notifyOverlayModalOpened('jimaku');
     });
   });
-  window.electronAPI.onOpenAnimetosho(() => {
-    runGuarded('animetosho:open', () => {
-      animetoshoModal.openAnimetoshoModal();
-      window.electronAPI.notifyOverlayModalOpened('animetosho');
+  window.electronAPI.onOpenTsukihime(() => {
+    runGuarded('tsukihime:open', () => {
+      tsukihimeModal.openTsukihimeModal();
+      window.electronAPI.notifyOverlayModalOpened('tsukihime');
     });
   });
   window.electronAPI.onOpenYoutubeTrackPicker((payload) => {
@@ -785,7 +785,7 @@ async function init(): Promise<void> {
   });
 
   jimakuModal.wireDomEvents();
-  animetoshoModal.wireDomEvents();
+  tsukihimeModal.wireDomEvents();
   youtubePickerModal.wireDomEvents();
   playlistBrowserModal.wireDomEvents();
   kikuModal.wireDomEvents();
diff --git a/src/renderer/state.ts b/src/renderer/state.ts
index ae97a10f..e87cbcf3 100644
--- a/src/renderer/state.ts
+++ b/src/renderer/state.ts
@@ -4,8 +4,8 @@ import type {
   ControllerButtonSnapshot,
   ControllerDeviceInfo,
   ResolvedControllerConfig,
-  AnimetoshoEntry,
-  AnimetoshoSubtitleFile,
+  TsukihimeEntry,
+  TsukihimeSubtitleFile,
   JimakuEntry,
   JimakuFileEntry,
   KikuDuplicateCardInfo,
@@ -50,13 +50,13 @@ export type RendererState = {
   currentEpisodeFilter: number | null;
   currentEntryId: number | null;
 
-  animetoshoModalOpen: boolean;
-  animetoshoActiveTab: 'en' | 'ja';
-  animetoshoEntries: AnimetoshoEntry[];
-  animetoshoFiles: AnimetoshoSubtitleFile[];
-  selectedAnimetoshoEntryIndex: number;
-  selectedAnimetoshoFileIndex: number;
-  currentAnimetoshoEntryId: number | null;
+  tsukihimeModalOpen: boolean;
+  tsukihimeActiveTab: 'secondary' | 'primary';
+  tsukihimeEntries: TsukihimeEntry[];
+  tsukihimeFiles: TsukihimeSubtitleFile[];
+  selectedTsukihimeEntryIndex: number;
+  selectedTsukihimeFileIndex: number;
+  currentTsukihimeEntryId: number | null;
 
   youtubePickerModalOpen: boolean;
   youtubePickerPayload: YoutubePickerOpenPayload | null;
@@ -174,13 +174,13 @@ export function createRendererState(): RendererState {
     currentEpisodeFilter: null,
     currentEntryId: null,
 
-    animetoshoModalOpen: false,
-    animetoshoActiveTab: 'en',
-    animetoshoEntries: [],
-    animetoshoFiles: [],
-    selectedAnimetoshoEntryIndex: 0,
-    selectedAnimetoshoFileIndex: 0,
-    currentAnimetoshoEntryId: null,
+    tsukihimeModalOpen: false,
+    tsukihimeActiveTab: 'secondary',
+    tsukihimeEntries: [],
+    tsukihimeFiles: [],
+    selectedTsukihimeEntryIndex: 0,
+    selectedTsukihimeFileIndex: 0,
+    currentTsukihimeEntryId: null,
 
     youtubePickerModalOpen: false,
     youtubePickerPayload: null,
diff --git a/src/renderer/style.css b/src/renderer/style.css
index 4c9d1212..703ef775 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -811,21 +811,21 @@ body:focus-visible,
   z-index: 1100;
 }
 
-#animetoshoModal {
+#tsukihimeModal {
   z-index: 1100;
 }
 
-#animetoshoModal .jimaku-form {
+#tsukihimeModal .jimaku-form {
   grid-template-columns: 1fr 120px auto;
 }
 
-.animetosho-tabs {
+.tsukihime-tabs {
   display: grid;
   grid-template-columns: repeat(2, minmax(0, 1fr));
   gap: 6px;
 }
 
-.animetosho-tab {
+.tsukihime-tab {
   min-width: 0;
   min-height: 34px;
   padding: 7px 8px;
@@ -842,14 +842,14 @@ body:focus-visible,
   text-overflow: ellipsis;
 }
 
-.animetosho-tab:hover,
-.animetosho-tab:focus-visible {
+.tsukihime-tab:hover,
+.tsukihime-tab:focus-visible {
   border-color: rgba(138, 173, 244, 0.48);
   color: var(--ctp-text);
   outline: none;
 }
 
-.animetosho-tab.active {
+.tsukihime-tab.active {
   border-color: rgba(238, 212, 159, 0.62);
   background: rgba(238, 212, 159, 0.16);
   color: var(--ctp-yellow);
diff --git a/src/renderer/utils/dom.ts b/src/renderer/utils/dom.ts
index 36cd1ae8..16c560b2 100644
--- a/src/renderer/utils/dom.ts
+++ b/src/renderer/utils/dom.ts
@@ -22,18 +22,18 @@ export type RendererDom = {
   jimakuFilesList: HTMLUListElement;
   jimakuBroadenButton: HTMLButtonElement;
 
-  animetoshoModal: HTMLDivElement;
-  animetoshoTitleInput: HTMLInputElement;
-  animetoshoEpisodeInput: HTMLInputElement;
-  animetoshoSearchButton: HTMLButtonElement;
-  animetoshoCloseButton: HTMLButtonElement;
-  animetoshoTabEnglishButton: HTMLButtonElement;
-  animetoshoTabJapaneseButton: HTMLButtonElement;
-  animetoshoStatus: HTMLDivElement;
-  animetoshoEntriesSection: HTMLDivElement;
-  animetoshoEntriesList: HTMLUListElement;
-  animetoshoFilesSection: HTMLDivElement;
-  animetoshoFilesList: HTMLUListElement;
+  tsukihimeModal: HTMLDivElement;
+  tsukihimeTitleInput: HTMLInputElement;
+  tsukihimeEpisodeInput: HTMLInputElement;
+  tsukihimeSearchButton: HTMLButtonElement;
+  tsukihimeCloseButton: HTMLButtonElement;
+  tsukihimeTabSecondaryButton: HTMLButtonElement;
+  tsukihimeTabPrimaryButton: HTMLButtonElement;
+  tsukihimeStatus: HTMLDivElement;
+  tsukihimeEntriesSection: HTMLDivElement;
+  tsukihimeEntriesList: HTMLUListElement;
+  tsukihimeFilesSection: HTMLDivElement;
+  tsukihimeFilesList: HTMLUListElement;
 
   youtubePickerModal: HTMLDivElement;
   youtubePickerTitle: HTMLDivElement;
@@ -167,18 +167,18 @@ export function resolveRendererDom(): RendererDom {
     jimakuFilesList: getRequiredElement<HTMLUListElement>('jimakuFiles'),
     jimakuBroadenButton: getRequiredElement<HTMLButtonElement>('jimakuBroaden'),
 
-    animetoshoModal: getRequiredElement<HTMLDivElement>('animetoshoModal'),
-    animetoshoTitleInput: getRequiredElement<HTMLInputElement>('animetoshoTitle'),
-    animetoshoEpisodeInput: getRequiredElement<HTMLInputElement>('animetoshoEpisode'),
-    animetoshoSearchButton: getRequiredElement<HTMLButtonElement>('animetoshoSearch'),
-    animetoshoCloseButton: getRequiredElement<HTMLButtonElement>('animetoshoClose'),
-    animetoshoTabEnglishButton: getRequiredElement<HTMLButtonElement>('animetoshoTabEnglish'),
-    animetoshoTabJapaneseButton: getRequiredElement<HTMLButtonElement>('animetoshoTabJapanese'),
-    animetoshoStatus: getRequiredElement<HTMLDivElement>('animetoshoStatus'),
-    animetoshoEntriesSection: getRequiredElement<HTMLDivElement>('animetoshoEntriesSection'),
-    animetoshoEntriesList: getRequiredElement<HTMLUListElement>('animetoshoEntries'),
-    animetoshoFilesSection: getRequiredElement<HTMLDivElement>('animetoshoFilesSection'),
-    animetoshoFilesList: getRequiredElement<HTMLUListElement>('animetoshoFiles'),
+    tsukihimeModal: getRequiredElement<HTMLDivElement>('tsukihimeModal'),
+    tsukihimeTitleInput: getRequiredElement<HTMLInputElement>('tsukihimeTitle'),
+    tsukihimeEpisodeInput: getRequiredElement<HTMLInputElement>('tsukihimeEpisode'),
+    tsukihimeSearchButton: getRequiredElement<HTMLButtonElement>('tsukihimeSearch'),
+    tsukihimeCloseButton: getRequiredElement<HTMLButtonElement>('tsukihimeClose'),
+    tsukihimeTabSecondaryButton: getRequiredElement<HTMLButtonElement>('tsukihimeTabSecondary'),
+    tsukihimeTabPrimaryButton: getRequiredElement<HTMLButtonElement>('tsukihimeTabPrimary'),
+    tsukihimeStatus: getRequiredElement<HTMLDivElement>('tsukihimeStatus'),
+    tsukihimeEntriesSection: getRequiredElement<HTMLDivElement>('tsukihimeEntriesSection'),
+    tsukihimeEntriesList: getRequiredElement<HTMLUListElement>('tsukihimeEntries'),
+    tsukihimeFilesSection: getRequiredElement<HTMLDivElement>('tsukihimeFilesSection'),
+    tsukihimeFilesList: getRequiredElement<HTMLUListElement>('tsukihimeFiles'),
 
     youtubePickerModal: getRequiredElement<HTMLDivElement>('youtubePickerModal'),
     youtubePickerTitle: getRequiredElement<HTMLDivElement>('youtubePickerTitle'),
diff --git a/src/shared/ipc/contracts.ts b/src/shared/ipc/contracts.ts
index c4ef8d20..0282fe9c 100644
--- a/src/shared/ipc/contracts.ts
+++ b/src/shared/ipc/contracts.ts
@@ -5,7 +5,7 @@ export const OVERLAY_HOSTED_MODALS = [
   'runtime-options',
   'subsync',
   'jimaku',
-  'animetosho',
+  'tsukihime',
   'youtube-track-picker',
   'playlist-browser',
   'kiku',
@@ -96,10 +96,10 @@ export const IPC_CHANNELS = {
     jimakuSearchEntries: 'jimaku:search-entries',
     jimakuListFiles: 'jimaku:list-files',
     jimakuDownloadFile: 'jimaku:download-file',
-    animetoshoSearchEntries: 'animetosho:search-entries',
-    animetoshoListFiles: 'animetosho:list-files',
-    animetoshoDownloadFile: 'animetosho:download-file',
-    animetoshoGetSecondaryLanguages: 'animetosho:get-secondary-languages',
+    tsukihimeSearchEntries: 'tsukihime:search-entries',
+    tsukihimeListFiles: 'tsukihime:list-files',
+    tsukihimeDownloadFile: 'tsukihime:download-file',
+    tsukihimeGetSecondaryLanguages: 'tsukihime:get-secondary-languages',
     kikuBuildMergePreview: 'kiku:build-merge-preview',
     getConfigSettingsSnapshot: 'config:get-settings-snapshot',
     saveConfigSettingsPatch: 'config:save-settings-patch',
@@ -138,7 +138,7 @@ export const IPC_CHANNELS = {
     runtimeOptionsChanged: 'runtime-options:changed',
     runtimeOptionsOpen: 'runtime-options:open',
     jimakuOpen: 'jimaku:open',
-    animetoshoOpen: 'animetosho:open',
+    tsukihimeOpen: 'tsukihime:open',
     youtubePickerOpen: 'youtube:picker-open',
     youtubePickerCancel: 'youtube:picker-cancel',
     playlistBrowserOpen: 'playlist-browser:open',
diff --git a/src/shared/ipc/validators.ts b/src/shared/ipc/validators.ts
index cb433dea..bcdc25ce 100644
--- a/src/shared/ipc/validators.ts
+++ b/src/shared/ipc/validators.ts
@@ -1,8 +1,8 @@
 import type { KikuFieldGroupingChoice, KikuMergePreviewRequest } from '../../types/anki';
 import type {
-  AnimetoshoDownloadQuery,
-  AnimetoshoFilesQuery,
-  AnimetoshoSearchQuery,
+  TsukihimeDownloadQuery,
+  TsukihimeFilesQuery,
+  TsukihimeSearchQuery,
   JimakuDownloadQuery,
   JimakuFilesQuery,
   JimakuSearchQuery,
@@ -43,7 +43,7 @@ const SESSION_ACTION_IDS: SessionActionId[] = [
   'openControllerSelect',
   'openControllerDebug',
   'openJimaku',
-  'openAnimetosho',
+  'openTsukihime',
   'openYoutubePicker',
   'openPlaylistBrowser',
   'replayCurrentSubtitle',
@@ -406,17 +406,17 @@ export function parseJimakuDownloadQuery(value: unknown): JimakuDownloadQuery |
   };
 }
 
-export function parseAnimetoshoSearchQuery(value: unknown): AnimetoshoSearchQuery | null {
+export function parseTsukihimeSearchQuery(value: unknown): TsukihimeSearchQuery | null {
   if (!isObject(value) || typeof value.query !== 'string') return null;
   return { query: value.query };
 }
 
-export function parseAnimetoshoFilesQuery(value: unknown): AnimetoshoFilesQuery | null {
+export function parseTsukihimeFilesQuery(value: unknown): TsukihimeFilesQuery | null {
   if (!isObject(value) || !isInteger(value.entryId)) return null;
   return { entryId: value.entryId };
 }
 
-export function parseAnimetoshoDownloadQuery(value: unknown): AnimetoshoDownloadQuery | null {
+export function parseTsukihimeDownloadQuery(value: unknown): TsukihimeDownloadQuery | null {
   if (!isObject(value)) return null;
   if (
     !isInteger(value.entryId) ||
diff --git a/src/animetosho/fetch-limits.test.ts b/src/tsukihime/fetch-limits.test.ts
similarity index 70%
rename from src/animetosho/fetch-limits.test.ts
rename to src/tsukihime/fetch-limits.test.ts
index 1dfaf63b..28f4f5c4 100644
--- a/src/animetosho/fetch-limits.test.ts
+++ b/src/tsukihime/fetch-limits.test.ts
@@ -3,7 +3,7 @@ import test from 'node:test';
 import * as http from 'node:http';
 import type { AddressInfo } from 'node:net';
 
-import { animetoshoFetchJson } from './utils.js';
+import { tsukihimeFetchJson } from './utils.js';
 
 interface TestServer {
   baseUrl: string;
@@ -27,7 +27,7 @@ function startServer(handler: http.RequestListener): Promise<TestServer> {
   });
 }
 
-test('animetoshoFetchJson gives up on a hanging response', async () => {
+test('tsukihimeFetchJson gives up on a hanging response', async () => {
   const server = await startServer((_req, res) => {
     res.writeHead(200, { 'Content-Type': 'application/json' });
     // Never end the response.
@@ -35,7 +35,7 @@ test('animetoshoFetchJson gives up on a hanging response', async () => {
   });
 
   try {
-    const result = await animetoshoFetchJson(
+    const result = await tsukihimeFetchJson(
       '/json',
       {},
       { baseUrl: server.baseUrl, timeoutMs: 150 },
@@ -49,14 +49,14 @@ test('animetoshoFetchJson gives up on a hanging response', async () => {
   }
 });
 
-test('animetoshoFetchJson rejects an oversized response', async () => {
+test('tsukihimeFetchJson rejects an oversized response', async () => {
   const server = await startServer((_req, res) => {
     res.writeHead(200, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify(Array.from({ length: 2000 }, (_, index) => ({ id: index }))));
   });
 
   try {
-    const result = await animetoshoFetchJson(
+    const result = await tsukihimeFetchJson(
       '/json',
       {},
       { baseUrl: server.baseUrl, maxResponseBytes: 512 },
@@ -70,7 +70,7 @@ test('animetoshoFetchJson rejects an oversized response', async () => {
   }
 });
 
-test('animetoshoFetchJson decodes multi-byte characters split across chunks', async () => {
+test('tsukihimeFetchJson decodes multi-byte characters split across chunks', async () => {
   const title = '葬送のフリーレン';
   const body = Buffer.from(JSON.stringify([{ id: 1, title }]), 'utf8');
   // Split inside the first Japanese character's 3-byte UTF-8 sequence.
@@ -83,7 +83,7 @@ test('animetoshoFetchJson decodes multi-byte characters split across chunks', as
   });
 
   try {
-    const result = await animetoshoFetchJson<Array<{ id: number; title: string }>>(
+    const result = await tsukihimeFetchJson<Array<{ id: number; title: string }>>(
       '/json',
       {},
       { baseUrl: server.baseUrl },
@@ -97,14 +97,14 @@ test('animetoshoFetchJson decodes multi-byte characters split across chunks', as
   }
 });
 
-test('animetoshoFetchJson still parses a normal response', async () => {
+test('tsukihimeFetchJson still parses a normal response', async () => {
   const server = await startServer((_req, res) => {
     res.writeHead(200, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify([{ id: 1, title: 'ok' }]));
   });
 
   try {
-    const result = await animetoshoFetchJson<Array<{ id: number }>>(
+    const result = await tsukihimeFetchJson<Array<{ id: number }>>(
       '/json',
       { q: 'x' },
       { baseUrl: server.baseUrl },
@@ -117,3 +117,19 @@ test('animetoshoFetchJson still parses a normal response', async () => {
     await server.close();
   }
 });
+
+test('tsukihimeFetchJson reports a structured error for a malformed base URL', async () => {
+  const result = await tsukihimeFetchJson('/search/torrents', {}, { baseUrl: 'not a url' });
+  assert.equal(result.ok, false);
+  if (!result.ok) {
+    assert.match(result.error.error, /base url/i);
+  }
+});
+
+test('tsukihimeFetchJson rejects non-HTTP(S) base URLs', async () => {
+  const result = await tsukihimeFetchJson('/search/torrents', {}, { baseUrl: 'file:///etc' });
+  assert.equal(result.ok, false);
+  if (!result.ok) {
+    assert.match(result.error.error, /http/i);
+  }
+});
diff --git a/src/tsukihime/lang.test.ts b/src/tsukihime/lang.test.ts
new file mode 100644
index 00000000..e86b3480
--- /dev/null
+++ b/src/tsukihime/lang.test.ts
@@ -0,0 +1,45 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import {
+  tsukihimeLangToFilenameSuffix,
+  tsukihimeTrackMatchesLanguages,
+  describeTsukihimeTabLanguages,
+  normalizeTsukihimeLangCode,
+} from './lang.js';
+
+test('normalizeTsukihimeLangCode collapses 2/3-letter and region variants', () => {
+  assert.equal(normalizeTsukihimeLangCode('eng'), 'en');
+  assert.equal(normalizeTsukihimeLangCode('en'), 'en');
+  assert.equal(normalizeTsukihimeLangCode('en-US'), 'en');
+  assert.equal(normalizeTsukihimeLangCode('GER'), 'de');
+  assert.equal(normalizeTsukihimeLangCode('jpn'), 'ja');
+  assert.equal(normalizeTsukihimeLangCode('vie'), 'vie');
+  assert.equal(normalizeTsukihimeLangCode(''), '');
+});
+
+test('tsukihimeTrackMatchesLanguages matches across code forms', () => {
+  assert.equal(tsukihimeTrackMatchesLanguages('eng', ['en']), true);
+  assert.equal(tsukihimeTrackMatchesLanguages('eng', ['en', 'eng']), true);
+  assert.equal(tsukihimeTrackMatchesLanguages('ger', ['de']), true);
+  assert.equal(tsukihimeTrackMatchesLanguages('por', ['en']), false);
+  assert.equal(tsukihimeTrackMatchesLanguages('spa', ['en', 'de']), false);
+});
+
+test('tsukihimeTrackMatchesLanguages keeps unknown-language tracks visible', () => {
+  assert.equal(tsukihimeTrackMatchesLanguages('', ['en']), true);
+  assert.equal(tsukihimeTrackMatchesLanguages('und', ['en']), true);
+});
+
+test('describeTsukihimeTabLanguages names common languages and dedupes', () => {
+  assert.equal(describeTsukihimeTabLanguages(['en', 'eng']), 'English');
+  assert.equal(describeTsukihimeTabLanguages(['de']), 'German');
+  assert.equal(describeTsukihimeTabLanguages(['en', 'de']), 'English / German');
+  assert.equal(describeTsukihimeTabLanguages(['vie']), 'VIE');
+  assert.equal(describeTsukihimeTabLanguages([]), 'English');
+});
+
+test('tsukihimeLangToFilenameSuffix is re-exported from the pure module', () => {
+  assert.equal(tsukihimeLangToFilenameSuffix('jpn'), 'ja');
+  assert.equal(tsukihimeLangToFilenameSuffix('eng'), 'en');
+});
diff --git a/src/animetosho/lang.ts b/src/tsukihime/lang.ts
similarity index 67%
rename from src/animetosho/lang.ts
rename to src/tsukihime/lang.ts
index 7a16bc00..c13877b4 100644
--- a/src/animetosho/lang.ts
+++ b/src/tsukihime/lang.ts
@@ -1,4 +1,4 @@
-// Pure language-code helpers shared between the main-process Animetosho client
+// Pure language-code helpers shared between the main-process Tsukihime client
 // and the overlay renderer. Must stay free of node imports so the renderer
 // bundle can use it.
 
@@ -33,35 +33,35 @@ const LANG_DISPLAY_NAMES: Record<string, string> = {
   ko: 'Korean',
 };
 
-export function normalizeAnimetoshoLangCode(code: string): string {
+export function normalizeTsukihimeLangCode(code: string): string {
   const base = code.trim().toLowerCase().split(/[-_]/)[0] ?? '';
   return LANG_FILENAME_SUFFIXES[base] ?? base;
 }
 
-export function animetoshoLangToFilenameSuffix(lang: string | undefined): string {
-  const normalized = normalizeAnimetoshoLangCode(lang ?? '');
+export function tsukihimeLangToFilenameSuffix(lang: string | undefined): string {
+  const normalized = normalizeTsukihimeLangCode(lang ?? '');
   if (!normalized || normalized === 'und') return 'en';
   return normalized;
 }
 
-export function animetoshoTrackMatchesLanguages(
+export function tsukihimeTrackMatchesLanguages(
   trackLang: string,
   configuredLanguages: string[],
 ): boolean {
-  const normalizedTrack = normalizeAnimetoshoLangCode(trackLang);
+  const normalizedTrack = normalizeTsukihimeLangCode(trackLang);
   // Unlabeled tracks cannot be classified; keep them visible rather than
   // hiding them behind a tab that never shows them.
   if (!normalizedTrack || normalizedTrack === 'und') return true;
   return configuredLanguages.some(
-    (candidate) => normalizeAnimetoshoLangCode(candidate) === normalizedTrack,
+    (candidate) => normalizeTsukihimeLangCode(candidate) === normalizedTrack,
   );
 }
 
-export function describeAnimetoshoTabLanguages(configuredLanguages: string[]): string {
+export function describeTsukihimeTabLanguages(configuredLanguages: string[]): string {
   const normalized = [
     ...new Set(
       configuredLanguages
-        .map((candidate) => normalizeAnimetoshoLangCode(candidate))
+        .map((candidate) => normalizeTsukihimeLangCode(candidate))
         .filter(Boolean),
     ),
   ];
diff --git a/src/tsukihime/utils.test.ts b/src/tsukihime/utils.test.ts
new file mode 100644
index 00000000..8ff66026
--- /dev/null
+++ b/src/tsukihime/utils.test.ts
@@ -0,0 +1,349 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { execFileSync } from 'node:child_process';
+
+import {
+  tsukihimeLangToFilenameSuffix,
+  buildTsukihimeAttachmentUrl,
+  decompressXzFile,
+  extractTsukihimeSubtitleFiles,
+  isTsukihimeDownloadUrl,
+  mapTsukihimeSearchResults,
+} from './utils.js';
+
+test('buildTsukihimeAttachmentUrl pads the attachment id to 8 hex digits', () => {
+  assert.equal(
+    buildTsukihimeAttachmentUrl(96412),
+    'https://storage.tsukihime.org/attach/0001789c/96412.xz',
+  );
+});
+
+test('buildTsukihimeAttachmentUrl uses the tosho mirror path for imported entries', () => {
+  assert.equal(
+    buildTsukihimeAttachmentUrl(2826332, { imported: true }),
+    'https://storage.tsukihime.org/tosho/attach/002b205c/2826332.xz',
+  );
+});
+
+test('tsukihimeLangToFilenameSuffix maps common ISO 639-2 codes to two-letter suffixes', () => {
+  assert.equal(tsukihimeLangToFilenameSuffix('eng'), 'en');
+  assert.equal(tsukihimeLangToFilenameSuffix('jpn'), 'ja');
+  assert.equal(tsukihimeLangToFilenameSuffix('ger'), 'de');
+  assert.equal(tsukihimeLangToFilenameSuffix('spa'), 'es');
+  assert.equal(tsukihimeLangToFilenameSuffix('POR'), 'pt');
+});
+
+test('tsukihimeLangToFilenameSuffix handles TsukiHime BCP-47 style codes', () => {
+  assert.equal(tsukihimeLangToFilenameSuffix('en-US'), 'en');
+  assert.equal(tsukihimeLangToFilenameSuffix('es-419'), 'es');
+  assert.equal(tsukihimeLangToFilenameSuffix('zh-Hant'), 'zh');
+  assert.equal(tsukihimeLangToFilenameSuffix('ja'), 'ja');
+});
+
+test('tsukihimeLangToFilenameSuffix falls back to the raw code, and to en when unknown', () => {
+  assert.equal(tsukihimeLangToFilenameSuffix('vie'), 'vie');
+  assert.equal(tsukihimeLangToFilenameSuffix(''), 'en');
+  assert.equal(tsukihimeLangToFilenameSuffix(undefined), 'en');
+  assert.equal(tsukihimeLangToFilenameSuffix('und'), 'en');
+});
+
+test('buildTsukihimeAttachmentUrl rejects non-positive and non-integer ids', () => {
+  assert.equal(buildTsukihimeAttachmentUrl(0), null);
+  assert.equal(buildTsukihimeAttachmentUrl(-5), null);
+  assert.equal(buildTsukihimeAttachmentUrl(1.5), null);
+  assert.equal(buildTsukihimeAttachmentUrl(Number.NaN), null);
+});
+
+test('isTsukihimeDownloadUrl accepts tsukihime.org and animetosho.org hosts only', () => {
+  assert.equal(isTsukihimeDownloadUrl('https://storage.tsukihime.org/attach/0001789c/1.xz'), true);
+  assert.equal(isTsukihimeDownloadUrl('https://tsukihime.org/view/1'), true);
+  // The tosho mirror currently 302s to storage.animetosho.org; the hop must stay allowed.
+  assert.equal(
+    isTsukihimeDownloadUrl('https://storage.animetosho.org/attach/002b205c/2826332.xz'),
+    true,
+  );
+  assert.equal(isTsukihimeDownloadUrl('http://storage.tsukihime.org/attach/1/1.xz'), false);
+  assert.equal(isTsukihimeDownloadUrl('https://eviltsukihime.org/attach/1/1.xz'), false);
+  assert.equal(isTsukihimeDownloadUrl('https://example.com/1.xz'), false);
+  assert.equal(isTsukihimeDownloadUrl('not a url'), false);
+});
+
+test('mapTsukihimeSearchResults maps valid results and caps to maxResults', () => {
+  const payload = {
+    total: 4,
+    start: 0,
+    limit: 50,
+    error: false,
+    results: [
+      {
+        id: 1000752022,
+        state: 'completed',
+        name: '[SubsPlease] Sousou no Frieren S2 - 10 (1080p) [7D35515E].mkv',
+        totalsize: 1457009569,
+        filecount: 1,
+        sublangs: ['en'],
+        audiolangs: ['ja'],
+        source_date: 1774623761,
+        added_date: 1774624861,
+        animetosho: true,
+      },
+      { id: 'bogus', name: 'missing numeric id' },
+      { id: 12255, name: '[DKB] Futsutsuka na Akujo - S01E01 [Multi-Subs]' },
+      { id: 12256, name: 'capped away' },
+    ],
+  };
+
+  const entries = mapTsukihimeSearchResults(payload, 2);
+  assert.equal(entries.length, 2);
+  assert.deepEqual(entries[0], {
+    id: 1000752022,
+    title: '[SubsPlease] Sousou no Frieren S2 - 10 (1080p) [7D35515E].mkv',
+    timestamp: 1774624861,
+    totalSize: 1457009569,
+    numFiles: 1,
+    sublangs: ['en'],
+  });
+  assert.equal(entries[1]!.id, 12255);
+  assert.equal(entries[1]!.totalSize, null);
+  assert.equal(entries[1]!.numFiles, null);
+  assert.deepEqual(entries[1]!.sublangs, []);
+});
+
+test('mapTsukihimeSearchResults returns empty list for malformed payloads', () => {
+  assert.deepEqual(mapTsukihimeSearchResults({ error: 'nope' }, 10), []);
+  assert.deepEqual(mapTsukihimeSearchResults({ results: 'nope' }, 10), []);
+  assert.deepEqual(mapTsukihimeSearchResults(null, 10), []);
+  assert.deepEqual(mapTsukihimeSearchResults([], 10), []);
+});
+
+// Trimmed from a real /v1/torrents/{id} response (native entry).
+const DETAIL_PAYLOAD = {
+  id: 12255,
+  name: '[DKB] Futsutsuka na Akujo dewa Gozaimasu ga - S01E01 [Multi-Subs]',
+  files: [
+    {
+      id: 16179,
+      filename: '[DKB] Futsutsuka na Akujo dewa Gozaimasu ga - S01E01 [Multi-Subs].mkv',
+      attachments: [
+        {
+          id: 96400,
+          type: 0,
+          info: { name: 'arial.ttf', mime: 'application/x-truetype-font' },
+        },
+        {
+          id: 96412,
+          type: 1,
+          info: { codec: 'ASS', lang: 'en-US', name: 'English subs', trackid: 2, tracknum: 3 },
+        },
+        { id: 96499, type: 3 },
+      ],
+    },
+  ],
+};
+
+test('extractTsukihimeSubtitleFiles keeps only text subtitle attachments with download urls', () => {
+  const files = extractTsukihimeSubtitleFiles(DETAIL_PAYLOAD);
+  assert.equal(files.length, 1);
+  const file = files[0]!;
+  assert.equal(file.attachmentId, 96412);
+  assert.equal(file.lang, 'en-us');
+  assert.equal(file.trackName, 'English subs');
+  assert.equal(file.size, 0);
+  assert.equal(file.url, 'https://storage.tsukihime.org/attach/0001789c/96412.xz');
+  assert.equal(
+    file.sourceFilename,
+    '[DKB] Futsutsuka na Akujo dewa Gozaimasu ga - S01E01 [Multi-Subs].mkv',
+  );
+  assert.equal(
+    file.filename,
+    '[DKB] Futsutsuka na Akujo dewa Gozaimasu ga - S01E01 [Multi-Subs].en-us.ass',
+  );
+});
+
+test('extractTsukihimeSubtitleFiles uses the tosho mirror for animetosho-imported entries', () => {
+  const files = extractTsukihimeSubtitleFiles({
+    id: 1000752022,
+    animetosho: true,
+    files: [
+      {
+        id: 1001361385,
+        filename: '[SubsPlease] Sousou no Frieren S2 - 10 (1080p) [7D35515E].mkv',
+        attachments: [
+          { id: 2826332, type: 1, info: { codec: 'ASS', lang: 'en', name: 'English subs' } },
+        ],
+      },
+    ],
+  });
+  assert.equal(files.length, 1);
+  assert.equal(files[0]!.url, 'https://storage.tsukihime.org/tosho/attach/002b205c/2826332.xz');
+});
+
+test('extractTsukihimeSubtitleFiles detects imported entries by id when the flag is absent', () => {
+  const files = extractTsukihimeSubtitleFiles({
+    id: 1000752022,
+    files: [
+      {
+        id: 1001361385,
+        filename: 'episode.mkv',
+        attachments: [{ id: 2826332, type: 1, info: { codec: 'ASS', lang: 'en' } }],
+      },
+    ],
+  });
+  assert.equal(files[0]!.url, 'https://storage.tsukihime.org/tosho/attach/002b205c/2826332.xz');
+});
+
+test('extractTsukihimeSubtitleFiles skips image-based subtitle codecs', () => {
+  const files = extractTsukihimeSubtitleFiles({
+    id: 1,
+    files: [
+      {
+        id: 1,
+        filename: 'movie.mkv',
+        attachments: [
+          { id: 10, type: 1, info: { codec: 'PGS', lang: 'en' } },
+          { id: 11, type: 1, info: { codec: 'VobSub', lang: 'en' } },
+          { id: 12, type: 1, info: { codec: 'SRT', lang: 'en' } },
+        ],
+      },
+    ],
+  });
+  assert.deepEqual(
+    files.map((f) => f.attachmentId),
+    [12],
+  );
+  assert.equal(files[0]!.filename, 'movie.en.srt');
+});
+
+test('extractTsukihimeSubtitleFiles sorts English tracks first and disambiguates duplicates', () => {
+  const files = extractTsukihimeSubtitleFiles({
+    id: 1,
+    files: [
+      {
+        id: 1,
+        filename: 'episode.mkv',
+        attachments: [
+          { id: 21, type: 1, info: { codec: 'ASS', lang: 'de', name: 'Deutsch' } },
+          { id: 22, type: 1, info: { codec: 'ASS', lang: 'en', name: 'Signs & Songs' } },
+          { id: 23, type: 1, info: { codec: 'ASS', lang: 'en', name: 'Full Subtitles' } },
+        ],
+      },
+    ],
+  });
+
+  assert.deepEqual(
+    files.map((f) => f.attachmentId),
+    [22, 23, 21],
+  );
+  assert.equal(files[0]!.filename, 'episode.en.signs-songs.ass');
+  assert.equal(files[1]!.filename, 'episode.en.full-subtitles.ass');
+  assert.equal(files[2]!.filename, 'episode.de.ass');
+});
+
+test('extractTsukihimeSubtitleFiles tolerates missing info fields', () => {
+  const files = extractTsukihimeSubtitleFiles({
+    id: 1,
+    files: [
+      {
+        id: 1,
+        attachments: [{ id: 31, type: 1, info: { codec: 'ASS' } }],
+      },
+    ],
+  });
+  assert.equal(files.length, 1);
+  assert.equal(files[0]!.lang, '');
+  assert.equal(files[0]!.trackName, null);
+  assert.equal(files[0]!.filename, 'subtitle.ass');
+});
+
+const hasXz = (() => {
+  try {
+    execFileSync('xz', ['--version'], { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+})();
+
+test('decompressXzFile round-trips an xz-compressed subtitle', { skip: !hasXz }, async () => {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-tsukihime-test-'));
+  try {
+    const plainPath = path.join(dir, 'sub.ass');
+    const content = '[Script Info]\nTitle: test\n';
+    fs.writeFileSync(plainPath, content, 'utf8');
+    execFileSync('xz', ['-z', plainPath]);
+
+    const destPath = path.join(dir, 'out.ass');
+    const result = await decompressXzFile(`${plainPath}.xz`, destPath);
+    assert.equal(result.ok, true);
+    if (result.ok) {
+      assert.equal(result.path, destPath);
+    }
+    assert.equal(fs.readFileSync(destPath, 'utf8'), content);
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test('decompressXzFile reports an error for corrupt input', { skip: !hasXz }, async () => {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'subminer-tsukihime-test-'));
+  try {
+    const srcPath = path.join(dir, 'broken.xz');
+    fs.writeFileSync(srcPath, 'not xz data');
+    const result = await decompressXzFile(srcPath, path.join(dir, 'out.ass'));
+    assert.equal(result.ok, false);
+    if (!result.ok) {
+      assert.match(result.error.error, /xz|decompress/i);
+    }
+  } finally {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+});
+
+test('extractTsukihimeSubtitleFiles disambiguates duplicate tracks without slug characters', () => {
+  const files = extractTsukihimeSubtitleFiles({
+    id: 1,
+    files: [
+      {
+        id: 1,
+        filename: 'episode.mkv',
+        // Both names slugify to an empty string.
+        attachments: [
+          { id: 41, type: 1, info: { codec: 'ASS', lang: 'ja', name: '日本語字幕' } },
+          { id: 42, type: 1, info: { codec: 'ASS', lang: 'ja' } },
+        ],
+      },
+    ],
+  });
+
+  assert.equal(files.length, 2);
+  for (const file of files) {
+    assert.doesNotMatch(file.filename, /\.\./, `double dot in ${file.filename}`);
+  }
+  assert.notEqual(files[0]!.filename, files[1]!.filename);
+  assert.equal(files.find((f) => f.attachmentId === 41)!.filename, 'episode.ja.41.ass');
+  assert.equal(files.find((f) => f.attachmentId === 42)!.filename, 'episode.ja.42.ass');
+});
+
+test('extractTsukihimeSubtitleFiles disambiguates duplicate identical track names', () => {
+  const files = extractTsukihimeSubtitleFiles({
+    id: 1,
+    files: [
+      {
+        id: 1,
+        filename: 'episode.mkv',
+        attachments: [
+          { id: 51, type: 1, info: { codec: 'ASS', lang: 'ja', name: 'Signs' } },
+          { id: 52, type: 1, info: { codec: 'ASS', lang: 'ja', name: 'Signs' } },
+        ],
+      },
+    ],
+  });
+
+  assert.deepEqual(
+    files.map((file) => file.filename),
+    ['episode.ja.51.ass', 'episode.ja.52.ass'],
+  );
+});
diff --git a/src/animetosho/utils.ts b/src/tsukihime/utils.ts
similarity index 58%
rename from src/animetosho/utils.ts
rename to src/tsukihime/utils.ts
index 3368d9926e5706027c2ae370dd6b931417da212e..d40c1137e2886ca830bfa0deefee0605889e7b89 100644
GIT binary patch
delta 3647
zcmai1U2Ggz6_)Lg+HM-PaVoo%M8}Ss*=^RdPN?|VWNmE{2QTrT?6D9nWj)@xyF1G4
z+~Lk0JBzz42vJ^uRvJ~65TdFC68}7GMOD-XTHX*m@PLqbq7SXwcODP|#5s3<b~b-J
zIQE@;?|1I`&N<&Xd2Rcp=F5NEF#O<_-Ll)P;@R8G_qgk`!X!ZY{W?E%9d25<88~ui
zYsHnKGxQ}ajLh|lMYw9#Z!y;@MKG%f54o0<o?j{!Wnxk1qM0v%Y%!?wb~|uw*#SSO
z*O~8g0g_K5QpLr~lKU+VIl)Y8fxAuz8iKcB-R!`n#Y>;c>lrh4yXSEsnWb<Cw+YL3
zEq1#AK8HCog`ERm+KvOJ=P^_G&|-qYq59XB;F@jbE2zNpB|e}{Kt2-(cAb^fhTV<~
zE-<148qYdrGxDma-i^m47iN<|+ZKY00+_CP9U%#3*@D$2w74%3&Xn;fs0TtIB0B4F
z+m$|;QV-Wh&h=9MwEX4CNp_p8BY`g7H+FV!R#&U*E49j2wRW|#vr^mLUV}1d3HhdH
z>nQ*Qpm=amyL>;C9b<F5^0}2Eq+S9Qdo>J)SmYLEhK<A}+(ZGRNDm?sg#&zK*>=%&
z8;@HcOc$Ao8L|a|nNphdRvXFi!LeHh3<3-!CJ4eM6i3v8XUZ0ELSrfG#H>CU5ma5@
z+T1o)uGcCX$da+Sv$|QUUa#F)+uYnnnl9EB7Z;PC5JumeNEr>^8$Fj<og8~+BIPk$
z8=J|j+_BjUMv~-)xxa=k1sH#yO2y@(Z94W>S$ZOTdrY4gto||fbE+WYZs!IW@yW$Y
zn3OzmQ6FS8g;ZtuK9?;t2Y^__fDi2eGsKrzG^XS5L#&VnRT<jJB%!C{r5?oj6dznw
z_sj5{mby%Kv;t_umbK?EE1QDJK)8t=bzS#)o8{ClpcWuv9?DA?FyS*xr!|!tl*?sk
zjo~W%!?81u?dkJJwAJ0q6L$dNKaZ8CQ?4p$V(bbh7ykX>>GO1qd(y^oST4a)nt-_2
z=iFhY3*EwGXnySby(lB1<l3UVDW^B}G;fzdi&HE*Sk$0|pOOW+8#}u<f0QOm?aspK
z&L0g7;iAQE_ZN<Djb!5f?T4<MOg*Fe>4fi|_{?#kWH<cpiRn{V08~`5sFG%fpBR67
zT#t_U;f?Wcjv<NRpT@rs{`!%JdcnSfndhTl6(P)yZu{zY&X%mL`|)l*4#_eMebyVc
zBbmtM2qIqs`UO~_sDU>Ag^`mTkMTydK~dA9EiC~ojlpxzhi4~hlcr@ct7e&!g)dGl
zgl|k-_&B1oIuBeK#}!cbqu2I7n)vQ$9Gjipt47sWLp3vu%C*(?l?|h2d~s`qDiw96
z5x8}VG`_1EYw$o_6oWa>>`?D2!8V!`)|Kdu1r(55F7~x0^ejn>BP7CZfV$GdJDH+V
zSt&)p@=361L9vf=2xY4brhmi64#qZu_C699Th?t0RXR-)JUNS8xdAqu^XEzLmdbFq
zC`}GjDg4TbA1$QmSpNUM=KBvn;*8APkGuXiPQH>&J9u>dWFb>1(CuG;^jFyv|9)&X
zlcw6KZ_PwrTY=};b&RSZu-orAK{I^uRA&Uji>If;sj2k~2|Y5|CzjHZ)z#+>D*9yz
zXC8m5m#5Og2111%nNUY=vJPIv^18)3U6?;g;ktX#*}ETdjZ(|keI|1WL;-U5J=av{
zj-eMf`x{eFk3>H7B6QTx3S9gA&1mpYaB3=m9MhXReDLazKls5fKK$7a-~Z*S@4xj*
z9(*LiZcy_>fkwGuZI8wpRW}73EbMx!%ZEI0EI?7hmS)1fiGzp5<8H{{(^MoRiX_QH
zj1bok=JI&NW%!-bD__nMDi{tqI2;+7kUW@|d-9%#<z-mR!xCH!KRTUzRy`0fjwIN#
zX@KB`7qDRNw78s2f<Zo1EewBpwYwK#_A8GcjAnZ4JJY}Kr7D>jS+5vNOK^mDFkIKT
zOKIui4^9@o#HkTbsa$plI1S}+E>#m%0U7rhDgd=WoR`!Ra2Mwg>|GI-8Yq0$r0D~4
zI4tF%r=~QTt5A5k6DSFaLTL%^sjh17s~tvg(fCF|#J7=2Y*v`xG*_xIHo$3;^1We4
zotrYjf&<eDaAKsM?P5;Imf(kKHr0EG<S+?=a7yG5#g_(8@*e0brbgl`MlbG$dTbfH
zh3A-cmMea#cwxSXEnLfELrUI>otE&rfDG1KF{Z<tO(t|k(`#<8Qg!ihC|xQJYPL_=
z!{?N+MDMT}gQhANzO0?;X%B|cHGD)@y#?Px!i=8jp5T(#xuaAx9%?mG(tB@~wER6?
z*v07}@Z$d`47-t7AUCq0_wwNxZTK$bgo+r36jlvm3vj@q-#Zy^!avXaF*8WMH#!ym
z_KD99zV!d|#FH8M?aw{=)6qzOiR$n#XZ|`^^?!5r!|diyW}U%icy_LlS$%Kr^~~z+
lb6U7}ZhPp<zcQ=e&A$<?Xw2w;?WwQFPog*U$F=Fv{{a|3+>-zR

delta 1153
zcmZ`&K}^$N6n0}1=-fdGZXkvq7<7}-24g$`1FH-%fst%OLX4Jf{M)Ks+q8dS28<G;
zo{T0BFUACkCu72;BziI-UOgF&iB~Ts9`vZ5EMVwgh{x}}|Nq{5-}~O9@>=%sm#m=5
zRZKLqq6xa3#ip*QCQdR4xrtG2QB^c)-pN`D@#fMhF>ZQ85chS$3xDTrX^)ys3^EL^
z>6$@M(J4TXkhwIO&QImWr^K;zdQ?0w<kI4Fb^@gkTOmX@2Y9}O@jT~}aGFtO2mecx
z%THy6i)m5F=Y<R74q^X6MlTs}63vjxn3o8ViWQ!P-oR_d?F_yLx@Z^)o=Lh46Ovla
zYh$v4RjG<|R;eV{wuNwCfEDauggp^pE!aZCtsqCkU%^+i1}2uFB3&{}XY`6@l5K93
zN;#^yygNdm<>meFIIPZ_Gcu{f+5NJ?hx!y<Y^AxiVF0OCwSWyMHat!Kt2`H5a_1Kh
zNV==2z0i2sN3(rmhFaY@cPw$`Dq3>HkV_~I=R(KfTBx1=aX)kl-h}Q3h)fh1J~9Kb
z@N6S-oM;lMs>6eDpHGC%a4+MuD3%<J&4m3s{Ll|@bj_BJ6?_b9T7~W3n6<w)J@K@&
z(j2qx<_%Bmdc?De)yO@ViROHVV5_wW-bN?wpDj_}9y|<nZ6i_C(}Q-cQN=3Zh#?hk
zWSo7#^R{?B8bNbhYzfY`bO$;Tx9055lM8;vT@tLfzngSLp^j@PKRmo6&h8~xhT@oB
z#f!+Xf81H2uE{D%B26c<b1GaxGV!#bBnBbV^`5q4S8RfUb}e>-p4fiY{nAfMo{4{^
wpv@(|dD87kg-XL}vP8qWzI7V%919=&vfj`i8lL7iDQN%T?|7Q4^+)`F0gmOD6951J

diff --git a/src/types/config.ts b/src/types/config.ts
index 7b0365e9..a814ebd6 100644
--- a/src/types/config.ts
+++ b/src/types/config.ts
@@ -10,7 +10,7 @@ import type {
   ImmersionTrackingConfig,
   ImmersionTrackingRetentionMode,
   ImmersionTrackingRetentionPreset,
-  AnimetoshoConfig,
+  TsukihimeConfig,
   JellyfinConfig,
   JimakuConfig,
   JimakuLanguagePreference,
@@ -123,7 +123,7 @@ export interface ShortcutsConfig {
   openCharacterDictionaryManager?: string | null;
   openRuntimeOptions?: string | null;
   openJimaku?: string | null;
-  openAnimetosho?: string | null;
+  openTsukihime?: string | null;
   openSessionHelp?: string | null;
   openControllerSelect?: string | null;
   openControllerDebug?: string | null;
@@ -132,6 +132,11 @@ export interface ShortcutsConfig {
   appendClipboardVideoToQueue?: string | null;
 }
 
+export interface RawShortcutsConfig extends ShortcutsConfig {
+  /** @deprecated Use openTsukihime. */
+  openAnimetosho?: string | null;
+}
+
 export interface Config {
   subtitlePosition?: SubtitlePosition;
   keybindings?: Keybinding[];
@@ -141,7 +146,7 @@ export interface Config {
   mpv?: MpvConfig;
   controller?: ControllerConfig;
   ankiConnect?: AnkiConnectConfig;
-  shortcuts?: ShortcutsConfig;
+  shortcuts?: RawShortcutsConfig;
   secondarySub?: SecondarySubConfig;
   subsync?: SubsyncConfig;
   startupWarmups?: StartupWarmupsConfig;
@@ -149,7 +154,9 @@ export interface Config {
   subtitleSidebar?: SubtitleSidebarConfig;
   auto_start_overlay?: boolean;
   jimaku?: JimakuConfig;
-  animetosho?: AnimetoshoConfig;
+  /** @deprecated Use tsukihime. */
+  animetosho?: TsukihimeConfig;
+  tsukihime?: TsukihimeConfig;
   anilist?: AnilistConfig;
   yomitan?: YomitanConfig;
   jellyfin?: JellyfinConfig;
@@ -306,7 +313,7 @@ export interface ResolvedConfig {
     languagePreference: JimakuLanguagePreference;
     maxEntryResults: number;
   };
-  animetosho: AnimetoshoConfig & {
+  tsukihime: TsukihimeConfig & {
     apiBaseUrl: string;
     maxSearchResults: number;
   };
diff --git a/src/types/integrations.ts b/src/types/integrations.ts
index 932e876e..a67c8833 100644
--- a/src/types/integrations.ts
+++ b/src/types/integrations.ts
@@ -241,23 +241,24 @@ export type JimakuDownloadResult =
   | { ok: true; path: string }
   | { ok: false; error: JimakuApiError };
 
-export interface AnimetoshoSearchQuery {
+export interface TsukihimeSearchQuery {
   query: string;
 }
 
-export interface AnimetoshoEntry {
+export interface TsukihimeEntry {
   id: number;
   title: string;
   timestamp: number | null;
   totalSize: number | null;
   numFiles: number | null;
+  sublangs: string[];
 }
 
-export interface AnimetoshoFilesQuery {
+export interface TsukihimeFilesQuery {
   entryId: number;
 }
 
-export interface AnimetoshoSubtitleFile {
+export interface TsukihimeSubtitleFile {
   attachmentId: number;
   filename: string;
   lang: string;
@@ -267,18 +268,18 @@ export interface AnimetoshoSubtitleFile {
   sourceFilename: string;
 }
 
-export interface AnimetoshoDownloadQuery {
+export interface TsukihimeDownloadQuery {
   entryId: number;
   url: string;
   name: string;
   lang?: string;
 }
 
-export type AnimetoshoApiResponse<T> = JimakuApiResponse<T>;
+export type TsukihimeApiResponse<T> = JimakuApiResponse<T>;
 
-export type AnimetoshoDownloadResult = JimakuDownloadResult;
+export type TsukihimeDownloadResult = JimakuDownloadResult;
 
-export interface AnimetoshoConfig {
+export interface TsukihimeConfig {
   apiBaseUrl?: string;
   maxSearchResults?: number;
 }
diff --git a/src/types/runtime.ts b/src/types/runtime.ts
index d28caf4f..a2a9df5c 100644
--- a/src/types/runtime.ts
+++ b/src/types/runtime.ts
@@ -12,13 +12,13 @@ import type {
   SessionBindingWarning,
 } from './session-bindings';
 import type {
-  AnimetoshoApiResponse,
-  AnimetoshoDownloadQuery,
-  AnimetoshoDownloadResult,
-  AnimetoshoEntry,
-  AnimetoshoFilesQuery,
-  AnimetoshoSearchQuery,
-  AnimetoshoSubtitleFile,
+  TsukihimeApiResponse,
+  TsukihimeDownloadQuery,
+  TsukihimeDownloadResult,
+  TsukihimeEntry,
+  TsukihimeFilesQuery,
+  TsukihimeSearchQuery,
+  TsukihimeSubtitleFile,
   JimakuApiResponse,
   JimakuDownloadQuery,
   JimakuDownloadResult,
@@ -461,14 +461,14 @@ export interface ElectronAPI {
   jimakuSearchEntries: (query: JimakuSearchQuery) => Promise<JimakuApiResponse<JimakuEntry[]>>;
   jimakuListFiles: (query: JimakuFilesQuery) => Promise<JimakuApiResponse<JimakuFileEntry[]>>;
   jimakuDownloadFile: (query: JimakuDownloadQuery) => Promise<JimakuDownloadResult>;
-  animetoshoSearchEntries: (
-    query: AnimetoshoSearchQuery,
-  ) => Promise<AnimetoshoApiResponse<AnimetoshoEntry[]>>;
-  animetoshoListFiles: (
-    query: AnimetoshoFilesQuery,
-  ) => Promise<AnimetoshoApiResponse<AnimetoshoSubtitleFile[]>>;
-  animetoshoDownloadFile: (query: AnimetoshoDownloadQuery) => Promise<AnimetoshoDownloadResult>;
-  animetoshoGetSecondaryLanguages: () => Promise<string[]>;
+  tsukihimeSearchEntries: (
+    query: TsukihimeSearchQuery,
+  ) => Promise<TsukihimeApiResponse<TsukihimeEntry[]>>;
+  tsukihimeListFiles: (
+    query: TsukihimeFilesQuery,
+  ) => Promise<TsukihimeApiResponse<TsukihimeSubtitleFile[]>>;
+  tsukihimeDownloadFile: (query: TsukihimeDownloadQuery) => Promise<TsukihimeDownloadResult>;
+  tsukihimeGetSecondaryLanguages: () => Promise<string[]>;
   quitApp: () => void;
   toggleDevTools: () => void;
   toggleOverlay: () => void;
@@ -501,7 +501,7 @@ export interface ElectronAPI {
   onOpenControllerSelect: (callback: () => void) => void;
   onOpenControllerDebug: (callback: () => void) => void;
   onOpenJimaku: (callback: () => void) => void;
-  onOpenAnimetosho: (callback: () => void) => void;
+  onOpenTsukihime: (callback: () => void) => void;
   onOpenYoutubeTrackPicker: (callback: (payload: YoutubePickerOpenPayload) => void) => void;
   onOpenPlaylistBrowser: (callback: () => void) => void;
   onOpenCharacterDictionaryManager: (callback: () => void) => void;
@@ -546,7 +546,7 @@ export interface ElectronAPI {
       | 'runtime-options'
       | 'subsync'
       | 'jimaku'
-      | 'animetosho'
+      | 'tsukihime'
       | 'youtube-track-picker'
       | 'playlist-browser'
       | 'kiku'
@@ -561,7 +561,7 @@ export interface ElectronAPI {
       | 'runtime-options'
       | 'subsync'
       | 'jimaku'
-      | 'animetosho'
+      | 'tsukihime'
       | 'youtube-track-picker'
       | 'playlist-browser'
       | 'kiku'
diff --git a/src/types/session-bindings.ts b/src/types/session-bindings.ts
index 9dbfe8b8..3e0deeb1 100644
--- a/src/types/session-bindings.ts
+++ b/src/types/session-bindings.ts
@@ -22,7 +22,7 @@ export type SessionActionId =
   | 'openControllerSelect'
   | 'openControllerDebug'
   | 'openJimaku'
-  | 'openAnimetosho'
+  | 'openTsukihime'
   | 'openYoutubePicker'
   | 'openPlaylistBrowser'
   | 'replayCurrentSubtitle'