diff --git a/nvim/.config/nvim/after/plugin/hlslens.vim b/nvim/.config/nvim/after/plugin/hlslens.vim
new file mode 100644
index 0000000..13ffccb
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/hlslens.vim
@@ -0,0 +1,8 @@
+noremap <silent> n <Cmd>execute('normal! ' . v:count1 . 'n')<CR><Cmd>lua require('hlslens').start()<CR>zz
+noremap <silent> N <Cmd>execute('normal! ' . v:count1 . 'N')<CR><Cmd>lua require('hlslens').start()<CR>zz
+
+noremap * *<Cmd>lua require('hlslens').start()<CR>
+noremap # #<Cmd>lua require('hlslens').start()<CR>
+
+noremap g* g*<Cmd>lua require('hlslens').start()<CR>
+noremap g# g#<Cmd>lua require('hlslens').start()<CR>
diff --git a/nvim/.config/nvim/colors/yolokai.vim b/nvim/.config/nvim/colors/yolokai.vim
index c064c0a..96ae40a 100644
--- a/nvim/.config/nvim/colors/yolokai.vim
+++ b/nvim/.config/nvim/colors/yolokai.vim
@@ -619,6 +619,11 @@ local highlight_groups = {
 	ConflictMarkerOurs                = {bg=black,  fg=green,   style=NONE },
 	ConflictMarkerTheirs              = {bg=black,  fg=red,     style=NONE },
 	ConflictMarkerCommonAncestorsHunk = {bg=black,  fg=orange,  style=NONE },
+
+	--[[ 4.4.13 hlslens ]]
+	HlSearchLensCur = 'SearchLight',
+	HlSearchLens    = 'IncSearch',
+	HlSearchCur     = 'SearchLight',
 }
 
 -- We do not care about terminals which do not support 256 colors
diff --git a/nvim/.config/nvim/lua/keymappings.lua b/nvim/.config/nvim/lua/keymappings.lua
index 50da127..a8f71d6 100644
--- a/nvim/.config/nvim/lua/keymappings.lua
+++ b/nvim/.config/nvim/lua/keymappings.lua
@@ -101,11 +101,6 @@ remap('n', '<Leader>n', ':nohlsearch<CR>', { noremap = true, silent = true })
 remap('n', '0', '^', { noremap = true })
 -- Just in case you need to go to the very beginning of a line
 remap('n', '^', '0', { noremap = true })
--- Centre the window on each search movement
-remap('n', 'n', 'nzz', { noremap = true })
-remap('n', 'N', 'Nzz', { noremap = true })
-remap('v', 'n', 'nzz', { noremap = true })
-remap('v', 'N', 'Nzz', { noremap = true })
 
 -- Make dot work on visually selected lines
 remap('v', '.', ':norm.<CR>', { noremap = true })
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index a30f226..75dd780 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -18,7 +18,7 @@ local init = function ()
     'junegunn/fzf.vim',
     config = "require('modules.fzf')"
   }
-  use 'PeterRincker/vim-searchlight'
+  use 'kevinhwang91/nvim-hlslens'
   use 'wincent/ferret'
   use 'lambdalisue/reword.vim'
   -- Remove extraneous whitespace when edit mode is exited