diff --git a/config/nvim/lua/nifoc/config/yoink.lua b/config/nvim/lua/nifoc/config/yoink.lua
index 6a5cac7..fc65e77 100644
--- a/config/nvim/lua/nifoc/config/yoink.lua
+++ b/config/nvim/lua/nifoc/config/yoink.lua
@@ -2,3 +2,4 @@ vim.g.yoinkIncludeDeleteOperations = 1
 
 vim.cmd('packadd! vim-cutlass')
 vim.cmd('packadd! vim-yoink')
+vim.cmd('packadd! vim-subversive')
diff --git a/config/nvim/lua/nifoc/keymap.lua b/config/nvim/lua/nifoc/keymap.lua
index 484dab1..d970585 100644
--- a/config/nvim/lua/nifoc/keymap.lua
+++ b/config/nvim/lua/nifoc/keymap.lua
@@ -129,12 +129,14 @@ function M.setup()
   vim.api.nvim_set_keymap('i', '<S-Right>', '<C-o>$', {noremap = true})
 
   -- vim-yoink
-  vim.api.nvim_set_keymap('n', 'p', '<Plug>(YoinkPaste_p)')
-  vim.api.nvim_set_keymap('n', 'P', '<Plug>(YoinkPaste_P)')
-  vim.api.nvim_set_keymap('n', 'gp', '<Plug>(YoinkPaste_gp)')
-  vim.api.nvim_set_keymap('n', 'gP', '<Plug>(YoinkPaste_gP)')
-  vim.api.nvim_set_keymap('n', 'y', '<Plug>(YoinkYankPreserveCursorPosition)')
-  vim.api.nvim_set_keymap('x', 'y', '<Plug>(YoinkYankPreserveCursorPosition)')
+  vim.api.nvim_set_keymap('n', 'p', '<Plug>(YoinkPaste_p)', {noremap = false})
+  vim.api.nvim_set_keymap('n', 'P', '<Plug>(YoinkPaste_P)', {noremap = false})
+  vim.api.nvim_set_keymap('x', 'p', '<Plug>(SubversiveSubstitute)', {noremap = false})
+  vim.api.nvim_set_keymap('x', 'P', '<Plug>(SubversiveSubstitute)', {noremap = false})
+  vim.api.nvim_set_keymap('n', 'gp', '<Plug>(YoinkPaste_gp)', {noremap = false})
+  vim.api.nvim_set_keymap('n', 'gP', '<Plug>(YoinkPaste_gP)', {noremap = false})
+  vim.api.nvim_set_keymap('n', 'y', '<Plug>(YoinkYankPreserveCursorPosition)', {noremap = false})
+  vim.api.nvim_set_keymap('x', 'y', '<Plug>(YoinkYankPreserveCursorPosition)', {noremap = false})
 
   vim.api.nvim_set_keymap('n', '<C-t>', '<cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true})
   vim.api.nvim_set_keymap('t', '<C-t>', '<C-\\><C-n><cmd>lua require("FTerm").toggle()<CR>', {noremap = true, silent = true})
diff --git a/programs/nvim/default.nix b/programs/nvim/default.nix
index 0986107..3533653 100644
--- a/programs/nvim/default.nix
+++ b/programs/nvim/default.nix
@@ -37,7 +37,6 @@ in
 
     plugins = with customPlugins; [
       # Fixes
-      impatient-nvim
       FixCursorHold-nvim
       vim-auto-cursorline
 
@@ -50,6 +49,7 @@ in
       which-key-nvim
       { plugin = vim-yoink; optional = true; }
       { plugin = vim-cutlass; optional = true; }
+      { plugin = vim-subversive; optional = true; }
 
       # Themes
       dracula-nvim
diff --git a/programs/nvim/plugins.nix b/programs/nvim/plugins.nix
index 31a25db..010d8af 100644
--- a/programs/nvim/plugins.nix
+++ b/programs/nvim/plugins.nix
@@ -1,18 +1,6 @@
 # This file has been auto-generated
 { pkgs, ... }:
 {
-  impatient-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
-    pname = "impatient.nvim";
-    version = "282b99b";
-    src = pkgs.fetchFromGitHub {
-      owner = "lewis6991";
-      repo = "impatient.nvim";
-      rev = "282b99b817d61e6c6860addf5629b641925a937a";
-      sha256 = "RtXtmtfpPAtZuDSn/eKaX12w1BybqUeWoKVGV2yEMCM=";
-      fetchSubmodules = false;
-    };
-    meta.homepage = "https://github.com/lewis6991/impatient.nvim";
-  };
   FixCursorHold-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "FixCursorHold.nvim";
     version = "0e4e22d";
@@ -73,6 +61,18 @@
     };
     meta.homepage = "https://github.com/svermeulen/vim-cutlass";
   };
+  vim-subversive = pkgs.vimUtils.buildVimPluginFrom2Nix {
+    pname = "vim-subversive";
+    version = "5695f97";
+    src = pkgs.fetchFromGitHub {
+      owner = "svermeulen";
+      repo = "vim-subversive";
+      rev = "5695f97fc803767bf657a5e512daec19dd1fd786";
+      sha256 = "+OIkKMwZsW6h5LCkI1mBspFUkCtqIX5RXdiLN+bbelI=";
+      fetchSubmodules = false;
+    };
+    meta.homepage = "https://github.com/svermeulen/vim-subversive";
+  };
   dracula-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
     pname = "dracula.nvim";
     version = "aa9d195";
diff --git a/programs/nvim/plugins.txt b/programs/nvim/plugins.txt
index 2102f40..ac93b9b 100644
--- a/programs/nvim/plugins.txt
+++ b/programs/nvim/plugins.txt
@@ -1,9 +1,9 @@
-lewis6991/impatient.nvim
 antoinemadec/FixCursorHold.nvim
 delphinus/vim-auto-cursorline
 folke/which-key.nvim
 svermeulen/vim-yoink
 svermeulen/vim-cutlass
+svermeulen/vim-subversive
 Mofiqul/dracula.nvim
 nvim-treesitter/nvim-treesitter
 nvim-treesitter/playground