diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua
index befeecc..94c0d34 100644
--- a/lua/config/autocmds.lua
+++ b/lua/config/autocmds.lua
@@ -47,3 +47,9 @@ vim.api.nvim_create_autocmd({ 'WinLeave', 'InsertEnter' }, {
     end
   end,
 })
+
+-- Removes trailing whitespace before saving
+vim.api.nvim_create_autocmd({ 'BufWritePre' }, {
+  pattern = '*',
+  command = [[%s/\s\+$//e]],
+})
diff --git a/lua/config/clipboard.lua b/lua/config/clipboard.lua
index 984aab8..2dc7e12 100644
--- a/lua/config/clipboard.lua
+++ b/lua/config/clipboard.lua
@@ -12,9 +12,9 @@ if vim.env.CONTAINER then
   }
 end
 
-vim.schedule(function()
-  vim.opt.clipboard = 'unnamedplus'
-end)
+-- vim.schedule(function()
+--   vim.opt.clipboard = 'unnamedplus'
+-- end)
 
 -- TEMP: Check if it helps with edge cases
 vim.api.nvim_create_user_command('FixClipboard', function()
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 558464f..90d5aac 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -1,54 +1,77 @@
-local map = vim.keymap.set
+-- Helper functions
+local function map(mode, lhs, rhs)
+  vim.keymap.set(mode, lhs, rhs, { silent = true })
+end
 
-map('n', '<leader>q', vim.diagnostic.setloclist)
+local function cmd(str)
+  return '<cmd>' .. str .. '<CR>'
+end
 
-map({ 'i', 'c' }, 'jk', '<Esc>')
-map('n', '<Esc>', '<cmd>nohlsearch<CR>')
+-- QOL
+map('i', 'jk', '<Esc>')
+map('n', '<Esc>', cmd('nohlsearch'))
+map('n', 'q:', '<nop>')
 
--- Prevent overriding the register
-map('n', 'x', '"_x')
+vim.keymap.set('n', 'J', 'mzJ`z')
+vim.keymap.set('n', 'n', 'nzzzv')
+vim.keymap.set('n', 'N', 'Nzzzv')
 
---  Window Navigation
+vim.keymap.set('x', 'J', ":m '>+1<CR>gv=gv")
+vim.keymap.set('x', 'K', ":m '<-2<CR>gv=gv")
+
+vim.keymap.set('n', '<leader>s', [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/g<Left><Left><Left>]])
+
+-- Proper registers
+map('x', '<leader>p', '"_dP')
+map({ 'n', 'x' }, '<leader>y', '"+y')
+map('n', '<leader>Y', '"+y$')
+map({ 'n', 'x' }, '<leader>d', '"_d')
+map({ 'n', 'x' }, 'x', '"_x')
+
+-- Window navigation
 map('n', '<C-h>', '<C-w>h')
 map('n', '<C-l>', '<C-w>l')
 map('n', '<C-j>', '<C-w>j')
 map('n', '<C-k>', '<C-w>k')
 
 -- Tab management
-map('n', '<Leader>tn', ':tabnew<CR>')
-map('n', '<Leader>tc', ':tabclose<CR>')
-map('n', '<Leader>tl', ':tabnext<CR>')
-map('n', '<Leader>th', ':tabprevious<CR>')
-map('n', '<Leader>tm.', ':tabmove +1<CR>')
-map('n', '<Leader>tm,', ':tabmove -1<CR>')
+map('n', ']t', cmd('tabnext'))
+map('n', '[t', cmd('tabprevious'))
+map('n', '<leader>tt', cmd('tabnew'))
+map('n', '<leader>tn', cmd('tabnew'))
+map('n', '<leader>tc', cmd('tabclose'))
+map('n', '<Leader>tl', cmd('tabmove +1'))
+map('n', '<Leader>th', cmd('tabmove -1'))
 for i = 1, 9 do
-  map('n', string.format('<Leader>%d', i), string.format('%dgt', i))
+  map('n', string.format('<Leader>t%d', i), string.format('%dgt', i))
 end
 
--- Buffer Management
--- map('n', '<Leader>bl', ':ls<CR>')
--- map('n', '<Leader>bd', ':bdelete<CR>')
--- map('n', ']b', ':bnext<CR>')
--- map('n', '[b', ':bprevious<CR>')
--- map('n', '<Leader>bb', ':b<Space>')
--- map('n', '<Leader>bo', ':bufdo bd|1bd<CR>')
+-- Buffer management
+map('n', ']b', cmd('bnext'))
+map('n', '[b', cmd('bprevious'))
+map('n', '<leader>bl', cmd('ls'))
+map('n', '<leader>bb', '<C-^>') -- toggle between buffers
+map('n', '<leader>bd', cmd('bdelete'))
+map('n', '<leader>bo', cmd('%bd|e#')) -- close all except current
 
 -- Terminal
-map('n', '<leader>tt', ':TermDefault<CR>')
-map('n', '<leader>tr', ':TermRelative<CR>')
-map('n', '<leader>ts', ':TermSplit<CR>')
-map('n', '<leader>tv', ':TermVSplit<CR>')
-
--- Terminal mode mappings
-local tn = '<C-\\><C-n>'
-map('t', '<Esc>', tn)
-map('t', 'jk', tn)
-map('t', '<C-w>', tn .. '<C-w>')
-map('t', '<C-h>', '<cmd>wincmd h<CR>')
-map('t', '<C-j>', '<cmd>wincmd j<CR>')
-map('t', '<C-k>', '<cmd>wincmd k<CR>')
-map('t', '<C-l>', '<cmd>wincmd l<CR>')
+map('n', '<leader>xx', cmd('TermDefault'))
+map('n', '<leader>xr', cmd('TermRelative'))
+map('n', '<leader>xs', cmd('TermSplit'))
+map('n', '<leader>xv', cmd('TermVSplit'))
+map('t', '<Esc>', '<C-\\><C-n>')
+map('t', '<C-w>', '<C-\\><C-n><C-w>')
+map('t', '<C-w>c', '<C-\\><C-n>:bd!<CR>')
 
 -- File explorer
-vim.keymap.set('n', '<leader>e', '<cmd>NvimTreeToggle<CR>')
-vim.keymap.set('n', '<leader>E', '<cmd>NvimTreeOpen<CR>')
+map('n', '<leader>e', cmd('NvimTreeToggle'))
+map('n', '<leader>E', cmd('NvimTreeOpen'))
+
+-- Diagnostics
+map('n', ']d', function()
+  vim.diagnostic.jump({ count = 1, float = true })
+end)
+map('n', '[d', function()
+  vim.diagnostic.jump({ count = -1, float = true })
+end)
+map('n', '<leader>q', vim.diagnostic.setloclist)