diff --git a/.config/nvim/after/plugin/hop.lua b/.config/nvim/after/plugin/hop.lua
index 50b7354..359c48e 100644
--- a/.config/nvim/after/plugin/hop.lua
+++ b/.config/nvim/after/plugin/hop.lua
@@ -1,2 +1,6 @@
 vim.keymap.set("n", "gw", vim.cmd.HopWord)
 vim.keymap.set("n", "gl", vim.cmd.HopLine)
+
+vim.cmd[[hi HopNextKey guifg=#f78f38]]
+vim.cmd[[hi HopNextKey1 guifg=#f78f38]]
+vim.cmd[[hi HopNextKey2 guifg=#e645ff]]
diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua
deleted file mode 100644
index 1d54833..0000000
--- a/.config/nvim/after/plugin/treesitter.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
-vim.keymap.set('n', '<leader>gf', builtin.git_files, {})
-vim.keymap.set('n', '<leader>ps', function()
-	builtin.grep_string({ srearch = vim.fn.input("Grep > ") })
-end)
-
diff --git a/.config/nvim/lua/ajet/init.lua b/.config/nvim/lua/ajet/init.lua
index 738d3f0..df88b09 100644
--- a/.config/nvim/lua/ajet/init.lua
+++ b/.config/nvim/lua/ajet/init.lua
@@ -1,3 +1,6 @@
 require("ajet.packer")
 require("ajet.remap")
 require("ajet.set")
+require("ajet.treesitter")
+require("ajet.telescope")
+require("ajet.rusttools")
diff --git a/.config/nvim/lua/ajet/remap.lua b/.config/nvim/lua/ajet/remap.lua
index 5843f49..24577bb 100644
--- a/.config/nvim/lua/ajet/remap.lua
+++ b/.config/nvim/lua/ajet/remap.lua
@@ -1,6 +1,8 @@
 vim.g.mapleader = " "
 vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
 
+vim.keymap.set("n", "<C-s>", vim.cmd.w)
+
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
 
@@ -31,7 +33,7 @@ vim.keymap.set("i", "<C-c>", "<Esc>")
 
 vim.keymap.set("n", "Q", "<nop>")
 vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
-vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
+vim.keymap.set("n", "<leader>F", vim.lsp.buf.format)
 
 vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
 vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
diff --git a/.config/nvim/lua/ajet/set.lua b/.config/nvim/lua/ajet/set.lua
index bc35ddb..fd92337 100644
--- a/.config/nvim/lua/ajet/set.lua
+++ b/.config/nvim/lua/ajet/set.lua
@@ -10,7 +10,7 @@ vim.opt.expandtab = true
 
 vim.opt.smartindent = true
 
-vim.opt.wrap = false
+vim.opt.wrap = true
 
 vim.opt.swapfile = false
 vim.opt.backup = false
@@ -28,5 +28,4 @@ vim.opt.isfname:append("@-@")
 
 vim.opt.updatetime = 50
 
-vim.opt.colorcolumn = "80"
-
+vim.opt.colorcolumn = "85"