diff --git a/init.lua b/init.lua
index 7328a90..8dc7d6d 100644
--- a/init.lua
+++ b/init.lua
@@ -12,5 +12,6 @@
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("vim-options")
+require("vim-remap")
 require("lazy").setup("plugins")
+require("vim-options")

diff --git a/init.lua b/init.lua
index 7328a90..8dc7d6d 100644
--- a/init.lua
+++ b/init.lua
@@ -12,5 +12,6 @@
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("vim-options")
+require("vim-remap")
 require("lazy").setup("plugins")
+require("vim-options")
diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 4d4c7bc..af044bc 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -1,5 +1,21 @@
 return {
   {
+    "codota/tabnine-nvim",
+    build = "./dl_binaries.sh",
+
+    config = function()
+      require("tabnine").setup({
+        disable_auto_comment = true,
+        accept_keymap = "<Tab>",
+        dismiss_keymap = "<C-]>",
+        debounce_ms = 800,
+        suggestion_color = { gui = "#808080", cterm = 244 },
+        exclude_filetypes = { "TelescopePrompt", "NvimTree" },
+        log_file_path = nil, -- absolute path to Tabnine log file
+      })
+    end,
+  },
+  {
     "hrsh7th/cmp-nvim-lsp",
   },
   {
@@ -31,6 +47,8 @@
           ["<C-Space>"] = cmp.mapping.complete(),
           ["<C-e>"] = cmp.mapping.abort(),
           ["<CR>"] = cmp.mapping.confirm({ select = true }),
+          ["<C-k>"] = cmp.mapping.select_next_item(),
+          ["<C-j>"] = cmp.mapping.select_prev_item(),
         }),
         sources = cmp.config.sources({
           { name = "nvim_lsp" },

diff --git a/init.lua b/init.lua
index 7328a90..8dc7d6d 100644
--- a/init.lua
+++ b/init.lua
@@ -12,5 +12,6 @@
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("vim-options")
+require("vim-remap")
 require("lazy").setup("plugins")
+require("vim-options")
diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 4d4c7bc..af044bc 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -1,5 +1,21 @@
 return {
   {
+    "codota/tabnine-nvim",
+    build = "./dl_binaries.sh",
+
+    config = function()
+      require("tabnine").setup({
+        disable_auto_comment = true,
+        accept_keymap = "<Tab>",
+        dismiss_keymap = "<C-]>",
+        debounce_ms = 800,
+        suggestion_color = { gui = "#808080", cterm = 244 },
+        exclude_filetypes = { "TelescopePrompt", "NvimTree" },
+        log_file_path = nil, -- absolute path to Tabnine log file
+      })
+    end,
+  },
+  {
     "hrsh7th/cmp-nvim-lsp",
   },
   {
@@ -31,6 +47,8 @@
           ["<C-Space>"] = cmp.mapping.complete(),
           ["<C-e>"] = cmp.mapping.abort(),
           ["<CR>"] = cmp.mapping.confirm({ select = true }),
+          ["<C-k>"] = cmp.mapping.select_next_item(),
+          ["<C-j>"] = cmp.mapping.select_prev_item(),
         }),
         sources = cmp.config.sources({
           { name = "nvim_lsp" },
diff --git a/lua/plugins/lua-line.lua b/lua/plugins/lua-line.lua
deleted file mode 100644
index 3d63d65..0000000
--- a/lua/plugins/lua-line.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-	"nvim-lualine/lualine.nvim",
-	dependencies = { "nvim-tree/nvim-web-devicons" },
-	config = function()
-		require("lualine").setup({
-			options = {
-				theme = "codedark",
-			},
-		})
-	end,
-}

diff --git a/init.lua b/init.lua
index 7328a90..8dc7d6d 100644
--- a/init.lua
+++ b/init.lua
@@ -12,5 +12,6 @@
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("vim-options")
+require("vim-remap")
 require("lazy").setup("plugins")
+require("vim-options")
diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 4d4c7bc..af044bc 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -1,5 +1,21 @@
 return {
   {
+    "codota/tabnine-nvim",
+    build = "./dl_binaries.sh",
+
+    config = function()
+      require("tabnine").setup({
+        disable_auto_comment = true,
+        accept_keymap = "<Tab>",
+        dismiss_keymap = "<C-]>",
+        debounce_ms = 800,
+        suggestion_color = { gui = "#808080", cterm = 244 },
+        exclude_filetypes = { "TelescopePrompt", "NvimTree" },
+        log_file_path = nil, -- absolute path to Tabnine log file
+      })
+    end,
+  },
+  {
     "hrsh7th/cmp-nvim-lsp",
   },
   {
@@ -31,6 +47,8 @@
           ["<C-Space>"] = cmp.mapping.complete(),
           ["<C-e>"] = cmp.mapping.abort(),
           ["<CR>"] = cmp.mapping.confirm({ select = true }),
+          ["<C-k>"] = cmp.mapping.select_next_item(),
+          ["<C-j>"] = cmp.mapping.select_prev_item(),
         }),
         sources = cmp.config.sources({
           { name = "nvim_lsp" },
diff --git a/lua/plugins/lua-line.lua b/lua/plugins/lua-line.lua
deleted file mode 100644
index 3d63d65..0000000
--- a/lua/plugins/lua-line.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-	"nvim-lualine/lualine.nvim",
-	dependencies = { "nvim-tree/nvim-web-devicons" },
-	config = function()
-		require("lualine").setup({
-			options = {
-				theme = "codedark",
-			},
-		})
-	end,
-}
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
new file mode 100644
index 0000000..3d63d65
--- /dev/null
+++ b/lua/plugins/lualine.lua
@@ -0,0 +1,11 @@
+return {
+	"nvim-lualine/lualine.nvim",
+	dependencies = { "nvim-tree/nvim-web-devicons" },
+	config = function()
+		require("lualine").setup({
+			options = {
+				theme = "codedark",
+			},
+		})
+	end,
+}

diff --git a/init.lua b/init.lua
index 7328a90..8dc7d6d 100644
--- a/init.lua
+++ b/init.lua
@@ -12,5 +12,6 @@
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("vim-options")
+require("vim-remap")
 require("lazy").setup("plugins")
+require("vim-options")
diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 4d4c7bc..af044bc 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -1,5 +1,21 @@
 return {
   {
+    "codota/tabnine-nvim",
+    build = "./dl_binaries.sh",
+
+    config = function()
+      require("tabnine").setup({
+        disable_auto_comment = true,
+        accept_keymap = "<Tab>",
+        dismiss_keymap = "<C-]>",
+        debounce_ms = 800,
+        suggestion_color = { gui = "#808080", cterm = 244 },
+        exclude_filetypes = { "TelescopePrompt", "NvimTree" },
+        log_file_path = nil, -- absolute path to Tabnine log file
+      })
+    end,
+  },
+  {
     "hrsh7th/cmp-nvim-lsp",
   },
   {
@@ -31,6 +47,8 @@
           ["<C-Space>"] = cmp.mapping.complete(),
           ["<C-e>"] = cmp.mapping.abort(),
           ["<CR>"] = cmp.mapping.confirm({ select = true }),
+          ["<C-k>"] = cmp.mapping.select_next_item(),
+          ["<C-j>"] = cmp.mapping.select_prev_item(),
         }),
         sources = cmp.config.sources({
           { name = "nvim_lsp" },
diff --git a/lua/plugins/lua-line.lua b/lua/plugins/lua-line.lua
deleted file mode 100644
index 3d63d65..0000000
--- a/lua/plugins/lua-line.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-	"nvim-lualine/lualine.nvim",
-	dependencies = { "nvim-tree/nvim-web-devicons" },
-	config = function()
-		require("lualine").setup({
-			options = {
-				theme = "codedark",
-			},
-		})
-	end,
-}
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
new file mode 100644
index 0000000..3d63d65
--- /dev/null
+++ b/lua/plugins/lualine.lua
@@ -0,0 +1,11 @@
+return {
+	"nvim-lualine/lualine.nvim",
+	dependencies = { "nvim-tree/nvim-web-devicons" },
+	config = function()
+		require("lualine").setup({
+			options = {
+				theme = "codedark",
+			},
+		})
+	end,
+}
diff --git a/lua/vim-options.lua b/lua/vim-options.lua
index 56aeeae..6f26500 100644
--- a/lua/vim-options.lua
+++ b/lua/vim-options.lua
@@ -1,21 +1,26 @@
 -- Tabs --
-vim.cmd("set expandtab")
-vim.cmd("set tabstop=2")
-vim.cmd("set softtabstop=2")
-vim.cmd("set shiftwidth=2")
+vim.opt.expandtab = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
 
 -- UI --
-vim.cmd("set scrolloff=3")
-vim.cmd("set number")
-vim.cmd("set cpoptions+=$")
-vim.cmd("set nowrap")
-vim.cmd("set ttyfast")
-vim.cmd("set lazyredraw")
+vim.opt.scrolloff = 3
+vim.opt.number = true
+vim.opt.cpoptions = "+$"
+vim.opt.ttyfast = true
+vim.opt.lazyredraw = true
+vim.opt.wrap = false
+vim.opt.termguicolors = true
+
+-- Backup/undo--
+vim.opt.swapfile = false
+vim.opt.backup = false
+--vim.opt.undodir = vim.fn.stdpath("data").. "/undodir"
+--vim.opt.undofile = true
 
 -- Search --
-vim.cmd("set hlsearch")
-vim.cmd("set incsearch")
+vim.opt.hlsearch = true
+vim.opt.incsearch = true
 
-vim.cmd("set encoding=utf8")
-
-vim.g.mapleader = ","
+vim.opt.encoding = "utf8"

diff --git a/init.lua b/init.lua
index 7328a90..8dc7d6d 100644
--- a/init.lua
+++ b/init.lua
@@ -12,5 +12,6 @@
 end
 vim.opt.rtp:prepend(lazypath)
 
-require("vim-options")
+require("vim-remap")
 require("lazy").setup("plugins")
+require("vim-options")
diff --git a/lua/plugins/completions.lua b/lua/plugins/completions.lua
index 4d4c7bc..af044bc 100644
--- a/lua/plugins/completions.lua
+++ b/lua/plugins/completions.lua
@@ -1,5 +1,21 @@
 return {
   {
+    "codota/tabnine-nvim",
+    build = "./dl_binaries.sh",
+
+    config = function()
+      require("tabnine").setup({
+        disable_auto_comment = true,
+        accept_keymap = "<Tab>",
+        dismiss_keymap = "<C-]>",
+        debounce_ms = 800,
+        suggestion_color = { gui = "#808080", cterm = 244 },
+        exclude_filetypes = { "TelescopePrompt", "NvimTree" },
+        log_file_path = nil, -- absolute path to Tabnine log file
+      })
+    end,
+  },
+  {
     "hrsh7th/cmp-nvim-lsp",
   },
   {
@@ -31,6 +47,8 @@
           ["<C-Space>"] = cmp.mapping.complete(),
           ["<C-e>"] = cmp.mapping.abort(),
           ["<CR>"] = cmp.mapping.confirm({ select = true }),
+          ["<C-k>"] = cmp.mapping.select_next_item(),
+          ["<C-j>"] = cmp.mapping.select_prev_item(),
         }),
         sources = cmp.config.sources({
           { name = "nvim_lsp" },
diff --git a/lua/plugins/lua-line.lua b/lua/plugins/lua-line.lua
deleted file mode 100644
index 3d63d65..0000000
--- a/lua/plugins/lua-line.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-return {
-	"nvim-lualine/lualine.nvim",
-	dependencies = { "nvim-tree/nvim-web-devicons" },
-	config = function()
-		require("lualine").setup({
-			options = {
-				theme = "codedark",
-			},
-		})
-	end,
-}
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
new file mode 100644
index 0000000..3d63d65
--- /dev/null
+++ b/lua/plugins/lualine.lua
@@ -0,0 +1,11 @@
+return {
+	"nvim-lualine/lualine.nvim",
+	dependencies = { "nvim-tree/nvim-web-devicons" },
+	config = function()
+		require("lualine").setup({
+			options = {
+				theme = "codedark",
+			},
+		})
+	end,
+}
diff --git a/lua/vim-options.lua b/lua/vim-options.lua
index 56aeeae..6f26500 100644
--- a/lua/vim-options.lua
+++ b/lua/vim-options.lua
@@ -1,21 +1,26 @@
 -- Tabs --
-vim.cmd("set expandtab")
-vim.cmd("set tabstop=2")
-vim.cmd("set softtabstop=2")
-vim.cmd("set shiftwidth=2")
+vim.opt.expandtab = true
+vim.opt.tabstop = 2
+vim.opt.softtabstop = 2
+vim.opt.shiftwidth = 2
 
 -- UI --
-vim.cmd("set scrolloff=3")
-vim.cmd("set number")
-vim.cmd("set cpoptions+=$")
-vim.cmd("set nowrap")
-vim.cmd("set ttyfast")
-vim.cmd("set lazyredraw")
+vim.opt.scrolloff = 3
+vim.opt.number = true
+vim.opt.cpoptions = "+$"
+vim.opt.ttyfast = true
+vim.opt.lazyredraw = true
+vim.opt.wrap = false
+vim.opt.termguicolors = true
+
+-- Backup/undo--
+vim.opt.swapfile = false
+vim.opt.backup = false
+--vim.opt.undodir = vim.fn.stdpath("data").. "/undodir"
+--vim.opt.undofile = true
 
 -- Search --
-vim.cmd("set hlsearch")
-vim.cmd("set incsearch")
+vim.opt.hlsearch = true
+vim.opt.incsearch = true
 
-vim.cmd("set encoding=utf8")
-
-vim.g.mapleader = ","
+vim.opt.encoding = "utf8"
diff --git a/lua/vim-remap.lua b/lua/vim-remap.lua
new file mode 100644
index 0000000..5d94d42
--- /dev/null
+++ b/lua/vim-remap.lua
@@ -0,0 +1,26 @@
+vim.g.mapleader = " "
+
+-- Move in visual mode
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+
+-- Keep cursor position
+vim.keymap.set("n", "<J>", "mzJ`z")
+vim.keymap.set("n", "<C-d>", "<C-d>zz")
+vim.keymap.set("n", "<C-u>", "<C-u>zz")
+vim.keymap.set("n", "<n>", "nzzzv")
+vim.keymap.set("n", "<N>", "Nzzzv")
+
+-- Paste w/o loosing paste-buffer
+vim.keymap.set("x", "<leader>p", '"_dP')
+
+vim.keymap.set("n", "<leader>y", '"+y')
+vim.keymap.set("v", "<leader>y", '"+y')
+vim.keymap.set("n", "<leader>Y", '"+Y')
+
+vim.keymap.set("n", "<leader>d", '"_Y')
+vim.keymap.set("v", "<leader>d", '"_Y')
+
+-- Find/replace current word
+vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
+