diff --git a/init.vim b/init.vim
index ebcf082..6df9486 100644
--- a/init.vim
+++ b/init.vim
@@ -17,7 +17,6 @@ set nofoldenable
 
 "colorscheme tokyonight-storm
 
-lua require("kanagawa")
 colorscheme kanagawa
 
 let g:blamer_enabled = 1
diff --git a/lua/init.lua b/lua/init.lua
index 0c03295..95760db 100644
--- a/lua/init.lua
+++ b/lua/init.lua
@@ -112,6 +112,8 @@ require('lualine').setup {
   extensions = {}
 }
 
+require("kanagawa").setup()
+
 vim.api.nvim_create_autocmd("TermClose", {
 	callback = function() 
 		vim.cmd("close")
diff --git a/lua/keymap.lua b/lua/keymap.lua
index 575c08d..dbb0d06 100644
--- a/lua/keymap.lua
+++ b/lua/keymap.lua
@@ -34,5 +34,24 @@ map("n", "<leader>0", ":tablast<cr>")
 
 map("n", "<leader><F9>", ":call vimspector#ToggleBreakpoint( input( \"Enter condition: \" ) )<CR>")
 
+map("", "<UP>", "<NOP>")
+map("", "<DOWN>", "<NOP>")
+map("", "<RIGHT>", "<NOP>")
+map("", "<LEFT>", "<NOP>")
+
+map("i", "<UP>", "<NOP>")
+map("i", "<DOWN>", "<NOP>")
+map("i", "<RIGHT>", "<NOP>")
+map("i", "<LEFT>", "<NOP>")
+
 map("n", "<leader>t", ":bo 15split +term<CR>")
 map("t", "<ESC>", "<C-\\><C-N>")
+
+map("n", "<A-j>", ":m .+1<CR>==")
+map("n", "<A-k>", ":m .-2<CR>==")
+
+map("i", "<A-j>", "<Esc>:m .+1<CR>==gi")
+map("i", "<A-k>", "<Esc>:m .-2<CR>==gi")
+
+map("v", "<A-j>", ":m '>+1<CR>gv=gv")
+map("v", "<A-k>", ":m '<-2<CR>gv=gv")