diff --git a/after/plugin/tmux.lua b/after/plugin/tmux.lua
index 97b68a6..962aad9 100644
--- a/after/plugin/tmux.lua
+++ b/after/plugin/tmux.lua
@@ -1,4 +1,4 @@
-vim.keymap.set("n", "c-h>", "<cmd>TmuxNavigateLeft<cr>", { desc = "Window Left" })
-vim.keymap.set("n", "c-j>", "<cmd>TmuxNavigateDown<cr>", { desc = "Window Down" })
-vim.keymap.set("n", "c-k>", "<cmd>TmuxNavigateUp<cr>", { desc = "Window Up" })
-vim.keymap.set("n", "c-l>", "<cmd>TmuxNavigateRight<cr>", { desc = "Window Right" })
+vim.keymap.set("n", "C-h>", "<cmd>TmuxNavigateLeft<cr>", { desc = "Window Left" })
+vim.keymap.set("n", "C-j>", "<cmd>TmuxNavigateDown<cr>", { desc = "Window Down" })
+vim.keymap.set("n", "C-k>", "<cmd>TmuxNavigateUp<cr>", { desc = "Window Up" })
+vim.keymap.set("n", "C-l>", "<cmd>TmuxNavigateRight<cr>", { desc = "Window Right" })
diff --git a/lua/crony/map.lua b/lua/crony/map.lua
index e73fba2..45607c0 100644
--- a/lua/crony/map.lua
+++ b/lua/crony/map.lua
@@ -1,12 +1,42 @@
+local map = vim.keymap.set
+
 -- Leader
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ';'
 
 -- Diagnostic keymaps
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
-vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
+map('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
+map('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
+map('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
+map('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
 
 -- Lsp format
-vim.keymap.set('n', '<leader>f', vim.lsp.buf.format, { desc = "Format current buffer" })
+map('n', '<leader>f', vim.lsp.buf.format, { desc = "Format current buffer" })
+
+-- Move text easilly
+map("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move selected text up" })
+map("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move selected text down" })
+
+-- better find next and previous
+map("n", "n", "nzzzv", { desc = "Keep cursor in middle with search" })
+map("n", "N", "Nzzzv", { desc = "Keep cursor in middle with search" })
+
+map("n", "J", "mzJ`z", { desc = "Move up next line with space in between" })
+
+-- greatest remap ever
+map("x", "<leader>p", [["_dP]], { desc = "Paste while keeping the registry" })
+
+-- source current lua config file
+map("n", "<leader><leader>", function()
+    vim.cmd("so")
+end, { desc = "Source current source file" })
+
+-- better indenting
+map("v", "<", "<gv")
+map("v", ">", ">gv")
+
+-- next greatest remap ever : asbjornHaland ( stolen from the primeagen )
+map({ "n", "v" }, "<leader>y", [["+y]], { desc = "" })
+map("n", "<leader>Y", [["+Y]])
+
+map({ "n", "v" }, "<leader>d", [["_d]])
diff --git a/lua/crony/set.lua b/lua/crony/set.lua
index 5aa7fc5..d736bf4 100644
--- a/lua/crony/set.lua
+++ b/lua/crony/set.lua
@@ -20,9 +20,6 @@ opt.smartindent = true
 -- Enable the mouse, just to have it
 opt.mouse = 'a'
 
--- Enable system clipboard
-opt.clipboard = 'unnamedplus'
-
 -- Enable break indent
 opt.breakindent = true