diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index 1b7561a..3f272f3 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -31,10 +31,10 @@ vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>')
 vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>')
 
 -- Resize windows
-vim.keymap.set('n', '<C-S-l>', '<cmd>wincmd 15 ><CR>', { desc = 'Increase window width' })
-vim.keymap.set('n', '<C-S-h>', '<cmd>wincmd 15 <<CR>', { desc = 'Decrease window width' })
-vim.keymap.set('n', '<C-S-k>', '<cmd>wincmd 5 +<CR>', { desc = 'Increase window height' })
-vim.keymap.set('n', '<C-S-j>', '<cmd>wincmd 5 -<CR>', { desc = 'Decrease window height' })
+vim.keymap.set('n', '<C-Up>', '<cmd>resize +2<cr>', { desc = 'Increase Window Height' })
+vim.keymap.set('n', '<C-Down>', '<cmd>resize -2<cr>', { desc = 'Decrease Window Height' })
+vim.keymap.set('n', '<C-Left>', '<cmd>vertical resize -2<cr>', { desc = 'Decrease Window Width' })
+vim.keymap.set('n', '<C-Right>', '<cmd>vertical resize +2<cr>', { desc = 'Increase Window Width' })
 vim.keymap.set('n', '<C-S-0>', '<cmd>wincmd =<CR>', { desc = 'Set height/width equal' })
 
 -- Keybinds to make split navigation easier.
@@ -46,18 +46,35 @@ vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right win
 vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
 vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
 
--- Normal-mode commands
-vim.keymap.set('n', '<A-j>', '<cmd>MoveLine(1)<CR>')
-vim.keymap.set('n', '<A-k>', '<cmd>MoveLine(-1)<CR>')
-vim.keymap.set('n', '<A-h>', '<cmd>MoveHChar(-1)<CR>')
-vim.keymap.set('n', '<A-l>', '<cmd>MoveHChar(1)<CR>')
-vim.keymap.set('n', '<leader>wf', '<cmd>MoveWord(1)<CR>')
-vim.keymap.set('n', '<leader>wb', '<cmd>MoveWord(-1)<CR>')
+-- Move Lines
+vim.keymap.set('n', '<A-j>', '<cmd>m .+1<cr>==', { desc = 'Move Down' })
+vim.keymap.set('n', '<A-k>', '<cmd>m .-2<cr>==', { desc = 'Move Up' })
+vim.keymap.set('i', '<A-j>', '<esc><cmd>m .+1<cr>==gi', { desc = 'Move Down' })
+vim.keymap.set('i', '<A-k>', '<esc><cmd>m .-2<cr>==gi', { desc = 'Move Up' })
+vim.keymap.set('v', '<A-j>', ":m '>+1<cr>gv=gv", { desc = 'Move Down' })
+vim.keymap.set('v', '<A-k>', ":m '<-2<cr>gv=gv", { desc = 'Move Up' })
 
--- Visual-mode commands
-vim.keymap.set('v', '<A-j>', '<cmd>MoveBlock(1)<CR>')
-vim.keymap.set('v', '<A-k>', '<cmd>MoveBlock(-1)<CR>')
-vim.keymap.set('v', '<A-h>', '<cmd>MoveHBlock(-1)<CR>')
-vim.keymap.set('v', '<A-l>', '<cmd>MoveHBlock(1)<CR>')
+-- https://github.com/mhinz/vim-galore#saner-behavior-of-n-and-n
+vim.keymap.set('n', 'n', "'Nn'[v:searchforward].'zv'", { expr = true, desc = 'Next Search Result' })
+vim.keymap.set('x', 'n', "'Nn'[v:searchforward]", { expr = true, desc = 'Next Search Result' })
+vim.keymap.set('o', 'n', "'Nn'[v:searchforward]", { expr = true, desc = 'Next Search Result' })
+vim.keymap.set('n', 'N', "'nN'[v:searchforward].'zv'", { expr = true, desc = 'Prev Search Result' })
+vim.keymap.set('x', 'N', "'nN'[v:searchforward]", { expr = true, desc = 'Prev Search Result' })
+vim.keymap.set('o', 'N', "'nN'[v:searchforward]", { expr = true, desc = 'Prev Search Result' })
+
+-- Buffers
+vim.keymap.set('n', '<S-h>', '<cmd>bprevious<cr>', { desc = 'Prev Buffer' })
+vim.keymap.set('n', '<S-l>', '<cmd>bnext<cr>', { desc = 'Next Buffer' })
+vim.keymap.set('n', '<leader>bb', '<cmd>e #<cr>', { desc = 'Switch to Other Buffer' })
+vim.keymap.set('n', '<leader>bD', '<cmd>:bd<cr>', { desc = 'Delete Buffer and Window' })
+
+-- Tabs
+vim.keymap.set('n', '<leader><tab>l', '<cmd>tablast<cr>', { desc = 'Last Tab' })
+vim.keymap.set('n', '<leader><tab>o', '<cmd>tabonly<cr>', { desc = 'Close Other Tabs' })
+vim.keymap.set('n', '<leader><tab>f', '<cmd>tabfirst<cr>', { desc = 'First Tab' })
+vim.keymap.set('n', '<leader><tab><tab>', '<cmd>tabnew<cr>', { desc = 'New Tab' })
+vim.keymap.set('n', '<leader><tab>d', '<cmd>tabclose<cr>', { desc = 'Close Tab' })
+vim.keymap.set('n', '<leader><tab>]', '<cmd>tabnext<cr>', { desc = 'Next Tab' })
+vim.keymap.set('n', '<leader><tab>[', '<cmd>tabprevious<cr>', { desc = 'Previous Tab' })
 
 -- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua
index daf934a..4e0cfd0 100644
--- a/lua/lazy-plugins.lua
+++ b/lua/lazy-plugins.lua
@@ -16,9 +16,6 @@ require('lazy').setup({
   -- Remember position
   { 'vladdoster/remember.nvim', opts = {} },
 
-  -- Move lines
-  { 'fedepujol/move.nvim', opts = { noremap = true, silent = true } },
-
   -- NOTE: Plugins can also be added by using a table,
   -- with the first argument being the link and the following
   -- keys can be used to configure plugin behavior/loading/etc.