From a9fef33e510d16de230fcd3268c4248edc1b69c6 Mon Sep 17 00:00:00 2001
From: hl-valdemar <valdemar.lorenzen@icloud.com>
Date: Sun, 11 Oct 2026 21:09:47 +0200
Subject: [PATCH] feat: scope individual and bulk removal to collection views

---
 README.md     |  33 ++-
 src/config.rs |   2 +-
 src/keys.rs   | 364 +++++++++++++++++----------
 src/main.rs   | 672 ++++++++++++++++++++++++++++++++++++++++++--------
 4 files changed, 816 insertions(+), 255 deletions(-)

diff --git a/README.md b/README.md
index dc413b9..9e96638 100644
--- a/README.md
+++ b/README.md
@@ -73,11 +73,10 @@ These are the default bindings. Overrides in `[keys]` replace an action's bindin
 | `w` | Save the selected video to watch later (also works in previews) |
 | `W` | Browse watch later for the current category, or the combined collection elsewhere |
 | `f` | In watch later, cycle All → Unwatched → Watched |
-| `X` (Shift-X) | Remove only the selected watch-later video (also works in previews) |
-| `D` | In watch later, confirm removal of all videos matching the current list/filter |
+| `x` | In watch-later or saved-video lists, remove the selected video |
+| `X` (Shift-X) | In either collection list, confirm bulk removal of the current category/filter subset |
 | `v` | Save the selected video to saved videos (also works in previews) |
 | `V` | Browse saved videos for the current category, or the combined collection elsewhere |
-| `x` | Remove only the selected saved video (also works in previews) |
 | Tab / Shift-Tab | Switch between visible views |
 | `r` | Reload configuration and refresh the current view |
 | `?` | Open / close the scrollable keybinding reference |
@@ -184,12 +183,6 @@ Watch-later-only titles are **magenta** in all video tables; categorized channel
 
 Terebi reports acknowledged playback positions. A video becomes watched when an eligible position reaches **95% of a known positive duration**. Seeking near the end counts; live/non-seekable, unknown-duration, and audio-only inputs do not. Launcher exit or window closure alone never marks a video watched. Watched status is global across categories and remains after removing a video from watch later.
 
-### Removal
-
-`X` (Shift-X) immediately removes **only the selected video** from watch later, including from Search, category views, or previews. Other videos, saved-video membership, and watched status remain unchanged. Configure this action with `video.watch_later.remove`; it is separate from the bulk action `view.watch_later.remove`.
-
-`D` snapshots all videos matching the current list and filter, then shows their count, category, and filter. **`y` confirms; `n` or Esc cancels.** Enter does not confirm. Removal deletes those videos from the shared collection, so they disappear from every matching category; watched status is untouched. An empty filtered list has nothing to remove.
-
 ### Storage
 
 Files are siblings of `config.toml`:
@@ -209,11 +202,29 @@ Saved videos is a separate collection from watch later, deduplicated by YouTube
 
 Browse a category with `c`, then use `V` for its saved-video list. From Search, Feed, or a channel view, `V` opens the combined collection. Switching between a category's saved videos and watch later with `V` / `W` retains that category. Both lists share the existing temporary-tab and back/forward history behavior.
 
-`x` removes **only the selected video** from saved videos, whether in a list or a preview. Removing it never changes watch-later membership or global watched status. There is no watched filter or bulk removal for saved videos.
+Saved lists have no watched filter. Individual and bulk removal use the shared collection-list controls below.
 
 Saved titles are **green**, taking precedence over watch-later magenta when a video belongs to both collections. Removing it from saved videos restores magenta if it remains in watch later. Channel styling, selected-row highlighting, and watched markers are unchanged.
 
-The collection is persisted independently in `saved-videos.toml` beside `config.toml`, using the same atomic, owner-only writes and validation as watch later. Saving repeatedly does not add duplicates. Configure the actions with `video.saved.save`, `view.saved.browse`, and `video.saved.remove`; the live hints and `?` reference reflect overrides.
+The collection is persisted independently in `saved-videos.toml` beside `config.toml`, using the same atomic, owner-only writes and validation as watch later. Saving repeatedly does not add duplicates. Configure saving and browsing with `video.saved.save` and `view.saved.browse`; the live hints and `?` reference reflect overrides.
+
+## Collection removal
+
+Removal controls apply **only in watch-later and saved-video views**, including previews opened from those lists. Search, Feed, ordinary channel/category views, and their previews do not expose removal actions or hints. Text fields and selectors retain their normal controls.
+
+`x` immediately removes only the selected video from the active collection. `X` snapshots the current list and opens bulk confirmation: watch later uses the current category and All/Unwatched/Watched filter; saved videos uses the current category's entire saved list. An empty list does not open confirmation.
+
+The prompt names the collection, category, count, and applicable filter. **`y` confirms; `n` or Esc cancels.** Enter never confirms. Only the snapshotted IDs are removed, even if membership or watched status changes while confirmation is open.
+
+Removal changes only the active collection. Matching category views update, while the other collection and global watched status remain untouched.
+
+The old collection-specific removal settings are no longer accepted. Replace them with:
+
+```toml
+[keys]
+view.collection.remove.selected = "x"
+view.collection.remove.bulk = "X"
+```
 
 ## Configurable keybindings
 
diff --git a/src/config.rs b/src/config.rs
index d920a59..2b141aa 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -670,7 +670,7 @@ mod tests {
 
         let directory = TestDirectory::new();
         let path = directory.0.join("config.toml");
-        let key_section = "# custom controls\n[keys]\napp.quit = ['x', 'ctrl+x'] # quit note\nview.refresh = []\nvideo.saved.remove = []\n\n[keys.selector]\npin = 'f2' # pin note\n";
+        let key_section = "# custom controls\n[keys]\napp.quit = ['x', 'ctrl+x'] # quit note\nview.refresh = []\nview.collection.remove.selected = []\n\n[keys.selector]\npin = 'f2' # pin note\n";
         let sections = [
             ("keys", key_section),
             ("settings", "[settings]\npinned_categories = []\n"),
diff --git a/src/keys.rs b/src/keys.rs
index 402ca78..aa0d5e0 100644
--- a/src/keys.rs
+++ b/src/keys.rs
@@ -13,6 +13,9 @@ pub enum Context {
     Normal,
     Info,
     Description,
+    CollectionNormal,
+    CollectionInfo,
+    CollectionDescription,
     SearchInput,
     SelectorNormal,
     SelectorInput,
@@ -26,6 +29,9 @@ const ALL: &[Context] = &[
     Context::Normal,
     Context::Info,
     Context::Description,
+    Context::CollectionNormal,
+    Context::CollectionInfo,
+    Context::CollectionDescription,
     Context::SearchInput,
     Context::SelectorNormal,
     Context::SelectorInput,
@@ -34,7 +40,19 @@ const ALL: &[Context] = &[
     Context::TagInput,
     Context::Help,
 ];
-const VIEW: &[Context] = &[Context::Normal, Context::Info, Context::Description];
+const VIEW: &[Context] = &[
+    Context::Normal,
+    Context::Info,
+    Context::Description,
+    Context::CollectionNormal,
+    Context::CollectionInfo,
+    Context::CollectionDescription,
+];
+const COLLECTION: &[Context] = &[
+    Context::CollectionNormal,
+    Context::CollectionInfo,
+    Context::CollectionDescription,
+];
 const TEXT: &[Context] = &[
     Context::SearchInput,
     Context::SelectorInput,
@@ -45,6 +63,9 @@ const NON_TEXT: &[Context] = &[
     Context::Normal,
     Context::Info,
     Context::Description,
+    Context::CollectionNormal,
+    Context::CollectionInfo,
+    Context::CollectionDescription,
     Context::SelectorNormal,
     Context::TagList,
     Context::Help,
@@ -79,7 +100,7 @@ macro_rules! actions {
 
 actions! {
     Interrupt, "app.interrupt", "Exit immediately", ALL, ["ctrl+c"];
-    Quit, "app.quit", "Quit the application", &[Context::Normal, Context::Info, Context::Description, Context::Help], ["q"];
+    Quit, "app.quit", "Quit the application", &[Context::Normal, Context::Info, Context::Description, Context::CollectionNormal, Context::CollectionInfo, Context::CollectionDescription, Context::Help], ["q"];
     Help, "help.toggle", "Open or close keyboard help", NON_TEXT, ["?"];
     InputSubmit, "input.submit", "Submit search, browse selector, leave tag filter or stage new tag", TEXT, ["enter"];
     InputCancel, "input.cancel", "Leave text input without submitting", TEXT, ["escape"];
@@ -99,20 +120,19 @@ actions! {
     VideoLast, "video.select.last", "Select the last video", VIEW, ["G", "end"];
     InfoOverview, "video.info.overview", "Show the video overview", VIEW, ["d"];
     InfoDescription, "video.info.description", "Show the video description", VIEW, ["d"];
-    InfoHide, "video.info.hide", "Close the video preview", &[Context::Info, Context::Description], ["escape"];
+    InfoHide, "video.info.hide", "Close the video preview", &[Context::Info, Context::Description, Context::CollectionInfo, Context::CollectionDescription], ["escape"];
     CategoryBrowse, "category.browse", "Browse categories", VIEW, ["c"];
     ChannelBrowse, "channel.browse", "Browse subscribed channels", VIEW, ["u"];
     VideoChannel, "video.channel", "Open the selected video's channel", VIEW, ["U"];
     ChannelTags, "channel.tags", "Edit the selected channel's category tags", VIEW, ["s"];
     CategoryTags, "category.tags", "Edit category tags for all channels in this category", VIEW, ["S"];
     WatchLaterSave, "video.watch_later.save", "Save the selected video to watch later", VIEW, ["w"];
-    WatchLaterBrowse, "view.watch_later.browse", "Browse this category's watch later, or the combined collection elsewhere", &[Context::Normal], ["W"];
-    WatchLaterFilter, "view.watch_later.filter", "Cycle watch-later filter: all, unwatched, watched", &[Context::Normal], ["f"];
-    WatchLaterRemove, "view.watch_later.remove", "Confirm removal of the current filtered watch-later subset", &[Context::Normal], ["D"];
-    WatchLaterRemoveSelected, "video.watch_later.remove", "Remove only the selected watch-later video (also in previews)", VIEW, ["X"];
+    WatchLaterBrowse, "view.watch_later.browse", "Browse this category's watch later, or the combined collection elsewhere", &[Context::Normal, Context::CollectionNormal], ["W"];
+    WatchLaterFilter, "view.watch_later.filter", "Cycle watch-later filter: all, unwatched, watched", &[Context::Normal, Context::CollectionNormal], ["f"];
+    CollectionRemoveSelected, "view.collection.remove.selected", "Remove the selected video from the current collection (also in its previews)", COLLECTION, ["x"];
+    CollectionRemoveBulk, "view.collection.remove.bulk", "Confirm removal of the current collection subset", COLLECTION, ["X"];
     SavedVideoSave, "video.saved.save", "Save the selected video (also in previews)", VIEW, ["v"];
-    SavedVideoBrowse, "view.saved.browse", "Browse this category's saved videos, or the combined collection elsewhere", &[Context::Normal], ["V"];
-    SavedVideoRemove, "video.saved.remove", "Remove the selected saved video (also in previews)", VIEW, ["x"];
+    SavedVideoBrowse, "view.saved.browse", "Browse this category's saved videos, or the combined collection elsewhere", &[Context::Normal, Context::CollectionNormal], ["V"];
     SelectorNext, "selector.select.next", "Select the next category or channel", &[Context::SelectorNormal], ["j", "down"];
     SelectorPrevious, "selector.select.previous", "Select the previous category or channel", &[Context::SelectorNormal], ["k", "up"];
     SelectorInputNext, "selector.input.next", "Select the next match while editing the filter", &[Context::SelectorInput], ["down", "ctrl+j"];
@@ -130,10 +150,10 @@ actions! {
     TagNew, "tags.new", "Enter a new category tag name", &[Context::TagList], ["n"];
     TagSave, "tags.save", "Save category tag changes", &[Context::TagList], ["enter"];
     TagCancel, "tags.cancel", "Discard category tag changes and close", &[Context::TagList], ["escape"];
-    DescriptionNext, "video.description.scroll.next", "Scroll the description down one line", &[Context::Description], ["down", "ctrl+j"];
-    DescriptionPrevious, "video.description.scroll.previous", "Scroll the description up one line", &[Context::Description], ["up", "ctrl+k"];
-    DescriptionPageNext, "video.description.page.next", "Scroll the description down one page", &[Context::Description], ["pagedown"];
-    DescriptionPagePrevious, "video.description.page.previous", "Scroll the description up one page", &[Context::Description], ["pageup"];
+    DescriptionNext, "video.description.scroll.next", "Scroll the description down one line", &[Context::Description, Context::CollectionDescription], ["down", "ctrl+j"];
+    DescriptionPrevious, "video.description.scroll.previous", "Scroll the description up one line", &[Context::Description, Context::CollectionDescription], ["up", "ctrl+k"];
+    DescriptionPageNext, "video.description.page.next", "Scroll the description down one page", &[Context::Description, Context::CollectionDescription], ["pagedown"];
+    DescriptionPagePrevious, "video.description.page.previous", "Scroll the description up one page", &[Context::Description, Context::CollectionDescription], ["pageup"];
     HelpNext, "help.scroll.next", "Scroll help down one line", &[Context::Help], ["j", "down", "ctrl+j"];
     HelpPrevious, "help.scroll.previous", "Scroll help up one line", &[Context::Help], ["k", "up", "ctrl+k"];
     HelpPageNext, "help.page.next", "Scroll help down one page", &[Context::Help], ["pagedown"];
@@ -475,14 +495,6 @@ impl Bindings {
                         "Browse category watch later; combined elsewhere",
                     ),
                     (&[WatchLaterFilter], "Cycle all / unwatched / watched"),
-                    (
-                        &[WatchLaterRemoveSelected],
-                        "Remove the selected video (also in previews)",
-                    ),
-                    (
-                        &[WatchLaterRemove],
-                        "Confirm removal of filtered subset (combined: all matches)",
-                    ),
                 ],
             ),
             (
@@ -496,9 +508,26 @@ impl Bindings {
                         &[SavedVideoBrowse],
                         "Browse category saved videos; combined elsewhere",
                     ),
+                ],
+            ),
+            (
+                "COLLECTION LISTS",
+                &[
                     (
-                        &[SavedVideoRemove],
-                        "Remove the selected video (also in previews)",
+                        &[CollectionRemoveSelected],
+                        "Remove selected from current watch-later / saved list only",
+                    ),
+                    (
+                        &[CollectionRemoveBulk],
+                        "Confirm removal of current category / filtered subset",
+                    ),
+                    (
+                        &[],
+                        "Previews inherit their underlying collection's removal scope",
+                    ),
+                    (
+                        &[],
+                        "Bulk confirmation: y / Enter confirms; n / Esc cancels",
                     ),
                 ],
             ),
@@ -658,16 +687,29 @@ fn overlap_winner(context: Context, first: Action, second: Action) -> Option<Act
         return Some(first);
     }
     if pair(InfoOverview, InfoDescription) && VIEW.contains(&context) {
-        return Some(if context == Context::Info {
-            InfoDescription
-        } else {
-            InfoOverview
-        });
+        return Some(
+            if matches!(context, Context::Info | Context::CollectionInfo) {
+                InfoDescription
+            } else {
+                InfoOverview
+            },
+        );
     }
-    if pair(InfoHide, ViewPrevious) && matches!(context, Context::Info | Context::Description) {
+    if pair(InfoHide, ViewPrevious)
+        && matches!(
+            context,
+            Context::Info
+                | Context::Description
+                | Context::CollectionInfo
+                | Context::CollectionDescription
+        )
+    {
         return Some(InfoHide);
     }
-    if context == Context::Description {
+    if matches!(
+        context,
+        Context::Description | Context::CollectionDescription
+    ) {
         if pair(DescriptionNext, VideoNext) {
             return Some(DescriptionNext);
         }
@@ -753,6 +795,9 @@ mod tests {
             (Context::Normal, Action::InfoOverview),
             (Context::Info, Action::InfoDescription),
             (Context::Description, Action::InfoOverview),
+            (Context::CollectionNormal, Action::InfoOverview),
+            (Context::CollectionInfo, Action::InfoDescription),
+            (Context::CollectionDescription, Action::InfoOverview),
         ] {
             assert_eq!(
                 press(&defaults, context, KeyCode::Char('d'), KeyModifiers::NONE),
@@ -951,8 +996,8 @@ mod tests {
 
     #[test]
     fn aliases_replace_defaults_and_can_disable_actions() {
-        let bindings = configured("[keys.video.saved]\nremove = []\n[keys.view]\nrefresh = ['x', 'CTRL+y']\n[keys.app]\nquit = []\n[keys.input]\nsubmit = 'RETURN'\ncancel = 'EsC'\n").unwrap();
-        let quoted = configured("[keys]\n'video.saved.remove' = []\n'view.refresh' = ['x', 'CTRL+y']\n'app.quit' = []\n'input.submit' = 'RETURN'\n'input.cancel' = 'EsC'\n").unwrap();
+        let bindings = configured("[keys.view.collection.remove]\nselected = []\n[keys.view]\nrefresh = ['x', 'CTRL+y']\n[keys.app]\nquit = []\n[keys.input]\nsubmit = 'RETURN'\ncancel = 'EsC'\n").unwrap();
+        let quoted = configured("[keys]\n'view.collection.remove.selected' = []\n'view.refresh' = ['x', 'CTRL+y']\n'app.quit' = []\n'input.submit' = 'RETURN'\n'input.cancel' = 'EsC'\n").unwrap();
         assert_eq!(quoted, bindings);
         assert_eq!(
             press(
@@ -993,124 +1038,173 @@ mod tests {
     }
 
     #[test]
-    fn watch_later_overrides_disable_and_respect_contexts() {
-        let defaults = Bindings::default();
-        for (key, action) in [
-            ('w', Action::WatchLaterBrowse),
-            ('d', Action::WatchLaterRemove),
-        ] {
-            assert_eq!(
-                press(
-                    &defaults,
-                    Context::Normal,
-                    KeyCode::Char(key),
-                    KeyModifiers::SHIFT
-                ),
-                Some(action),
-            );
-        }
-        assert_eq!(
-            press(
-                &defaults,
-                Context::Info,
-                KeyCode::Char('w'),
-                KeyModifiers::NONE
-            ),
-            Some(Action::WatchLaterSave),
-        );
-        assert_eq!(
-            press(
-                &defaults,
-                Context::Info,
-                KeyCode::Char('d'),
-                KeyModifiers::NONE
-            ),
-            Some(Action::InfoDescription),
-        );
-        let bindings = configured(
-            "[keys.video.watch_later]\nsave = 'alt+w'\nremove = []\n[keys.view.watch_later]\nbrowse = 'shift+x'\nfilter = 'ctrl+f'\nremove = []\n",
-        )
-        .unwrap();
-        for context in ALL {
-            assert_eq!(
-                press(&bindings, *context, KeyCode::Char('w'), KeyModifiers::ALT),
-                VIEW.contains(context).then_some(Action::WatchLaterSave),
-            );
-            for (code, modifiers, action) in [
-                (
-                    KeyCode::Char('x'),
-                    KeyModifiers::SHIFT,
-                    Action::WatchLaterBrowse,
-                ),
-                (
-                    KeyCode::Char('f'),
-                    KeyModifiers::CONTROL,
-                    Action::WatchLaterFilter,
-                ),
+    fn collection_removal_defaults_are_scoped_and_inherit_view_actions() {
+        let bindings = Bindings::default();
+        for &context in ALL {
+            for (key, action) in [
+                ('x', Action::CollectionRemoveSelected),
+                ('X', Action::CollectionRemoveBulk),
             ] {
                 assert_eq!(
-                    press(&bindings, *context, code, modifiers),
-                    (*context == Context::Normal).then_some(action),
-                );
-            }
-            for key in ['w', 'W', 'f', 'D'] {
-                assert_eq!(
-                    press(&bindings, *context, KeyCode::Char(key), KeyModifiers::NONE),
-                    None,
+                    press(&bindings, context, KeyCode::Char(key), KeyModifiers::NONE),
+                    COLLECTION.contains(&context).then_some(action),
                 );
             }
+            assert_eq!(
+                press(&bindings, context, KeyCode::Char('D'), KeyModifiers::NONE),
+                None,
+            );
+        }
+        for (ordinary, collection) in [
+            (Context::Normal, Context::CollectionNormal),
+            (Context::Info, Context::CollectionInfo),
+            (Context::Description, Context::CollectionDescription),
+        ] {
+            for &(key, action) in &bindings.contexts[ordinary as usize] {
+                assert_eq!(
+                    bindings.resolve(collection, KeyEvent::new(key.code, key.modifiers)),
+                    Some(action),
+                    "{ordinary:?} / {collection:?}: {key:?}",
+                );
+            }
+            assert_eq!(
+                bindings.contexts[collection as usize].len(),
+                bindings.contexts[ordinary as usize].len() + 2,
+            );
         }
-        let help = bindings.help_text().to_string();
-        assert!(help.contains("Alt+w") && help.contains("X") && help.contains("Ctrl+f"));
-        assert!(help.contains("unbound") && help.contains("WATCH LATER"));
-        let collision = configured("[keys]\nview.watch_later.browse = 'w'")
-            .unwrap_err()
-            .to_string();
-        assert!(
-            collision.contains("view.watch_later.browse")
-                && collision.contains("video.watch_later.save")
-        );
     }
 
     #[test]
-    fn saved_video_overrides_disable_and_respect_contexts() {
-        let defaults = Bindings::default();
-        for context in ALL {
-            for (key, action, enabled) in [
-                ('v', Action::SavedVideoSave, VIEW.contains(context)),
-                ('V', Action::SavedVideoBrowse, *context == Context::Normal),
-                ('x', Action::SavedVideoRemove, VIEW.contains(context)),
-            ] {
-                assert_eq!(
-                    press(&defaults, *context, KeyCode::Char(key), KeyModifiers::NONE),
-                    enabled.then_some(action),
-                );
-            }
-        }
+    fn collection_overrides_aliases_normalize_and_disable() {
         let bindings = configured(
-            "[keys.video.watch_later]\nremove = []\n[keys.video.saved]\nsave = 'alt+v'\nremove = []\n[keys.view.saved]\nbrowse = 'shift+x'\n",
+            "[keys.view.collection.remove]\nselected = ['option+x', 'alt+x']\nbulk = 'shift+b'\n",
         )
         .unwrap();
-        for context in ALL {
-            assert_eq!(
-                press(&bindings, *context, KeyCode::Char('v'), KeyModifiers::ALT),
-                VIEW.contains(context).then_some(Action::SavedVideoSave),
-            );
-            assert_eq!(
-                press(&bindings, *context, KeyCode::Char('x'), KeyModifiers::SHIFT),
-                (*context == Context::Normal).then_some(Action::SavedVideoBrowse),
-            );
-            for key in ['v', 'V', 'x'] {
+        let quoted = configured(
+            "[keys]\n'view.collection.remove.selected' = 'alt+x'\n'view.collection.remove.bulk' = 'B'\n",
+        ).unwrap();
+        assert_eq!(bindings, quoted);
+        assert_eq!(bindings.label(Action::CollectionRemoveSelected), "Alt+x");
+        assert_eq!(bindings.label(Action::CollectionRemoveBulk), "B");
+        let help = bindings.help_text().to_string();
+        assert!(help.contains("Alt+x"));
+        assert!(help.lines().any(|line| line.trim_start().starts_with("B ")));
+        for &context in ALL {
+            for (code, modifiers, action) in [
+                (
+                    KeyCode::Char('x'),
+                    KeyModifiers::ALT,
+                    Action::CollectionRemoveSelected,
+                ),
+                (
+                    KeyCode::Char('b'),
+                    KeyModifiers::SHIFT,
+                    Action::CollectionRemoveBulk,
+                ),
+                (
+                    KeyCode::Char('B'),
+                    KeyModifiers::NONE,
+                    Action::CollectionRemoveBulk,
+                ),
+            ] {
                 assert_eq!(
-                    press(&bindings, *context, KeyCode::Char(key), KeyModifiers::NONE),
-                    None,
+                    press(&bindings, context, code, modifiers),
+                    COLLECTION.contains(&context).then_some(action),
+                );
+            }
+            for key in ['x', 'X'] {
+                assert_eq!(
+                    press(&bindings, context, KeyCode::Char(key), KeyModifiers::NONE),
+                    None
                 );
             }
         }
-        let collision = configured("[keys]\nview.saved.browse = 'v'")
-            .unwrap_err()
-            .to_string();
-        assert!(collision.contains("view.saved.browse") && collision.contains("video.saved.save"));
+        let disabled = configured(
+            "[keys.view.collection.remove]\nselected = []\nbulk = []\n[keys.view]\nrefresh = ['x', 'shift+x']\n",
+        ).unwrap();
+        for &context in ALL {
+            for key in ['x', 'X'] {
+                assert_eq!(
+                    press(&disabled, context, KeyCode::Char(key), KeyModifiers::NONE),
+                    VIEW.contains(&context).then_some(Action::ViewRefresh),
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn collection_contexts_validate_inherited_binding_conflicts() {
+        for source in [
+            "[keys]\nview.refresh = 'x'",
+            "[keys]\nview.watch_later.browse = 'X'",
+            "[keys]\nview.saved.browse = 'X'",
+            "[keys]\nview.collection.remove.selected = 'q'",
+            "[keys]\nview.collection.remove.bulk = 'down'",
+        ] {
+            let error = configured(source).unwrap_err();
+            assert_eq!(error.kind(), io::ErrorKind::InvalidData);
+            assert!(error.to_string().contains("Collection"), "{error}");
+        }
+    }
+
+    #[test]
+    fn collection_browsing_and_save_overrides_retain_contexts() {
+        let bindings = configured(
+            "[keys.video.watch_later]\nsave = 'alt+w'\n[keys.video.saved]\nsave = 'alt+v'\n[keys.view.watch_later]\nbrowse = 'shift+x'\nfilter = 'ctrl+f'\n[keys.view.saved]\nbrowse = 'alt+b'\n[keys.view.collection.remove]\nbulk = []\n",
+        ).unwrap();
+        for &context in ALL {
+            for (key, modifiers, action, enabled) in [
+                (
+                    'w',
+                    KeyModifiers::ALT,
+                    Action::WatchLaterSave,
+                    VIEW.contains(&context),
+                ),
+                (
+                    'v',
+                    KeyModifiers::ALT,
+                    Action::SavedVideoSave,
+                    VIEW.contains(&context),
+                ),
+                (
+                    'x',
+                    KeyModifiers::SHIFT,
+                    Action::WatchLaterBrowse,
+                    matches!(context, Context::Normal | Context::CollectionNormal),
+                ),
+                (
+                    'f',
+                    KeyModifiers::CONTROL,
+                    Action::WatchLaterFilter,
+                    matches!(context, Context::Normal | Context::CollectionNormal),
+                ),
+                (
+                    'b',
+                    KeyModifiers::ALT,
+                    Action::SavedVideoBrowse,
+                    matches!(context, Context::Normal | Context::CollectionNormal),
+                ),
+            ] {
+                assert_eq!(
+                    press(&bindings, context, KeyCode::Char(key), modifiers),
+                    enabled.then_some(action)
+                );
+            }
+        }
+    }
+
+    #[test]
+    fn obsolete_removal_names_are_unknown() {
+        for name in [
+            "view.watch_later.remove",
+            "video.watch_later.remove",
+            "video.saved.remove",
+        ] {
+            let error = configured(&format!("[keys]\n'{name}' = []")).unwrap_err();
+            assert_eq!(error.kind(), io::ErrorKind::InvalidData);
+            assert!(error.to_string().contains("unknown action"), "{error}");
+            assert!(error.to_string().contains(name), "{error}");
+        }
     }
 
     #[test]
diff --git a/src/main.rs b/src/main.rs
index 5e5aa3e..e421065 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -94,11 +94,12 @@
 //! Quitting cancels pending metadata/launch processes, not the separately running player.
 //! w saves to watch later; W browses its current category list, or the combined collection elsewhere.
 //! v saves to saved videos; V browses its current category list, or the combined collection elsewhere.
-//! x removes only the selected saved video, also from previews; watch later and watched state are unchanged.
+//! Only watch-later and saved-video views allow removal: x removes their selected video, including previews.
 //! Both collections store offline metadata beside config.toml; current channel tags determine category lists.
 //! Saved titles are green before watch-later magenta; ✓ marks acknowledged eligible playback reaching 95%.
-//! In watch-later, f cycles All/Unwatched/Watched; D asks before removing the filtered subset (y confirms).
-//! X removes only the selected watch-later video, including in previews; x removes from saved videos.
+//! In watch-later, f cycles All/Unwatched/Watched. X confirms removal of the current filtered/category subset.
+//! In saved-video views, X confirms removal of the current category/list subset; other collections and watched state stay unchanged.
+//! Configure view.collection.remove.selected and view.collection.remove.bulk; y confirms bulk, n/Esc cancels, never Enter.
 
 mod config;
 mod keys;
@@ -138,7 +139,7 @@ use youtube::{Job, PAGE_SIZE, Page, PlayerLaunch, Video};
 #[command(
     version,
     about = "Browse YouTube and open selected videos in Terebi",
-    after_help = "Key names below describe default bindings. [keys] overrides named actions with a string or array; omitted actions keep defaults and [] disables an action. Live hints and help reflect overrides.\n--default-config prints complete default TOML to stdout and exits without loading config or starting a terminal.\nRequires yt-dlp for browsing; thumbnails also use curl. Playback requires Terebi and its own streaming dependencies.\nDefaults to terebi on PATH; --player overrides the CLI path.\nTerebi receives --new-instance --url followed by the canonical YouTube video URL plus --progress-file for an independent private reporting stream and handles extraction, decoding, and playback itself; each selection opens an independent player instance without replacing existing playback.\nAlways start in NORMAL. A CLI query is searched automatically; otherwise press i to enter a query.\nNORMAL ? opens a scrollable keybinding reference over the current view or dialog. The bottom bar shows only essential actions. Scroll help with j/k, arrows, Ctrl-J/K or PageUp/PageDown; ? or Esc closes it. Question mark remains literal text in input fields.\nINSERT: type to edit; Enter submits if changed and returns to NORMAL; Esc returns without submitting.\nTEXT EDITING (search, category/channel filters, and new tag): Option/Alt+Backspace or Ctrl-W deletes the previous whitespace-delimited word, including trailing whitespace; Cmd/Super+Backspace or Ctrl-U clears the entire line. Plain Backspace removes one character.\nThe terminal must transmit modified Backspace. If it intercepts Option/Cmd, map those shortcuts to Ctrl-W/Ctrl-U respectively.\nNORMAL: j/k or arrows select; Enter opens the video in Terebi; i edits the query; d opens video info (again for full description); c browses saved categories; u browses saved channels; U opens the selected video's channel; s edits channel tags; S edits all channels in the current category; q quits.\nWATCH LATER: w saves the selected video once (also in previews); W opens the current category's watch-later list, or the combined collection elsewhere. Lists follow current channel category memberships and use persisted metadata offline. X (Shift-X) immediately removes only the selected watch-later video in normal or preview mode, leaving saved membership and watched status unchanged; configure video.watch_later.remove separately from bulk view.watch_later.remove. In watch-later views f cycles All/Unwatched/Watched; D prompts to remove the current filtered subset from the shared collection, y confirms, n/Esc cancels, and Enter never confirms. Watch-later titles are magenta; a checkmark marks watched videos in every table. Eligible acknowledged progress reaching 95% of a known duration marks watched; seeking near the end counts, launcher exit does not. Separate watch-later.toml and watch-state.toml sit beside config.toml. Private playback-sessions survive Tubular exit for next-launch recovery.\nSAVED VIDEOS: v saves the selected video once (also in previews); V opens the current category's saved-video list, including from a category watch-later list, or the combined collection elsewhere. W likewise retains a saved list's category. Lists derive from current channel memberships and use offline metadata in saved-videos.toml beside config.toml. x removes only the selected saved video in normal or preview mode, without changing watch later or watched state. Saved titles are green, taking precedence over watch-later magenta. Saved lists have no watched filter or bulk removal. Both collections share the temporary tab and cached back/forward history.\nSearch and Feed are permanent tabs. Pinned categories also stay visible; one temporary category tab is replaced by each new unpinned selection.\nTab/Shift-Tab cycle only visible tabs; Esc or - in NORMAL goes back through view history; + goes forward. Both restore cached rows, selection, and pagination, including replaced temporary tabs. New view navigation clears the forward branch. Removed views are skipped and empty history does nothing. Esc first closes popups or leaves INSERT without navigating; minus and plus type normally in input fields. r reloads config and refreshes the current view from its first page.\nCATEGORY BROWSER (c): starts NORMAL; j/k or arrows move; i enters INSERT to filter; Enter browses; p immediately saves pin/unpin; Esc closes. Choosing a pinned category focuses its existing tab and clears the temporary tab.\nCATEGORY FILTER INSERT: type a case-insensitive substring to filter live; arrows or Ctrl-J/K move; Enter browses the selected match; Esc returns to NORMAL with the filter retained. In NORMAL, j/k and pinning operate on the filtered list. No matches makes Enter/p a no-op. Reopening the selector clears the filter.\nCHANNEL BROWSER (u): starts NORMAL; j/k or arrows move; i enters INSERT to filter; Enter opens only the selected channel's videos; Esc closes. INSERT uses case-insensitive filtering, arrows or Ctrl-J/K to move, Enter to browse, and Esc to return to NORMAL. Empty matches do nothing.\nSaved choices include registered channels (even untagged) and category-only subscriptions, deduplicated by resolved identity; mapped handles label aliases. Channel selection never changes subscriptions or pins.\nChannels and unpinned categories share one temporary browsing tab. Choosing either replaces the previous temporary view while pinned category tabs remain visible. Revisiting or navigating back restores cached rows, selection, and page position. Channel views use the same infinite scrolling but extract only their chosen channel; S remains category-only.\nVIDEO CHANNEL (U / Shift-U): opens the selected video's creator in the same temporary channel tab, reusing cached rows and pagination without subscribing. A canonical channel ID or valid @handle is required; unavailable metadata leaves the current view unchanged. Saved mappings resolve handle-only rows. Unsaved channels do not appear in the saved selector unless you save them.\nReloading config relabels stable saved identities and removes explicitly unsubscribed channels; removing the active saved channel falls back to Search. Unsaved channels opened with U remain browseable for the session.\nHidden category and channel views retain loaded rows, selection, and pagination for this session. Temporary tabs do not survive restarting; pins do.\nPUBLISHED: Every video view shows YYYY-MM-DD. Exact upload dates take precedence; ~ marks an estimated UTC date from flat metadata, and Unknown means unavailable. Dates are cached without fetching full metadata for every video.\nLOADING: Result/feed and preview titles show an animated spinner while content loads, including further pages and thumbnail decoding/resizing; it disappears when ready or on error.\nFeed sits immediately right of Search and combines every saved [channels] registration, including untagged channels, plus channels entered directly in tags.\nChannel URLs and videos are deduplicated; Feed keeps its cached selection and page position when only tag assignments change.\nSubscriptions: $XDG_CONFIG_HOME/tubular/config.toml, or ~/.config/tubular/config.toml when XDG_CONFIG_HOME is unset/empty/relative.\nExample TOML:\n[settings]\npinned_categories = [\"Favorites\"]\n[categories]\nCreators = [\"@jawed\"]\nFavorites = [\"@jawed\"]\n[channels]\n\"@jawed\" = \"https://www.youtube.com/channel/UC4QobU6STFB0P71PMvOGN5A\"\n[settings].pinned_categories is an array of category names; pins referencing removed categories are ignored. Settings, channels, categories and keys tables can appear in any order. Add [settings] above pinned_categories in older configs; root-level pins are no longer accepted.\n[categories] defines flat, overlapping tags, each with its own feed; there is no hierarchy or inheritance.\nEntries accept @handles, HTTPS YouTube channel URLs, or canonical UC channel IDs.\n[channels] registers saved handles with canonical channel URLs/IDs; feeds use these stable identities.\nChecked tags save the handle plus its mapping; existing URLs/aliases are replaced with the handle, preserving comments.\nUnchecked tags remove only that channel's tag assignment; other creators, omitted tags, empty tag arrays, saved registrations, and pins are retained.\nUntagging does not unsubscribe from Feed. To unsubscribe, remove all of that channel's [channels] mappings and tag entries, then press r.\nUnmapped handles work directly. Existing URL entries still load.\nSaving a single channel requires a handle and canonical ID; unavailable metadata or conflicting mappings are reported without changing the file.\nPAGINATION: Search loads 20 results per page; Feed and tags request 20 uploads per channel's /videos tab per page.\nMoving near the loaded end in NORMAL fetches more asynchronously, preserving existing rows, selection, and previews. Insert mode and open popups pause automatic prefetch.\nFeed views merge newest-first using approximate upload dates. Older uploads wait while newer channel pages catch up; undated uploads appear when the feed is exhausted.\nStatus shows the page and whether more is available or the end is reached. Switching views cancels pending extraction; returning resumes the same range with cached rows intact.\nPage errors retain loaded rows and stop automatic retries; r reloads config and restarts the current view from page one.\nDeep pages may take longer because yt-dlp offsets re-traverse earlier continuation pages.\nTAGS (s): existing assignments are checked; j/k or arrows move; Space toggles; Enter saves all staged memberships; n prompts for a new tag; Esc cancels without writing.\nTAG FILTER (s/S): i edits a case-insensitive substring filter; arrows or Ctrl-J/K move through matches while typing. Enter or Esc returns to NORMAL without saving or clearing the filter. Hidden staged memberships are retained; no matches makes navigation/toggling a no-op. Reopening clears the filter.\nBULK TAGS (S, category views only): edits all saved channels in the current category, not just channels with loaded videos. Tags shared by every target start checked; mixed memberships start unchecked. Enter atomically applies the exact checked tag set to every target, removing targets from all unchecked categories while leaving other channels untouched. Empty categories, registrations, pins, and comments remain. n stages a new category for all targets; Esc cancels without saving. If source channels changed while editing, close and reopen. Clearing all tags is refused if any target lacks a [channels] registration, so category-only subscriptions are not accidentally lost.\nNEW TAG: type a name; Enter stages it checked, clears the filter, selects the new tag, and returns to the list; Esc abandons the name; Ctrl-U clears.\nNew tags and membership changes reach disk only on Enter in the main tag list.\nVIDEO INFO: d opens thumbnail and details; d again expands the full description inside the same popup; another d returns to info. Esc closes.\nThe popup uses up to 70% width and 60% height, capped at 96 by 20 cells.\nFull descriptions have one-column left/right padding and an empty line above the bold title and dimmed author/publication row. Title, metadata, and description scroll together as one document; paragraphs are preserved. Up/Down or Ctrl-J/K scroll lines and PgUp/PgDn scroll pages. Plain j/k selects videos in either mode.\nThumbnails have one column of left padding and two columns before the text. Image space is reserved before loading so metadata does not shift when decoding finishes.\nThe title is bold, only author/publication metadata is dimmed, and readable excerpts end with an ellipsis when clipped.\nImages fit proportionally on resize. Terminal graphics are detected at startup, falling back to colored half-blocks.\nDownloading, JPEG decoding, and image resizing/encoding do not block navigation.\nSwitching info/description retains in-flight work and cached content. Full descriptions have a session LRU of 64; thumbnails retain eight inactive images plus the selected image.\ni, c, s, S, view changes, and refresh dismiss the preview; successful refresh clears its caches. Typing d or t in INSERT edits text.\nCtrl-C quits in any mode or popup.\nThe player CLI exits once macOS accepts the handoff; Tubular reports launcher errors, while later extraction/playback errors appear in Terebi.\nSelecting another video opens a new Terebi player, leaving existing playback untouched. Quitting Tubular cancels only pending metadata/CLI work; Terebi continues playing independently.\nExample: tubular \"rust programming\""
+    after_help = "Key names below describe default bindings. [keys] overrides named actions with a string or array; omitted actions keep defaults and [] disables an action. Live hints and help reflect overrides.\n--default-config prints complete default TOML to stdout and exits without loading config or starting a terminal.\nRequires yt-dlp for browsing; thumbnails also use curl. Playback requires Terebi and its own streaming dependencies.\nDefaults to terebi on PATH; --player overrides the CLI path.\nTerebi receives --new-instance --url followed by the canonical YouTube video URL plus --progress-file for an independent private reporting stream and handles extraction, decoding, and playback itself; each selection opens an independent player instance without replacing existing playback.\nAlways start in NORMAL. A CLI query is searched automatically; otherwise press i to enter a query.\nNORMAL ? opens a scrollable keybinding reference over the current view or dialog. The bottom bar shows only essential actions. Scroll help with j/k, arrows, Ctrl-J/K or PageUp/PageDown; ? or Esc closes it. Question mark remains literal text in input fields.\nINSERT: type to edit; Enter submits if changed and returns to NORMAL; Esc returns without submitting.\nTEXT EDITING (search, category/channel filters, and new tag): Option/Alt+Backspace or Ctrl-W deletes the previous whitespace-delimited word, including trailing whitespace; Cmd/Super+Backspace or Ctrl-U clears the entire line. Plain Backspace removes one character.\nThe terminal must transmit modified Backspace. If it intercepts Option/Cmd, map those shortcuts to Ctrl-W/Ctrl-U respectively.\nNORMAL: j/k or arrows select; Enter opens the video in Terebi; i edits the query; d opens video info (again for full description); c browses saved categories; u browses saved channels; U opens the selected video's channel; s edits channel tags; S edits all channels in the current category; q quits.\nWATCH LATER: w saves the selected video once (also in previews); W opens the current category's watch-later list, or the combined collection elsewhere. Lists follow current channel category memberships and use persisted metadata offline. Only in watch-later views and their previews, x removes the selected video and X (Shift-X) prompts to remove the current filtered/category subset. Configure view.collection.remove.selected and view.collection.remove.bulk. In watch-later views f cycles All/Unwatched/Watched; y confirms bulk, n/Esc cancels, and Enter never confirms. The other collection and watched status are unchanged. Watch-later titles are magenta; a checkmark marks watched videos in every table. Eligible acknowledged progress reaching 95% of a known duration marks watched; seeking near the end counts, launcher exit does not. Separate watch-later.toml and watch-state.toml sit beside config.toml. Private playback-sessions survive Tubular exit for next-launch recovery.\nSAVED VIDEOS: v saves the selected video once (also in previews); V opens the current category's saved-video list, including from a category watch-later list, or the combined collection elsewhere. W likewise retains a saved list's category. Lists derive from current channel memberships and use offline metadata in saved-videos.toml beside config.toml. Only in saved-video views and their previews, x removes the selected video and X prompts to remove the current category/list subset, without changing watch later or watched state. Search, Feed, category and channel views and their previews never remove collection membership. Saved titles are green, taking precedence over watch-later magenta. Saved lists have no watched filter; bulk removal snapshots the current list. Both collections share the temporary tab and cached back/forward history.\nSearch and Feed are permanent tabs. Pinned categories also stay visible; one temporary category tab is replaced by each new unpinned selection.\nTab/Shift-Tab cycle only visible tabs; Esc or - in NORMAL goes back through view history; + goes forward. Both restore cached rows, selection, and pagination, including replaced temporary tabs. New view navigation clears the forward branch. Removed views are skipped and empty history does nothing. Esc first closes popups or leaves INSERT without navigating; minus and plus type normally in input fields. r reloads config and refreshes the current view from its first page.\nCATEGORY BROWSER (c): starts NORMAL; j/k or arrows move; i enters INSERT to filter; Enter browses; p immediately saves pin/unpin; Esc closes. Choosing a pinned category focuses its existing tab and clears the temporary tab.\nCATEGORY FILTER INSERT: type a case-insensitive substring to filter live; arrows or Ctrl-J/K move; Enter browses the selected match; Esc returns to NORMAL with the filter retained. In NORMAL, j/k and pinning operate on the filtered list. No matches makes Enter/p a no-op. Reopening the selector clears the filter.\nCHANNEL BROWSER (u): starts NORMAL; j/k or arrows move; i enters INSERT to filter; Enter opens only the selected channel's videos; Esc closes. INSERT uses case-insensitive filtering, arrows or Ctrl-J/K to move, Enter to browse, and Esc to return to NORMAL. Empty matches do nothing.\nSaved choices include registered channels (even untagged) and category-only subscriptions, deduplicated by resolved identity; mapped handles label aliases. Channel selection never changes subscriptions or pins.\nChannels and unpinned categories share one temporary browsing tab. Choosing either replaces the previous temporary view while pinned category tabs remain visible. Revisiting or navigating back restores cached rows, selection, and page position. Channel views use the same infinite scrolling but extract only their chosen channel; S remains category-only.\nVIDEO CHANNEL (U / Shift-U): opens the selected video's creator in the same temporary channel tab, reusing cached rows and pagination without subscribing. A canonical channel ID or valid @handle is required; unavailable metadata leaves the current view unchanged. Saved mappings resolve handle-only rows. Unsaved channels do not appear in the saved selector unless you save them.\nReloading config relabels stable saved identities and removes explicitly unsubscribed channels; removing the active saved channel falls back to Search. Unsaved channels opened with U remain browseable for the session.\nHidden category and channel views retain loaded rows, selection, and pagination for this session. Temporary tabs do not survive restarting; pins do.\nPUBLISHED: Every video view shows YYYY-MM-DD. Exact upload dates take precedence; ~ marks an estimated UTC date from flat metadata, and Unknown means unavailable. Dates are cached without fetching full metadata for every video.\nLOADING: Result/feed and preview titles show an animated spinner while content loads, including further pages and thumbnail decoding/resizing; it disappears when ready or on error.\nFeed sits immediately right of Search and combines every saved [channels] registration, including untagged channels, plus channels entered directly in tags.\nChannel URLs and videos are deduplicated; Feed keeps its cached selection and page position when only tag assignments change.\nSubscriptions: $XDG_CONFIG_HOME/tubular/config.toml, or ~/.config/tubular/config.toml when XDG_CONFIG_HOME is unset/empty/relative.\nExample TOML:\n[settings]\npinned_categories = [\"Favorites\"]\n[categories]\nCreators = [\"@jawed\"]\nFavorites = [\"@jawed\"]\n[channels]\n\"@jawed\" = \"https://www.youtube.com/channel/UC4QobU6STFB0P71PMvOGN5A\"\n[settings].pinned_categories is an array of category names; pins referencing removed categories are ignored. Settings, channels, categories and keys tables can appear in any order. Add [settings] above pinned_categories in older configs; root-level pins are no longer accepted.\n[categories] defines flat, overlapping tags, each with its own feed; there is no hierarchy or inheritance.\nEntries accept @handles, HTTPS YouTube channel URLs, or canonical UC channel IDs.\n[channels] registers saved handles with canonical channel URLs/IDs; feeds use these stable identities.\nChecked tags save the handle plus its mapping; existing URLs/aliases are replaced with the handle, preserving comments.\nUnchecked tags remove only that channel's tag assignment; other creators, omitted tags, empty tag arrays, saved registrations, and pins are retained.\nUntagging does not unsubscribe from Feed. To unsubscribe, remove all of that channel's [channels] mappings and tag entries, then press r.\nUnmapped handles work directly. Existing URL entries still load.\nSaving a single channel requires a handle and canonical ID; unavailable metadata or conflicting mappings are reported without changing the file.\nPAGINATION: Search loads 20 results per page; Feed and tags request 20 uploads per channel's /videos tab per page.\nMoving near the loaded end in NORMAL fetches more asynchronously, preserving existing rows, selection, and previews. Insert mode and open popups pause automatic prefetch.\nFeed views merge newest-first using approximate upload dates. Older uploads wait while newer channel pages catch up; undated uploads appear when the feed is exhausted.\nStatus shows the page and whether more is available or the end is reached. Switching views cancels pending extraction; returning resumes the same range with cached rows intact.\nPage errors retain loaded rows and stop automatic retries; r reloads config and restarts the current view from page one.\nDeep pages may take longer because yt-dlp offsets re-traverse earlier continuation pages.\nTAGS (s): existing assignments are checked; j/k or arrows move; Space toggles; Enter saves all staged memberships; n prompts for a new tag; Esc cancels without writing.\nTAG FILTER (s/S): i edits a case-insensitive substring filter; arrows or Ctrl-J/K move through matches while typing. Enter or Esc returns to NORMAL without saving or clearing the filter. Hidden staged memberships are retained; no matches makes navigation/toggling a no-op. Reopening clears the filter.\nBULK TAGS (S, category views only): edits all saved channels in the current category, not just channels with loaded videos. Tags shared by every target start checked; mixed memberships start unchecked. Enter atomically applies the exact checked tag set to every target, removing targets from all unchecked categories while leaving other channels untouched. Empty categories, registrations, pins, and comments remain. n stages a new category for all targets; Esc cancels without saving. If source channels changed while editing, close and reopen. Clearing all tags is refused if any target lacks a [channels] registration, so category-only subscriptions are not accidentally lost.\nNEW TAG: type a name; Enter stages it checked, clears the filter, selects the new tag, and returns to the list; Esc abandons the name; Ctrl-U clears.\nNew tags and membership changes reach disk only on Enter in the main tag list.\nVIDEO INFO: d opens thumbnail and details; d again expands the full description inside the same popup; another d returns to info. Esc closes.\nThe popup uses up to 70% width and 60% height, capped at 96 by 20 cells.\nFull descriptions have one-column left/right padding and an empty line above the bold title and dimmed author/publication row. Title, metadata, and description scroll together as one document; paragraphs are preserved. Up/Down or Ctrl-J/K scroll lines and PgUp/PgDn scroll pages. Plain j/k selects videos in either mode.\nThumbnails have one column of left padding and two columns before the text. Image space is reserved before loading so metadata does not shift when decoding finishes.\nThe title is bold, only author/publication metadata is dimmed, and readable excerpts end with an ellipsis when clipped.\nImages fit proportionally on resize. Terminal graphics are detected at startup, falling back to colored half-blocks.\nDownloading, JPEG decoding, and image resizing/encoding do not block navigation.\nSwitching info/description retains in-flight work and cached content. Full descriptions have a session LRU of 64; thumbnails retain eight inactive images plus the selected image.\ni, c, s, S, view changes, and refresh dismiss the preview; successful refresh clears its caches. Typing d or t in INSERT edits text.\nCtrl-C quits in any mode or popup.\nThe player CLI exits once macOS accepts the handoff; Tubular reports launcher errors, while later extraction/playback errors appear in Terebi.\nSelecting another video opens a new Terebi player, leaving existing playback untouched. Quitting Tubular cancels only pending metadata/CLI work; Terebi continues playing independently.\nExample: tubular \"rust programming\""
 )]
 struct Options {
     /// Terebi CLI executable; must support --new-instance, --url, and --progress-file.
@@ -233,10 +234,12 @@ fn video_in_channels(video: &Video, channels: &[String], config: &config::Config
     })
 }
 
-struct WatchRemoval {
+struct CollectionRemoval {
+    kind: CollectionKind,
     ids: Vec<String>,
     category: Option<String>,
-    filter: WatchFilter,
+    filter: Option<WatchFilter>,
+    text: String,
 }
 
 struct View {
@@ -449,8 +452,8 @@ enum PreviewMode {
 }
 
 struct KeyHints {
-    footers: [(Context, String); 10],
-    preview: [String; 2],
+    footers: [(Context, String); 13],
+    preview: [String; 4],
     browser: [String; 2],
     tags: [String; 3],
     tags_empty: String,
@@ -483,12 +486,10 @@ impl KeyHints {
                 (
                     Context::Info,
                     format!(
-                        "INFO · {} description · {} later · {} remove later · {} save · {} unsave · {} close · {} help",
+                        "INFO · {} description · {} later · {} save · {} close · {} help",
                         key(Action::InfoDescription),
                         key(Action::WatchLaterSave),
-                        key(Action::WatchLaterRemoveSelected),
                         key(Action::SavedVideoSave),
-                        key(Action::SavedVideoRemove),
                         key(Action::InfoHide),
                         key(Action::Help)
                     ),
@@ -496,14 +497,58 @@ impl KeyHints {
                 (
                     Context::Description,
                     format!(
-                        "DESCRIPTION · {}/{} scroll · {} info · {} later · {} remove later · {} save · {} unsave · {} close · {} help",
+                        "DESCRIPTION · {}/{} scroll · {} info · {} later · {} save · {} close · {} help",
                         key(Action::DescriptionNext),
                         key(Action::DescriptionPrevious),
                         key(Action::InfoOverview),
                         key(Action::WatchLaterSave),
-                        key(Action::WatchLaterRemoveSelected),
                         key(Action::SavedVideoSave),
-                        key(Action::SavedVideoRemove),
+                        key(Action::InfoHide),
+                        key(Action::Help)
+                    ),
+                ),
+                (
+                    Context::CollectionNormal,
+                    format!(
+                        "NORMAL · {}/{} select · {} play · {}/{} later · {}/{} saved · {} remove selected · {} remove list · {} search · {} help · {} quit",
+                        key(Action::VideoNext),
+                        key(Action::VideoPrevious),
+                        key(Action::VideoPlay),
+                        key(Action::WatchLaterSave),
+                        key(Action::WatchLaterBrowse),
+                        key(Action::SavedVideoSave),
+                        key(Action::SavedVideoBrowse),
+                        key(Action::CollectionRemoveSelected),
+                        key(Action::CollectionRemoveBulk),
+                        key(Action::SearchEdit),
+                        key(Action::Help),
+                        key(Action::Quit)
+                    ),
+                ),
+                (
+                    Context::CollectionInfo,
+                    format!(
+                        "INFO · {} description · {} later · {} save · {} remove selected · {} remove list · {} close · {} help",
+                        key(Action::InfoDescription),
+                        key(Action::WatchLaterSave),
+                        key(Action::SavedVideoSave),
+                        key(Action::CollectionRemoveSelected),
+                        key(Action::CollectionRemoveBulk),
+                        key(Action::InfoHide),
+                        key(Action::Help)
+                    ),
+                ),
+                (
+                    Context::CollectionDescription,
+                    format!(
+                        "DESCRIPTION · {}/{} scroll · {} info · {} later · {} save · {} remove selected · {} remove list · {} close · {} help",
+                        key(Action::DescriptionNext),
+                        key(Action::DescriptionPrevious),
+                        key(Action::InfoOverview),
+                        key(Action::WatchLaterSave),
+                        key(Action::SavedVideoSave),
+                        key(Action::CollectionRemoveSelected),
+                        key(Action::CollectionRemoveBulk),
                         key(Action::InfoHide),
                         key(Action::Help)
                     ),
@@ -584,23 +629,39 @@ impl KeyHints {
             ],
             preview: [
                 format!(
-                    "· {} description · {} later · {} remove later · {} save · {} unsave · {} close ",
+                    "· {} description · {} later · {} save · {} close ",
                     key(Action::InfoDescription),
                     key(Action::WatchLaterSave),
-                    key(Action::WatchLaterRemoveSelected),
                     key(Action::SavedVideoSave),
-                    key(Action::SavedVideoRemove),
                     key(Action::InfoHide)
                 ),
                 format!(
-                    "· {}/{} scroll · {} info · {} later · {} remove later · {} save · {} unsave · {} close ",
+                    "· {}/{} scroll · {} info · {} later · {} save · {} close ",
                     key(Action::DescriptionNext),
                     key(Action::DescriptionPrevious),
                     key(Action::InfoOverview),
                     key(Action::WatchLaterSave),
-                    key(Action::WatchLaterRemoveSelected),
                     key(Action::SavedVideoSave),
-                    key(Action::SavedVideoRemove),
+                    key(Action::InfoHide)
+                ),
+                format!(
+                    "· {} description · {} later · {} save · {} remove selected · {} remove list · {} close ",
+                    key(Action::InfoDescription),
+                    key(Action::WatchLaterSave),
+                    key(Action::SavedVideoSave),
+                    key(Action::CollectionRemoveSelected),
+                    key(Action::CollectionRemoveBulk),
+                    key(Action::InfoHide)
+                ),
+                format!(
+                    "· {}/{} scroll · {} info · {} later · {} save · {} remove selected · {} remove list · {} close ",
+                    key(Action::DescriptionNext),
+                    key(Action::DescriptionPrevious),
+                    key(Action::InfoOverview),
+                    key(Action::WatchLaterSave),
+                    key(Action::SavedVideoSave),
+                    key(Action::CollectionRemoveSelected),
+                    key(Action::CollectionRemoveBulk),
                     key(Action::InfoHide)
                 ),
             ],
@@ -654,10 +715,14 @@ impl KeyHints {
             watch_later: format!(
                 "· {} filter · {} remove selected · {} remove filtered ",
                 key(Action::WatchLaterFilter),
-                key(Action::WatchLaterRemoveSelected),
-                key(Action::WatchLaterRemove)
+                key(Action::CollectionRemoveSelected),
+                key(Action::CollectionRemoveBulk)
+            ),
+            saved_videos: format!(
+                "· {} remove selected · {} remove list ",
+                key(Action::CollectionRemoveSelected),
+                key(Action::CollectionRemoveBulk)
             ),
-            saved_videos: format!("· {} remove selected ", key(Action::SavedVideoRemove)),
         }
     }
 
@@ -687,7 +752,7 @@ struct App {
     config_path: PathBuf,
     config: config::Config,
     video_state: video_state::State,
-    watch_removal: Option<WatchRemoval>,
+    collection_removal: Option<CollectionRemoval>,
     key_hints: KeyHints,
     feed_channels: Vec<String>,
     views: Vec<View>,
@@ -758,7 +823,7 @@ impl App {
             config_path,
             config,
             video_state,
-            watch_removal: None,
+            collection_removal: None,
             key_hints,
             feed_channels,
             views,
@@ -1241,7 +1306,7 @@ impl App {
             && self.mode == Mode::Normal
             && self.category_dialog.is_none()
             && self.browser.is_none()
-            && self.watch_removal.is_none()
+            && self.collection_removal.is_none()
             && self.preview.is_none()
             && self.help_popup.is_none()
             && self.views[self.view_index].needs_page()
@@ -1361,7 +1426,18 @@ impl App {
         self.status = self.view_status();
     }
 
-    fn remove_collection(&mut self, kind: CollectionKind) {
+    fn current_collection(&self) -> Option<CollectionKind> {
+        match self.views[self.view_index].source {
+            ViewSource::WatchLater(_) => Some(CollectionKind::WatchLater),
+            ViewSource::SavedVideos(_) => Some(CollectionKind::Saved),
+            _ => None,
+        }
+    }
+
+    fn remove_collection(&mut self) {
+        let Some(kind) = self.current_collection() else {
+            return;
+        };
         let view = &self.views[self.view_index];
         let Some(video) = view
             .selection
@@ -1393,19 +1469,38 @@ impl App {
         }
     }
 
-    fn remove_watch_later(&mut self) {
-        let view = &self.views[self.view_index];
-        let ViewSource::WatchLater(category) = &view.source else {
+    fn remove_collection_bulk(&mut self) {
+        let Some(kind) = self.current_collection() else {
             return;
         };
+        let view = &self.views[self.view_index];
+        let category = match &view.source {
+            ViewSource::WatchLater(category) | ViewSource::SavedVideos(category) => category,
+            _ => unreachable!("current collection has a collection source"),
+        };
         if view.videos.is_empty() {
             return;
         }
-        self.watch_removal = Some(WatchRemoval {
+        let mut removal = CollectionRemoval {
+            kind,
             ids: view.videos.iter().map(|video| video.id.clone()).collect(),
             category: category.clone(),
-            filter: view.watch_filter,
-        });
+            filter: matches!(kind, CollectionKind::WatchLater).then_some(view.watch_filter),
+            text: String::new(),
+        };
+        let collection = match removal.kind {
+            CollectionKind::WatchLater => "Watch later",
+            CollectionKind::Saved => "Saved videos",
+        };
+        let (filter_prefix, filter_label) = removal
+            .filter
+            .map_or(("", ""), |filter| ("\nFilter: ", filter.label()));
+        removal.text = format!(
+            "Remove {} videos?\n\nCollection: {collection}\nCategory: {}{filter_prefix}{filter_label}\n\nOnly these videos leave this collection; the other collection and watched state are unchanged.\n\ny confirms · n/Esc cancels",
+            removal.ids.len(),
+            removal.category.as_deref().unwrap_or("All categories"),
+        );
+        self.collection_removal = Some(removal);
         self.close_preview();
     }
 
@@ -1880,16 +1975,19 @@ impl App {
         } else if self.mode == Mode::Insert {
             Context::SearchInput
         } else {
-            match self.preview {
-                Some(PreviewMode::Info) => Context::Info,
-                Some(PreviewMode::Description) => Context::Description,
-                None => Context::Normal,
+            match (self.current_collection(), self.preview) {
+                (Some(_), Some(PreviewMode::Info)) => Context::CollectionInfo,
+                (Some(_), Some(PreviewMode::Description)) => Context::CollectionDescription,
+                (Some(_), None) => Context::CollectionNormal,
+                (None, Some(PreviewMode::Info)) => Context::Info,
+                (None, Some(PreviewMode::Description)) => Context::Description,
+                (None, None) => Context::Normal,
             }
         }
     }
 
     fn paste(&mut self, text: &str) {
-        if self.watch_removal.is_some() {
+        if self.collection_removal.is_some() {
             return;
         }
         match self.key_context() {
@@ -1921,25 +2019,26 @@ impl App {
         if action == Some(Action::Interrupt) {
             return true;
         }
-        if self.watch_removal.is_some() {
+        if self.collection_removal.is_some() {
             match key.code {
                 KeyCode::Char('y') if key.modifiers.is_empty() => {
-                    let removal = self.watch_removal.take().expect("removal is active");
-                    match self
-                        .video_state
-                        .remove(CollectionKind::WatchLater, &removal.ids)
-                    {
+                    let removal = self.collection_removal.take().expect("removal is active");
+                    match self.video_state.remove(removal.kind, &removal.ids) {
                         Ok(()) => {
                             self.rebuild_collections();
+                            let collection = match removal.kind {
+                                CollectionKind::WatchLater => "watch-later",
+                                CollectionKind::Saved => "saved",
+                            };
                             self.status =
-                                format!("Removed {} watch-later videos.", removal.ids.len());
+                                format!("Removed {} {collection} videos.", removal.ids.len());
                         }
                         Err(error) => self.status = error.to_string(),
                     }
                 }
                 KeyCode::Char('n') | KeyCode::Esc => {
-                    self.watch_removal = None;
-                    self.status = "Watch-later removal cancelled.".into();
+                    self.collection_removal = None;
+                    self.status = "Collection removal cancelled.".into();
                 }
                 _ => {}
             }
@@ -2055,13 +2154,10 @@ impl App {
                     self.browse_collection(CollectionKind::WatchLater)
                 }
                 Some(Action::WatchLaterFilter) => self.filter_watch_later(),
-                Some(Action::WatchLaterRemove) => self.remove_watch_later(),
-                Some(Action::WatchLaterRemoveSelected) => {
-                    self.remove_collection(CollectionKind::WatchLater)
-                }
+                Some(Action::CollectionRemoveBulk) => self.remove_collection_bulk(),
+                Some(Action::CollectionRemoveSelected) => self.remove_collection(),
                 Some(Action::SavedVideoSave) => self.save_collection(CollectionKind::Saved),
                 Some(Action::SavedVideoBrowse) => self.browse_collection(CollectionKind::Saved),
-                Some(Action::SavedVideoRemove) => self.remove_collection(CollectionKind::Saved),
                 Some(Action::VideoPlay) => self.play(),
                 Some(Action::VideoNext) => self.views[self.view_index].selection.select_next(),
                 Some(Action::VideoPrevious) => {
@@ -2240,8 +2336,8 @@ impl App {
                 .block(Block::bordered().title(" Status ")),
             status,
         );
-        let help_text = if self.watch_removal.is_some() {
-            "REMOVE WATCH LATER · y confirm · n/Esc cancel"
+        let help_text = if self.collection_removal.is_some() {
+            "REMOVE COLLECTION · y confirm · n/Esc cancel"
         } else {
             self.key_hints.footer(self.key_context())
         };
@@ -2375,11 +2471,9 @@ impl App {
                     } else {
                         " Description "
                     },
-                    if mode == PreviewMode::Info {
-                        self.key_hints.preview[0].as_str()
-                    } else {
-                        self.key_hints.preview[1].as_str()
-                    },
+                    self.key_hints.preview[usize::from(self.current_collection().is_some()) * 2
+                        + usize::from(mode == PreviewMode::Description)]
+                    .as_str(),
                     (self.description_job.is_some()
                         || (mode == PreviewMode::Info && self.thumbnail.is_loading()))
                     .then_some(spinner),
@@ -2390,27 +2484,23 @@ impl App {
         self.draw_category_dialog(frame);
         self.draw_browser(frame);
         self.draw_help(frame);
-        self.draw_watch_removal(frame);
+        self.draw_collection_removal(frame);
     }
 
-    fn draw_watch_removal(&self, frame: &mut Frame) {
-        let Some(removal) = &self.watch_removal else {
+    fn draw_collection_removal(&self, frame: &mut Frame) {
+        let Some(removal) = &self.collection_removal else {
             return;
         };
         let popup = preview_area(frame.area());
         frame.render_widget(Clear, popup);
-        let text = format!(
-            "Remove {} videos from watch later?\n\nCategory: {}\nFilter: {}\n\nThis removes the matching videos from the shared collection, not their watched state.\n\ny confirms · n/Esc cancels",
-            removal.ids.len(),
-            removal.category.as_deref().unwrap_or("All categories"),
-            removal.filter.label(),
-        );
         frame.render_widget(
-            Paragraph::new(text).wrap(Wrap { trim: true }).block(
-                Block::bordered()
-                    .title(" Remove watch later ")
-                    .border_style(Style::new().fg(Color::Yellow)),
-            ),
+            Paragraph::new(removal.text.as_str())
+                .wrap(Wrap { trim: true })
+                .block(
+                    Block::bordered()
+                        .title(" Remove collection ")
+                        .border_style(Style::new().fg(Color::Yellow)),
+                ),
             popup,
         );
     }
@@ -2810,6 +2900,334 @@ mod tests {
         )
     }
 
+    #[test]
+    fn collection_removal_is_inert_in_ordinary_views_and_their_previews() {
+        let mut app = app(&["tubular"]);
+        app.config.categories.insert("Category".into(), vec![]);
+        let videos = youtube::search_results(
+            r#"{"entries":[{"id":"jNQXAC9IVRw","title":"First","uploader_id":"@creator"},{"id":"rQ_J9WH6CGk","title":"Second","uploader_id":"@other"}]}"#,
+        ).unwrap().videos;
+        app.views[0].videos = videos.clone();
+        app.views[0].loaded = true;
+        for row in 0..2 {
+            app.views[0].selection.select(Some(row));
+            app.key(KeyEvent::new(KeyCode::Char('w'), KeyModifiers::NONE));
+            app.key(KeyEvent::new(KeyCode::Char('v'), KeyModifiers::NONE));
+        }
+        for source in [
+            ViewSource::Search,
+            ViewSource::Feed,
+            ViewSource::Category("Category".into()),
+            ViewSource::Channel(config::normalize_channel("@creator").unwrap()),
+        ] {
+            let mut view = View::new("Ordinary".into(), source);
+            view.videos = videos.clone();
+            view.loaded = true;
+            view.selection.select(Some(0));
+            let index = app.views.len();
+            app.views.push(view);
+            app.switch_view(index);
+            for (preview, context) in [
+                (None, Context::Normal),
+                (Some(PreviewMode::Info), Context::Info),
+                (Some(PreviewMode::Description), Context::Description),
+            ] {
+                app.preview = preview;
+                assert_eq!(app.key_context(), context);
+                assert!(app.current_collection().is_none());
+                let status = app.status.clone();
+                for key in ['x', 'X', 'D'] {
+                    app.key(KeyEvent::new(KeyCode::Char(key), KeyModifiers::NONE));
+                }
+                app.remove_collection();
+                app.remove_collection_bulk();
+                assert!(app.collection_removal.is_none());
+                assert_eq!(app.video_state.videos(CollectionKind::WatchLater).len(), 2);
+                assert_eq!(app.video_state.videos(CollectionKind::Saved).len(), 2);
+                assert_eq!(app.views[index].selection.selected(), Some(0));
+                assert_eq!(app.preview, preview);
+                assert_eq!(app.status, status);
+                app.paste("xX");
+                assert!(app.query.is_empty());
+            }
+        }
+    }
+
+    #[test]
+    fn collection_contexts_preserve_modal_priorities_and_cancel_bulk_from_each_preview() {
+        let mut app = app(&["tubular"]);
+        app.views[0].videos = youtube::search_results(
+            r#"{"entries":[{"id":"jNQXAC9IVRw","title":"First","uploader_id":"@creator"},{"id":"rQ_J9WH6CGk","title":"Second","uploader_id":"@other"}]}"#,
+        ).unwrap().videos;
+        app.views[0].loaded = true;
+        for row in 0..2 {
+            app.views[0].selection.select(Some(row));
+            app.save_collection(CollectionKind::WatchLater);
+            app.save_collection(CollectionKind::Saved);
+        }
+        for kind in [CollectionKind::WatchLater, CollectionKind::Saved] {
+            app.switch_view(0);
+            app.browse_collection(kind);
+            for (preview, context, cancel) in [
+                (None, Context::CollectionNormal, KeyCode::Char('n')),
+                (
+                    Some(PreviewMode::Info),
+                    Context::CollectionInfo,
+                    KeyCode::Esc,
+                ),
+                (
+                    Some(PreviewMode::Description),
+                    Context::CollectionDescription,
+                    KeyCode::Char('n'),
+                ),
+            ] {
+                app.preview = preview;
+                assert_eq!(app.key_context(), context);
+                app.key(KeyEvent::new(KeyCode::Char('D'), KeyModifiers::SHIFT));
+                assert!(app.collection_removal.is_none());
+                app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
+                assert_eq!(app.preview, None);
+                let removal = app.collection_removal.as_ref().unwrap();
+                assert_eq!(removal.ids.len(), 2);
+                assert!(removal.category.is_none());
+                assert_eq!(
+                    removal.filter,
+                    matches!(kind, CollectionKind::WatchLater).then_some(WatchFilter::All)
+                );
+                let history = app.view_history.clone();
+                app.key(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
+                app.key(KeyEvent::new(KeyCode::Char('f'), KeyModifiers::NONE));
+                app.key(KeyEvent::new(KeyCode::Tab, KeyModifiers::NONE));
+                app.paste("y");
+                assert!(app.collection_removal.is_some());
+                assert!(app.player_launch.is_none());
+                assert_eq!(app.view_history, history);
+                assert!(app.key(KeyEvent::new(KeyCode::Char('c'), KeyModifiers::CONTROL)));
+                assert!(app.collection_removal.is_some());
+                app.key(KeyEvent::new(cancel, KeyModifiers::NONE));
+                assert!(app.collection_removal.is_none());
+                assert_eq!(app.video_state.videos(CollectionKind::WatchLater).len(), 2);
+                assert_eq!(app.video_state.videos(CollectionKind::Saved).len(), 2);
+            }
+            app.key(KeyEvent::new(KeyCode::Char('i'), KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::SearchInput);
+            app.paste("xX");
+            assert_eq!(app.query, "xX");
+            app.key(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::CollectionNormal);
+            app.query.clear();
+            app.key(KeyEvent::new(KeyCode::Char('?'), KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::Help);
+            app.key(KeyEvent::new(KeyCode::Char('x'), KeyModifiers::NONE));
+            app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
+            assert!(app.collection_removal.is_none());
+            app.key(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::CollectionNormal);
+            app.key(KeyEvent::new(KeyCode::Char('c'), KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::SelectorNormal);
+            app.key(KeyEvent::new(KeyCode::Char('i'), KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::SelectorInput);
+            app.paste("xX");
+            app.key(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
+            app.key(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::CollectionNormal);
+            app.category_dialog = Some(CategoryDialog::new(
+                CategoryTarget::Channel {
+                    handle: "@creator".into(),
+                    channel: config::normalize_channel("@creator").unwrap(),
+                },
+                "Creator".into(),
+                [("Category".into(), false)].into(),
+            ));
+            assert_eq!(app.key_context(), Context::TagList);
+            app.key(KeyEvent::new(KeyCode::Char('i'), KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::TagFilter);
+            app.paste("xX");
+            app.key(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
+            app.key(KeyEvent::new(KeyCode::Char('n'), KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::TagInput);
+            app.paste("xX");
+            assert_eq!(
+                app.category_dialog.as_ref().unwrap().name.as_deref(),
+                Some("xX")
+            );
+            app.key(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
+            app.key(KeyEvent::new(KeyCode::Esc, KeyModifiers::NONE));
+            assert_eq!(app.key_context(), Context::CollectionNormal);
+            assert_eq!(app.video_state.videos(CollectionKind::WatchLater).len(), 2);
+            assert_eq!(app.video_state.videos(CollectionKind::Saved).len(), 2);
+        }
+    }
+
+    #[test]
+    fn configured_removal_hints_follow_collection_views_and_previews() {
+        let mut app = app(&["tubular"]);
+        let document =
+            "[keys]\nview.collection.remove.selected = 'f8'\nview.collection.remove.bulk = 'f9'\n"
+                .parse::<toml_edit::DocumentMut>()
+                .unwrap();
+        app.apply_config(config::Config {
+            keys: keys::Bindings::from_toml(document.get("keys")).unwrap(),
+            ..Default::default()
+        });
+        app.views[0].videos = youtube::search_results(
+            r#"{"entries":[{"id":"jNQXAC9IVRw","title":"First","uploader_id":"@creator"}]}"#,
+        )
+        .unwrap()
+        .videos;
+        app.views[0].loaded = true;
+        app.views[0].selection.select(Some(0));
+        app.save_collection(CollectionKind::WatchLater);
+        app.save_collection(CollectionKind::Saved);
+        app.remember_description("jNQXAC9IVRw".into(), "Cached description.".into());
+        let mut terminal =
+            ratatui::Terminal::new(ratatui::backend::TestBackend::new(320, 80)).unwrap();
+        for kind in [
+            None,
+            Some(CollectionKind::WatchLater),
+            Some(CollectionKind::Saved),
+        ] {
+            app.switch_view(0);
+            if let Some(kind) = kind {
+                app.browse_collection(kind);
+            }
+            for preview in [
+                None,
+                Some(PreviewMode::Info),
+                Some(PreviewMode::Description),
+            ] {
+                app.preview = preview;
+                terminal
+                    .draw(|frame| app.draw(frame, Duration::ZERO))
+                    .unwrap();
+                let buffer = terminal.backend().buffer();
+                let rendered: String = buffer.content.iter().map(|cell| cell.symbol()).collect();
+                assert_eq!(rendered.contains("F8"), kind.is_some());
+                assert_eq!(rendered.contains("F9"), kind.is_some());
+                if preview == Some(PreviewMode::Info) {
+                    let popup = preview_area(buffer.area);
+                    let title: String = (popup.x..popup.right())
+                        .map(|x| buffer[(x, popup.y)].symbol())
+                        .collect();
+                    assert_eq!(title.contains("F8"), kind.is_some());
+                    assert_eq!(title.contains("F9"), kind.is_some());
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn bulk_removal_snapshots_saved_categories_and_watch_filters_independently() {
+        let root =
+            std::env::temp_dir().join(format!("tubular-collection-bulk-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&root);
+        std::fs::create_dir_all(&root).unwrap();
+        std::fs::write(
+            root.join("watch-state.toml"),
+            "version = 1\nwatched = ['jNQXAC9IVRw']\n",
+        )
+        .unwrap();
+        let category_channels = vec![config::normalize_channel("@creator").unwrap()];
+        let config = config::Config {
+            categories: [("Category".into(), category_channels.clone())].into(),
+            ..Default::default()
+        };
+        let path = root.join("config.toml");
+        let mut app = App::with_state(
+            Options::parse_from(["tubular"]),
+            path.clone(),
+            config,
+            video_state::State::open(&path).unwrap(),
+        );
+        app.views[0].videos = youtube::search_results(
+            r#"{"entries":[{"id":"jNQXAC9IVRw","title":"Watched","uploader_id":"@creator"},{"id":"rQ_J9WH6CGk","title":"Unwatched","uploader_id":"@creator"},{"id":"l-GaaivVJCE","title":"Outside category","uploader_id":"@other"}]}"#,
+        ).unwrap().videos;
+        app.views[0].loaded = true;
+        for row in 0..3 {
+            app.views[0].selection.select(Some(row));
+            app.save_collection(CollectionKind::WatchLater);
+            app.save_collection(CollectionKind::Saved);
+        }
+        app.views[2].loaded = true;
+        app.switch_view(2);
+        app.browse_collection(CollectionKind::Saved);
+        app.preview = Some(PreviewMode::Description);
+        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::NONE));
+        let removal = app.collection_removal.as_ref().unwrap();
+        assert!(matches!(removal.kind, CollectionKind::Saved));
+        assert_eq!(removal.category.as_deref(), Some("Category"));
+        assert_eq!(removal.filter, None);
+        assert_eq!(removal.ids, ["jNQXAC9IVRw", "rQ_J9WH6CGk"]);
+        let prompt = removal.text.clone();
+        app.apply_config(config::Config {
+            categories: [(
+                "Category".into(),
+                vec![
+                    config::normalize_channel("@creator").unwrap(),
+                    config::normalize_channel("@other").unwrap(),
+                ],
+            )]
+            .into(),
+            ..Default::default()
+        });
+        assert_eq!(app.views[app.view_index].videos.len(), 3);
+        assert_eq!(app.collection_removal.as_ref().unwrap().text, prompt);
+        app.browse_collection(CollectionKind::WatchLater);
+        app.key(KeyEvent::new(KeyCode::Char('y'), KeyModifiers::NONE));
+        assert_eq!(app.video_state.videos(CollectionKind::Saved).len(), 1);
+        assert!(
+            app.video_state
+                .contains(CollectionKind::Saved, "l-GaaivVJCE")
+        );
+        assert_eq!(app.video_state.videos(CollectionKind::WatchLater).len(), 3);
+        assert!(app.video_state.is_watched("jNQXAC9IVRw"));
+        app.apply_config(config::Config {
+            categories: [("Category".into(), category_channels)].into(),
+            ..Default::default()
+        });
+        app.key(KeyEvent::new(KeyCode::Char('f'), KeyModifiers::NONE));
+        assert_eq!(app.views[app.view_index].videos.len(), 1);
+        app.key(KeyEvent::new(KeyCode::Char('f'), KeyModifiers::NONE));
+        assert_eq!(app.views[app.view_index].watch_filter, WatchFilter::Watched);
+        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
+        let removal = app.collection_removal.as_ref().unwrap();
+        assert!(matches!(removal.kind, CollectionKind::WatchLater));
+        assert_eq!(removal.filter, Some(WatchFilter::Watched));
+        assert_eq!(removal.ids, ["jNQXAC9IVRw"]);
+        app.key(KeyEvent::new(KeyCode::Char('y'), KeyModifiers::NONE));
+        assert_eq!(app.video_state.videos(CollectionKind::WatchLater).len(), 2);
+        assert!(app.views[app.view_index].videos.is_empty());
+        assert_eq!(app.video_state.videos(CollectionKind::Saved).len(), 1);
+        assert!(app.video_state.is_watched("jNQXAC9IVRw"));
+        app.switch_view(0);
+        app.browse_collection(CollectionKind::WatchLater);
+        app.key(KeyEvent::new(KeyCode::Char('f'), KeyModifiers::NONE));
+        assert_eq!(
+            app.views[app.view_index].watch_filter,
+            WatchFilter::Unwatched
+        );
+        assert_eq!(app.views[app.view_index].videos.len(), 2);
+        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
+        assert!(app.collection_removal.as_ref().unwrap().category.is_none());
+        app.key(KeyEvent::new(KeyCode::Char('y'), KeyModifiers::NONE));
+        assert!(
+            app.video_state
+                .videos(CollectionKind::WatchLater)
+                .is_empty()
+        );
+        app.browse_collection(CollectionKind::Saved);
+        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
+        app.key(KeyEvent::new(KeyCode::Char('y'), KeyModifiers::NONE));
+        assert!(app.video_state.videos(CollectionKind::Saved).is_empty());
+        assert!(app.video_state.is_watched("jNQXAC9IVRw"));
+        drop(app);
+        let restarted = video_state::State::open(&path).unwrap();
+        assert!(restarted.videos(CollectionKind::Saved).is_empty());
+        assert!(restarted.videos(CollectionKind::WatchLater).is_empty());
+        assert!(restarted.is_watched("jNQXAC9IVRw"));
+        std::fs::remove_dir_all(root).unwrap();
+    }
+
     #[test]
     fn individual_watch_later_removal_keeps_siblings_saved_and_watched() {
         let root = std::env::temp_dir().join(format!(
@@ -2838,8 +3256,9 @@ mod tests {
         app.save_collection(CollectionKind::Saved);
         app.views[0].selection.select(Some(1));
         app.save_collection(CollectionKind::WatchLater);
-        app.views[0].selection.select(Some(0));
-        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
+        app.browse_collection(CollectionKind::WatchLater);
+        app.views[app.view_index].selection.select(Some(0));
+        app.key(KeyEvent::new(KeyCode::Char('x'), KeyModifiers::NONE));
         assert!(
             !app.video_state
                 .contains(CollectionKind::WatchLater, "jNQXAC9IVRw")
@@ -2853,25 +3272,28 @@ mod tests {
                 .contains(CollectionKind::Saved, "jNQXAC9IVRw")
         );
         assert!(app.video_state.is_watched("jNQXAC9IVRw"));
-        assert!(app.watch_removal.is_none());
-        app.views[0].selection.select(Some(1));
+        assert!(app.collection_removal.is_none());
+        app.views[app.view_index].selection.select(Some(0));
         app.preview = Some(PreviewMode::Info);
-        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::NONE));
+        app.key(KeyEvent::new(KeyCode::Char('x'), KeyModifiers::NONE));
         assert!(
             app.video_state
                 .videos(CollectionKind::WatchLater)
                 .is_empty()
         );
-        assert_eq!(app.preview, Some(PreviewMode::Info));
+        assert_eq!(app.preview, None);
+        app.switch_view(0);
+        app.views[0].selection.select(Some(1));
         app.save_collection(CollectionKind::WatchLater);
+        app.browse_collection(CollectionKind::WatchLater);
         app.preview = Some(PreviewMode::Description);
-        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::NONE));
+        app.key(KeyEvent::new(KeyCode::Char('x'), KeyModifiers::NONE));
         assert!(
             app.video_state
                 .videos(CollectionKind::WatchLater)
                 .is_empty()
         );
-        assert_eq!(app.preview, Some(PreviewMode::Description));
+        assert_eq!(app.preview, None);
         drop(app);
         let restarted = video_state::State::open(&root.join("config.toml")).unwrap();
         assert!(restarted.videos(CollectionKind::WatchLater).is_empty());
@@ -2945,20 +3367,20 @@ mod tests {
         app.filter_watch_later();
         assert_eq!(app.views[app.view_index].watch_filter, WatchFilter::Watched);
         assert!(app.views[app.view_index].videos.is_empty());
-        app.remove_watch_later();
-        assert!(app.watch_removal.is_none());
+        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
+        assert!(app.collection_removal.is_none());
         app.filter_watch_later();
 
-        app.remove_watch_later();
+        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
         let history = app.view_history.clone();
         app.key(KeyEvent::new(KeyCode::Enter, KeyModifiers::NONE));
         app.key(KeyEvent::new(KeyCode::Char('-'), KeyModifiers::NONE));
         app.paste("y");
-        assert!(app.watch_removal.is_some());
+        assert!(app.collection_removal.is_some());
         assert!(app.player_launch.is_none());
         assert_eq!(app.view_history, history);
         app.key(KeyEvent::new(KeyCode::Char('n'), KeyModifiers::NONE));
-        assert!(app.watch_removal.is_none());
+        assert!(app.collection_removal.is_none());
         assert_eq!(app.video_state.videos(CollectionKind::WatchLater).len(), 2);
 
         app.apply_config(config::Config {
@@ -2992,7 +3414,7 @@ mod tests {
             "unmapped handles remain usable"
         );
 
-        app.remove_watch_later();
+        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
         app.apply_config(config::Config {
             categories: [(
                 "Category".into(),
@@ -3005,7 +3427,10 @@ mod tests {
             ..Default::default()
         });
         assert_eq!(app.views[app.view_index].videos.len(), 2);
-        assert_eq!(app.watch_removal.as_ref().unwrap().ids, ["jNQXAC9IVRw"]);
+        assert_eq!(
+            app.collection_removal.as_ref().unwrap().ids,
+            ["jNQXAC9IVRw"]
+        );
         app.key(KeyEvent::new(KeyCode::Char('y'), KeyModifiers::NONE));
         assert_eq!(app.video_state.videos(CollectionKind::WatchLater).len(), 1);
         assert!(
@@ -3037,7 +3462,7 @@ mod tests {
             restarted.views[restarted.view_index].videos[0].title,
             "Other creator"
         );
-        restarted.remove_watch_later();
+        restarted.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
         restarted.key(KeyEvent::new(KeyCode::Char('y'), KeyModifiers::NONE));
         assert!(
             restarted
@@ -3199,7 +3624,7 @@ mod tests {
     #[test]
     fn saved_actions_use_configured_keys_in_each_video_context_and_remove_only_selection() {
         let mut app = app(&["tubular"]);
-        let document = "[keys]\nvideo.saved.save = 'f6'\nview.saved.browse = 'f7'\nvideo.saved.remove = 'f8'\n"
+        let document = "[keys]\nvideo.saved.save = 'f6'\nview.saved.browse = 'f7'\nview.collection.remove.selected = 'f8'\nview.collection.remove.bulk = 'f9'\n"
             .parse::<toml_edit::DocumentMut>().unwrap();
         app.apply_config(config::Config {
             keys: keys::Bindings::from_toml(document.get("keys")).unwrap(),
@@ -3219,16 +3644,45 @@ mod tests {
             Some(PreviewMode::Description),
         ] {
             app.preview = preview;
-            app.key(KeyEvent::new(KeyCode::Char('v'), KeyModifiers::NONE));
-            assert!(
-                !app.video_state
-                    .contains(CollectionKind::Saved, "jNQXAC9IVRw"),
-                "disabled default must not save"
-            );
+            if !app
+                .video_state
+                .contains(CollectionKind::Saved, "jNQXAC9IVRw")
+            {
+                app.key(KeyEvent::new(KeyCode::Char('v'), KeyModifiers::NONE));
+                assert!(
+                    !app.video_state
+                        .contains(CollectionKind::Saved, "jNQXAC9IVRw")
+                );
+            }
             app.key(KeyEvent::new(KeyCode::F(6), KeyModifiers::NONE));
             app.key(KeyEvent::new(KeyCode::F(6), KeyModifiers::NONE));
             assert_eq!(app.video_state.videos(CollectionKind::Saved).len(), 2);
+            let status = app.status.clone();
+            app.key(KeyEvent::new(KeyCode::F(8), KeyModifiers::NONE));
+            assert_eq!(app.video_state.videos(CollectionKind::Saved).len(), 2);
             assert_eq!(app.preview, preview);
+            assert_eq!(app.status, status);
+        }
+        for preview in [
+            None,
+            Some(PreviewMode::Info),
+            Some(PreviewMode::Description),
+        ] {
+            app.preview = None;
+            app.key(KeyEvent::new(KeyCode::F(7), KeyModifiers::NONE));
+            let row = app.views[app.view_index]
+                .videos
+                .iter()
+                .position(|video| video.id == "jNQXAC9IVRw")
+                .unwrap();
+            app.views[app.view_index].selection.select(Some(row));
+            app.preview = preview;
+            assert!(matches!(
+                app.current_collection(),
+                Some(CollectionKind::Saved)
+            ));
+            app.key(KeyEvent::new(KeyCode::Char('x'), KeyModifiers::NONE));
+            assert_eq!(app.video_state.videos(CollectionKind::Saved).len(), 2);
             app.key(KeyEvent::new(KeyCode::F(8), KeyModifiers::NONE));
             assert_eq!(app.video_state.videos(CollectionKind::Saved).len(), 1);
             assert!(
@@ -3239,13 +3693,10 @@ mod tests {
                 app.video_state
                     .contains(CollectionKind::WatchLater, "jNQXAC9IVRw")
             );
-            assert_eq!(
-                app.preview, preview,
-                "removal from an unchanged search row retains preview"
-            );
-            app.key(KeyEvent::new(KeyCode::F(8), KeyModifiers::NONE));
-            assert!(app.status.contains("not in saved"));
-            assert_eq!(app.preview, preview);
+            assert_eq!(app.preview, None);
+            app.switch_view(0);
+            app.views[0].selection.select(Some(0));
+            app.key(KeyEvent::new(KeyCode::F(6), KeyModifiers::NONE));
         }
         app.preview = None;
         app.key(KeyEvent::new(KeyCode::F(6), KeyModifiers::NONE));
@@ -3257,8 +3708,9 @@ mod tests {
                 .contains(CollectionKind::Saved, "l-GaaivVJCE")
         );
         app.views[0].selection.select(None);
+        let status = app.status.clone();
         app.key(KeyEvent::new(KeyCode::F(8), KeyModifiers::NONE));
-        assert!(app.status.contains("Select a video"));
+        assert_eq!(app.status, status);
         app.key(KeyEvent::new(KeyCode::F(7), KeyModifiers::NONE));
         assert_eq!(
             app.views[app.view_index].source,
@@ -3268,8 +3720,10 @@ mod tests {
         assert!(app.key_hints.footer(Context::Normal).contains("F6/F7"));
         assert!(app.key_hints.saved_videos.contains("F8"));
         app.key(KeyEvent::new(KeyCode::Char('W'), KeyModifiers::SHIFT));
-        app.key(KeyEvent::new(KeyCode::Char('D'), KeyModifiers::SHIFT));
-        assert!(app.watch_removal.is_some());
+        app.key(KeyEvent::new(KeyCode::Char('X'), KeyModifiers::SHIFT));
+        assert!(app.collection_removal.is_none());
+        app.key(KeyEvent::new(KeyCode::F(9), KeyModifiers::NONE));
+        assert!(app.collection_removal.is_some());
         app.key(KeyEvent::new(KeyCode::Char('y'), KeyModifiers::NONE));
         assert!(
             app.video_state
@@ -3336,7 +3790,9 @@ mod tests {
                     && cell.fg == Color::Black
                     && cell.bg == Color::Cyan)
         );
-        app.remove_collection(CollectionKind::Saved);
+        app.browse_collection(CollectionKind::Saved);
+        app.key(KeyEvent::new(KeyCode::Char('x'), KeyModifiers::NONE));
+        app.switch_view(0);
         app.views[0].selection.select(None);
         terminal
             .draw(|frame| app.draw(frame, Duration::ZERO))
@@ -3559,7 +4015,7 @@ mod tests {
         let document = r#"[keys]
 video.info.overview = "I"
 video.info.hide = "x"
-video.saved.remove = []
+view.collection.remove.selected = []
 search.edit = "f2"
 input.delete.word = "ctrl+backspace"
 input.delete.line = "ctrl+l"