diff --git a/README.md b/README.md
index 6eb199c..969e80f 100644
--- a/README.md
+++ b/README.md
@@ -45,8 +45,8 @@ This config layers on top of the CachyOS base Fish configuration and adds:
 ├── conf.d/               # Auto-sourced configuration fragments
 │   ├── abbr.fish         # All abbreviations
 │   ├── cheat.fish        # cheat.sh completions
+│   ├── key_bindings.fish # Custom key bindings
 │   ├── fzf.fish          # FZF key binding initialization
-│   ├── keybindings.fish  # Custom key bindings
 │   ├── tailscale.fish    # Tailscale CLI completions
 │   ├── theme.fish        # Theme syntax highlighting colors
 │   ├── wakatime.fish     # WakaTime shell hook
@@ -101,17 +101,7 @@ FZF is themed to Catppuccin Mocha with the following colors set via `FZF_DEFAULT
 - Foreground: `#CDD6F4`
 - Highlights: `#F38BA8` (red), `#CBA6F7` (mauve), `#B4BEFE` (lavender)
 
-**Key bindings** (from `fzf.fish`):
-
-| Binding | Action |
-|---|---|
-| `Ctrl+R` | Search command history |
-| `Ctrl+F` | Search directory files |
-| `Ctrl+Alt+F` | Search git-tracked files |
-| `Ctrl+Alt+L` | Search git log |
-| `Ctrl+Alt+S` | Search git status |
-| `Ctrl+V` | Search shell variables |
-| `Ctrl+Alt+P` | Search running processes |
+See [FZF Bindings](#fzf-bindings) under Key Bindings for the default FZF shortcuts.
 
 ---
 
@@ -141,6 +131,21 @@ Full tab completion for the `tailscale` CLI is provided via `conf.d/tailscale.fi
 
 ## Key Bindings
 
+### FZF Bindings
+
+These are the default FZF bindings (from `fzf.fish`):
+
+| Binding | Action |
+|---|---|
+| `Ctrl+R` | Search command history |
+| `Ctrl+Alt+F` | Search git-tracked files |
+| `Ctrl+Alt+L` | Search git log |
+| `Ctrl+Alt+S` | Search git status |
+| `Ctrl+V` | Search shell variables |
+| `Ctrl+Alt+P` | Search running processes |
+
+### User Bindings
+
 Beyond standard shell and FZF bindings, these custom interactive shortcuts are available:
 
 | Binding | Action | Description |
diff --git a/conf.d/fish_frozen_key_bindings.fish b/conf.d/fish_frozen_key_bindings.fish
deleted file mode 100644
index 495aee9..0000000
--- a/conf.d/fish_frozen_key_bindings.fish
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was created by fish when upgrading to version 4.3, to migrate
-# the 'fish_key_bindings' variable from its old default scope (universal)
-# to its new default scope (global).  We recommend you delete this file
-# and configure key bindings in ~/.config/fish/config.fish if needed.
-
-# set --global fish_key_bindings fish_default_key_bindings
-
-# Prior to version 4.3, fish shipped an event handler that runs
-# `set --universal fish_key_bindings fish_default_key_bindings`
-# whenever the fish_key_bindings variable is erased.
-# This means that as long as any fish < 4.3 is still running on this system,
-# we cannot complete the migration.
-# As a workaround, erase the universal variable at every shell startup.
-set --erase --universal fish_key_bindings
diff --git a/conf.d/fish_user_key_bindings.fish b/conf.d/key_bindings.fish
similarity index 100%
rename from conf.d/fish_user_key_bindings.fish
rename to conf.d/key_bindings.fish
diff --git a/conf.d/keybindings.fish b/conf.d/keybindings.fish
deleted file mode 100644
index 9c1c2e9..0000000
--- a/conf.d/keybindings.fish
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2026 Rootiest
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-if not status is-interactive
-    exit
-end
-
-# Ctrl+Alt+U — strip the first command token and place cursor at start to retype it
-for mode in default insert
-    bind --mode $mode ctrl-alt-u _replace_command_token
-end
diff --git a/conf.d/puffer_fish_key_bindings.fish b/conf.d/puffer.fish
similarity index 100%
rename from conf.d/puffer_fish_key_bindings.fish
rename to conf.d/puffer.fish