diff --git a/nvim/after/plugin/blamer.lua b/nvim/after/plugin/blamer.lua
index dc55c3c..a044d18 100644
--- a/nvim/after/plugin/blamer.lua
+++ b/nvim/after/plugin/blamer.lua
@@ -1,5 +1,5 @@
 -- https://github.com/APZelos/blamer.nvim
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 vim.g.blamer_enabled = 0
diff --git a/nvim/after/plugin/export-to-vscode.lua b/nvim/after/plugin/export-to-vscode.lua
index 52a0c8c..00daf43 100644
--- a/nvim/after/plugin/export-to-vscode.lua
+++ b/nvim/after/plugin/export-to-vscode.lua
@@ -1,5 +1,5 @@
 --- https://github.com/elijahmanor/export-to-vscode.nvim
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 -- Keymaps
diff --git a/nvim/after/plugin/fzf.lua b/nvim/after/plugin/fzf.lua
index 4be23a1..fb25bf0 100644
--- a/nvim/after/plugin/fzf.lua
+++ b/nvim/after/plugin/fzf.lua
@@ -4,7 +4,7 @@ if not cmp_status_ok then
 	return
 end
 
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 fzf_lua.setup({
diff --git a/nvim/after/plugin/harpoon.lua b/nvim/after/plugin/harpoon.lua
index edfb785..2c30e82 100644
--- a/nvim/after/plugin/harpoon.lua
+++ b/nvim/after/plugin/harpoon.lua
@@ -4,7 +4,7 @@ if not status then
 	return
 end
 
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 harpoon.setup()
diff --git a/nvim/after/plugin/project.lua b/nvim/after/plugin/project.lua
index 84d7f35..1dadf47 100644
--- a/nvim/after/plugin/project.lua
+++ b/nvim/after/plugin/project.lua
@@ -24,7 +24,7 @@ project.setup({
 	datapath = vim.fn.stdpath("data"),
 })
 
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 keymap("n", "<leader>pm", [[<Cmd>:Telescope projects<CR>]], opts)
diff --git a/nvim/after/plugin/telescope.lua b/nvim/after/plugin/telescope.lua
index 03d9324..6503063 100644
--- a/nvim/after/plugin/telescope.lua
+++ b/nvim/after/plugin/telescope.lua
@@ -4,7 +4,7 @@ if not status_ok then
 	return
 end
 
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 local actions = require("telescope.actions")
diff --git a/nvim/after/plugin/toggleterm.lua b/nvim/after/plugin/toggleterm.lua
index e08479c..57c215d 100644
--- a/nvim/after/plugin/toggleterm.lua
+++ b/nvim/after/plugin/toggleterm.lua
@@ -97,7 +97,7 @@ function _PYTHON_TOGGLE()
 	python:toggle()
 end
 
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 -- Keymaps
diff --git a/nvim/after/plugin/vimux.lua b/nvim/after/plugin/vimux.lua
index 5f0759a..3ab4145 100644
--- a/nvim/after/plugin/vimux.lua
+++ b/nvim/after/plugin/vimux.lua
@@ -1,5 +1,5 @@
 -- https://github.com/preservim/vimux
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 
 vim.g.VimuxHeight = "30"
diff --git a/nvim/lua/kogakure/functions.lua b/nvim/lua/kogakure/functions.lua
index 91cef2a..dfefd7a 100644
--- a/nvim/lua/kogakure/functions.lua
+++ b/nvim/lua/kogakure/functions.lua
@@ -1,4 +1,4 @@
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 local opts = { noremap = true, silent = true }
 local cfg = vim.fn.stdpath("config")
 
diff --git a/nvim/lua/kogakure/text-objects.lua b/nvim/lua/kogakure/text-objects.lua
index 256eeb4..4027855 100644
--- a/nvim/lua/kogakure/text-objects.lua
+++ b/nvim/lua/kogakure/text-objects.lua
@@ -1,4 +1,4 @@
-local keymap = vim.api.nvim_set_keymap
+local keymap = vim.keymap.set
 
 -- Basic Text Objects
 function Basic_text_objects()