diff --git a/conf.d/__fish_config_op_registry.fish b/conf.d/__fish_config_op_registry.fish
index 70490ca..23471be 100644
--- a/conf.d/__fish_config_op_registry.fish
+++ b/conf.d/__fish_config_op_registry.fish
@@ -62,7 +62,8 @@ set -g __fish_config_op_registry_keys \
     tmux-logging: \
     top: \
     tricks:aliases-tricks \
-    tricks:overrides-tricks \
+    tricks:tricks-bang \
+    tricks:tricks-manpager \
     upgrade: \
     wakatime:wakatime-autoexec \
     wakatime:wakatime-hook \
@@ -127,6 +128,7 @@ set -g __fish_config_op_registry_values \
     "logging/multiplexer-capture" \
     "aliases/monitor" \
     "aliases/filesystem" \
+    "overrides/key-bindings" \
     "overrides/environment" \
     "integrations/pkg-upgrade" \
     "autoexec/telemetry" \
diff --git a/conf.d/tricks.fish b/conf.d/tricks.fish
index 8c1a5e5..a3a5474 100644
--- a/conf.d/tricks.fish
+++ b/conf.d/tricks.fish
@@ -9,7 +9,8 @@
 
 # COMPONENT
 #   site aliases-tricks: aliases/filesystem
-#   site overrides-tricks: overrides/environment
+#   site tricks-manpager: overrides/environment
+#   site tricks-bang: overrides/key-bindings
 
 ## Environment setup
 # Apply .profile: use this to put fish compatible .profile stuff in
@@ -28,7 +29,7 @@ end
 
 # Format man pages using bat (only if bat is installed)
 # Overriding $MANPAGER is opinionated (C3 overrides)
-if type -q bat; and __fish_config_op_enabled (status basename) overrides-tricks
+if type -q bat; and __fish_config_op_enabled (status basename) tricks-manpager
     set -gx MANROFFOPT -c
     set -gx MANPAGER "sh -c 'col -bx | bat -l man -p'"
 end
@@ -41,7 +42,7 @@ set -gx __done_notification_urgency_level low
 # Functions needed for !! and !$ https://github.com/oh-my-fish/plugin-bang-bang
 # The bang-bang system is opinionated (C3 overrides) and is gated atomically
 # here, in conf.d/abbr.fish, conf.d/puffer.fish, and functions/expand_*.fish.
-if __fish_config_op_enabled (status basename) overrides-tricks
+if __fish_config_op_enabled (status basename) tricks-bang
     function __history_previous_command
         switch (commandline -t)
             case "!"
diff --git a/config.fish b/config.fish
index 82a5318..acae248 100644
--- a/config.fish
+++ b/config.fish
@@ -7,7 +7,7 @@
 
 #   ───────────────────── Opinionated component guards ─────────────────────
 # Opinionated components (AGENTS.md Task #3) are wrapped in
-# __fish_config_op_enabled <category> guards throughout this file and conf.d/.
+# __fish_config_op_enabled <identity> [<site>] guards throughout this file and conf.d/.
 # The helper always evaluates the master switch __fish_config_opinionated
 # first (falsy disables everything), then the per-category opt-out variable:
 #   __fish_config_op_aliases       C1 — command shadows / flag injection