diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index ac2a8da..12f532b 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -13,21 +13,23 @@ utils.map('n', '<leader>y', '"+y')
 utils.map('n', '<leader>yy', '"+yy')
 
 -- Tabs
-utils.map('n', '<F2>', ':tabnew .<CR>')
-utils.map('i', '<F2>', '<Esc>:tabnew .<CR>')
-utils.map('n', '<S-Right>', ':BufferLineCycleNext<CR>')
-utils.map('n', '<S-Left>', ':BufferLineCyclePrev<CR>')
+utils.map('n', '<F2>', ':tabnew .<CR>', { noremap = true, silent = true })
+utils.map('i', '<F2>', '<Esc>:tabnew .<CR>', { noremap = true, silent = true })
+-- utils.map('n', '<S-Right>', ':BufferLineCycleNext<CR>')
+-- utils.map('n', '<S-Left>', ':BufferLineCyclePrev<CR>')
+utils.map('n', '<S-Right>', ':tabnext<CR>', { noremap = true, silent = true })
+utils.map('n', '<S-Left>', ':tabprevious<CR>', { noremap = true, silent = true })
 -- Split movement
-utils.map('n', '<A-Up>', ':wincmd k<CR>')
-utils.map('n', '<A-Down>', ':wincmd j<CR>')
-utils.map('n', '<A-Left>', ':wincmd h<CR>')
-utils.map('n', '<A-Right>', ':wincmd l<CR>')
+utils.map('n', '<A-Up>', ':wincmd k<CR>', { noremap = true, silent = true })
+utils.map('n', '<A-Down>', ':wincmd j<CR>', { noremap = true, silent = true })
+utils.map('n', '<A-Left>', ':wincmd h<CR>', { noremap = true, silent = true })
+utils.map('n', '<A-Right>', ':wincmd l<CR>', { noremap = true, silent = true })
 -- Open a new vertical split window with Ctrl - F2
-utils.map('n', '<C-F2>', ':vsplit .<CR>')
-utils.map('i', '<C-F2>', '<Esc>:vsplit .<CR>')
+utils.map('n', '<C-F2>', ':vsplit .<CR>', { noremap = true, silent = true })
+utils.map('i', '<C-F2>', '<Esc>:vsplit .<CR>', { noremap = true, silent = true })
 -- Open a new horizontal split window with Shift - F2
-utils.map('n', '<S-F2>', ':split .<CR>')
-utils.map('i', '<S-F2>', '<Esc>:split .<CR>')
+utils.map('n', '<S-F2>', ':split .<CR>', { noremap = true, silent = true })
+utils.map('i', '<S-F2>', '<Esc>:split .<CR>', { noremap = true, silent = true })
 
 utils.map('n', '<C-S>', ':wa<CR>')
 
@@ -53,8 +55,8 @@ utils.map('v', '<', '<gv')
 utils.map('v', '>', '>gv')
 
 -- Highlight word under cursor
-utils.map('n', 'ü', ":let @/='\\<<C-R>=expand(\"<cword>\")<CR>\\>'<CR>:set hls<CR>")
-utils.map('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>")
+utils.map('n', 'ü', ":let @/='\\<<C-R>=expand(\"<cword>\")<CR>\\>'<CR>:set hls<CR>", { noremap = true, silent = true })
+utils.map('v', 'ü', "y:let @/='<C-R>=escape(@\",'/\\')<CR>'<CR>:set hls<CR>", { noremap = true, silent = true })
 
 -- Close Buffer 
 utils.map('n', '<C-w>', ':bd<CR>')