diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json
index 927b2cd..2bb9b07 100644
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,12 +1,13 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "better-escape.nvim": { "branch": "master", "commit": "199dcc2643dec5d8dbdab4ec672cf405224dcb3b" },
+  "arrow.nvim": { "branch": "master", "commit": "6e0f726f55f99332dd726a53effd6813786b6d49" },
   "blame.nvim": { "branch": "main", "commit": "39bb4cda9e658d053a43919b10ca52c0a4d738e1" },
   "ccc.nvim": { "branch": "main", "commit": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "conform.nvim": { "branch": "master", "commit": "a4bb5d6c4ae6f32ab13114e62e70669fa67745b9" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
@@ -18,6 +19,7 @@
   "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
   "hlsearch.nvim": { "branch": "main", "commit": "fdeb60b890d15d9194e8600042e5232ef8c29b0e" },
   "incline.nvim": { "branch": "main", "commit": "27040695b3bbfcd3257669037bd008d1a892831d" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
   "iswap.nvim": { "branch": "master", "commit": "e02cc91f2a8feb5c5a595767d208c54b6e3258ec" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "leap.nvim": { "branch": "main", "commit": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe" },
@@ -29,13 +31,11 @@
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
   "melange-nvim": { "branch": "master", "commit": "2db5407f2f6d6d6286f50f2f7365728d66f6f3ae" },
   "mellifluous.nvim": { "branch": "v1", "commit": "1637e46585435ebda7963248e0e65422effad8d9" },
-  "mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" },
   "nano-theme.nvim": { "branch": "main", "commit": "0b1158c4911f4bd9d5a1e2e7669ebff893435b64" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
   "neogit": { "branch": "master", "commit": "6d1bd94f7fca92a50a892f494920696b5defa8c8" },
   "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" },
   "nordic.nvim": { "branch": "main", "commit": "8627750ece357e9670f9e69853091f7fbb8d6523" },
-  "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
   "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
   "nvim-lspconfig": { "branch": "master", "commit": "0a1ac55d7d4ec2b2ed9616dfc5406791234d1d2b" },
   "nvim-paredit": { "branch": "master", "commit": "cfab7ef0b750a8bd1d4daa6ace93a36ebc60f172" },
@@ -51,7 +51,6 @@
   "persisted.nvim": { "branch": "main", "commit": "b4b7a281307f8b52d47b0fd5b6798a453681d44e" },
   "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
   "quicker.nvim": { "branch": "master", "commit": "1798be71cdcb15fb84fa8054148a56e17fd391dc" },
-  "rabbit.nvim": { "branch": "master", "commit": "3a4ce048b8ecc48811d061220d0e86111adda20d" },
   "rest.nvim": { "branch": "main", "commit": "2ded89dbda1fd3c1430685ffadf2df8beb28336d" },
   "slimline.nvim": { "branch": "main", "commit": "326514876f6e5c051a7a2bf1e926659a74500016" },
   "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" },
diff --git a/nvim/.config/nvim/lua/plugins/convenience.lua b/nvim/.config/nvim/lua/plugins/convenience.lua
index bd8bad6..4415191 100644
--- a/nvim/.config/nvim/lua/plugins/convenience.lua
+++ b/nvim/.config/nvim/lua/plugins/convenience.lua
@@ -20,12 +20,6 @@ return {
       }
     end,
   },
-  {
-    "max397574/better-escape.nvim",
-    config = function(_, opts)
-      require("better_escape").setup(opts)
-    end,
-  },
   {
     "folke/zen-mode.nvim",
     opts = {
diff --git a/nvim/.config/nvim/lua/plugins/editing.lua b/nvim/.config/nvim/lua/plugins/editing.lua
index ac1189d..4ddc8e6 100644
--- a/nvim/.config/nvim/lua/plugins/editing.lua
+++ b/nvim/.config/nvim/lua/plugins/editing.lua
@@ -1,4 +1,18 @@
 return {
+  {
+    "otavioschwanck/arrow.nvim",
+    dependencies = {
+      { "nvim-tree/nvim-web-devicons" },
+      -- or if using `mini.icons`
+      -- { "echasnovski/mini.icons" },
+    },
+    opts = {
+      show_icons = true,
+      leader_key = '-',        -- Recommended to be a single key
+      buffer_leader_key = '+', -- Per Buffer Mappings
+    }
+  },
+
   -- "gc" to comment visual regions/lines
   {
     'numToStr/Comment.nvim',
@@ -21,9 +35,9 @@ return {
   {
     'inkarkat/vim-ReplaceWithRegister',
     keys = {
-      { 'gp',  '<Plug>ReplaceWithRegisterOperator' },
-      { 'gpp', '<Plug>ReplaceWithRegisterLine' },
-      { 'gp',  '<Plug>ReplaceWithRegisterVisual',  mode = 'x' },
+      { '<leader>rp',  '<Plug>ReplaceWithRegisterOperator' },
+      { '<leader>rpp', '<Plug>ReplaceWithRegisterLine' },
+      { '<leader>rp',  '<Plug>ReplaceWithRegisterVisual',  mode = 'x' },
     },
   },
 
@@ -84,11 +98,4 @@ return {
     },
   },
 
-  {
-    'echasnovski/mini.nvim',
-    version = '*',
-    config = function()
-      require('mini.ai').setup()
-    end
-  },
 }
diff --git a/nvim/.config/nvim/lua/plugins/rabbit.lua b/nvim/.config/nvim/lua/plugins/rabbit.lua
deleted file mode 100644
index 033e765..0000000
--- a/nvim/.config/nvim/lua/plugins/rabbit.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-local function rabbit_select(n)
-  require('rabbit').Switch('harpoon').func.select(n)
-end
-
-return {
-  'VoxelPrismatic/rabbit.nvim',
-  event = 'VeryLazy',
-  opts = {
-    window = {
-      float = 'center',
-      plugin_name_position = 'title',
-    },
-    default_keys = {
-      open = { '-', '<leader>;' },
-    },
-    plugin_opts = {
-      history = { switch = ';' },
-      harpoon = { switch = 'f' },
-    },
-    colors = {
-      file = '#EBCB8B',
-    },
-  },
-  keys = {
-    { '<leader>1', function() rabbit_select(1) end },
-    { '<leader>2', function() rabbit_select(2) end },
-    { '<leader>3', function() rabbit_select(3) end },
-    { '<leader>4', function() rabbit_select(4) end },
-    { '<leader>5', function() rabbit_select(5) end },
-    { '<leader>6', function() rabbit_select(6) end },
-    { '<leader>7', function() rabbit_select(7) end },
-    { '<leader>8', function() rabbit_select(8) end },
-    { '<leader>9', function() rabbit_select(9) end },
-    { '<leader>0', function() rabbit_select(10) end },
-  },
-}
diff --git a/shell/.config/shellconfig/aliases.sh b/shell/.config/shellconfig/aliases.sh
index 7d79eba..582aaf0 100644
--- a/shell/.config/shellconfig/aliases.sh
+++ b/shell/.config/shellconfig/aliases.sh
@@ -4,6 +4,8 @@ alias ta='tmux attach -t'
 alias tl='tmux list-sessions'
 alias tn='tmux new -s'
 alias fv='fzf --preview="bat --color=always --theme=Nord {}" --bind="enter:become(nvim {})"'
+alias rgh='rg -.'
+alias fdh='fd -H'
 
 if which exa > /dev/null; then
     alias ls='exa --icons'
diff --git a/shell/.zshrc b/shell/.zshrc
index 48f1f3f..1fb3012 100644
--- a/shell/.zshrc
+++ b/shell/.zshrc
@@ -28,7 +28,6 @@ else
     setopt autocd
 fi
 
-ZVM_VI_INSERT_ESCAPE_BINDKEY=';;'
 ZSH_HIGHLIGHT_STYLES[comment]=fg=blue
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND=bg=magenta,fg=black,bold
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND=bg=red,fg=black,bold