diff --git a/.config/nvim/after/available/leap.rc.lua b/.config/nvim/after/available/leap.rc.lua
deleted file mode 100644
index 971dcd4..0000000
--- a/.config/nvim/after/available/leap.rc.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-local leap = require('leap')
-
-leap.setup {
-  case_insensitive = true,
-  -- Leaving the appropriate list empty effectively disables "smart" mode,
-  -- and forces auto-jump to be on or off.
-  --safe_labels = { . . . },
-  --labels = { . . . },
-  -- These keys are captured directly by the plugin at runtime.
-  special_keys = {
-    repeat_search = '<enter>',
-    next_match    = '<enter>',
-    prev_match    = '<tab>',
-    next_group    = '<space>',
-    prev_group    = '<tab>',
-    eol           = '<space>',
-  },
-}
-
-leap.set_default_keymaps()
diff --git a/.config/nvim/lua/core/config.lua b/.config/nvim/lua/core/config.lua
index 5f0df89..de5fdc0 100644
--- a/.config/nvim/lua/core/config.lua
+++ b/.config/nvim/lua/core/config.lua
@@ -69,8 +69,8 @@ vim.opt.shortmess:remove('F')
 
 vim.opt.signcolumn = "auto"
 
-vim.opt.wildmode = "longest,list,full"
-vim.opt.completeopt = "menu,menuone,noselect"
+vim.opt.wildmode = { "longest", "list", "full" }
+vim.opt.completeopt = { "menu", "menuone", "noselect" }
 
 vim.opt.mouse = ""
 
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
index 594698e..228240a 100644
--- a/.config/nvim/lua/plugins/init.lua
+++ b/.config/nvim/lua/plugins/init.lua
@@ -14,7 +14,6 @@ return {{
 -- Files switch, jump and grep-like tools {{{
 --"inside/vim-search-pulse",
 "MunifTanjim/nui.nvim",
-"ggandor/leap.nvim",
 "nvim-lua/plenary.nvim",
 "nvim-lua/popup.nvim",
 "wellle/targets.vim",
diff --git a/.config/nvim/lua/plugins/leap.lua b/.config/nvim/lua/plugins/leap.lua
new file mode 100644
index 0000000..e9542f9
--- /dev/null
+++ b/.config/nvim/lua/plugins/leap.lua
@@ -0,0 +1,10 @@
+return {
+  'ggandor/leap.nvim',
+  config = function()
+    local leap = require('leap')
+    leap.add_default_mappings()
+    vim.cmd([[
+      autocmd ColorScheme * lua require('leap').init_highlight(true)
+    ]])
+  end
+}