diff --git a/init.lua b/init.lua
index b5dd7e5..099f9b9 100644
--- a/init.lua
+++ b/init.lua
@@ -1,3 +1,5 @@
+-- VIM OPTIONS START --
+
 local vim = vim
 vim.o.number = true
 vim.o.relativenumber = true
@@ -9,6 +11,10 @@ vim.o.swapfile = false
 vim.g.mapleader = " "
 vim.o.winborder = "single"
 
+-- VIM OPTIONS END --
+
+-- PLUGINS START --
+
 vim.pack.add({
     { src = "https://github.com/ellisonleao/gruvbox.nvim" },
     { src = "https://github.com/stevearc/oil.nvim" },
@@ -25,16 +31,9 @@ vim.cmd("colorscheme gruvbox")
 
 require("oil").setup()
 require("mini.pick").setup()
-require("blink.cmp").setup({
-    sources = {
-        default = { 'lsp', 'path', 'buffer' },
-    },
-    keymap = { preset = 'super-tab' },
-})
+require("blink.cmp").setup()
 require("nvim-treesitter.configs").setup({
     auto_install = true,
-    highlight = { enable = true },
-    indent = { enable = true },
 })
 require("mason").setup()
 require("lualine").setup {
@@ -44,6 +43,10 @@ require("lualine").setup {
 }
 require("typst-preview").setup()
 
+-- PLUGINS END --
+
+-- LSP START --
+
 vim.lsp.enable({ "lua_ls", "ts_ls", "svelte", "tailwindcss", "bashls", "rust_analyzer", "clangd", "clang-format", "taplo",
     "sourcekit", "lemminx", "tinymist" })
 
@@ -55,18 +58,22 @@ vim.lsp.config["tinymist"] = {
     },
 }
 
+-- LSP END --
+
+-- KEYMAP START --
+
 vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format)
 
 vim.keymap.set("n", "<C-f>", ":Pick files<CR>")
 vim.keymap.set("n", "<C-g>", ":Pick grep_live<CR>")
 vim.keymap.set("n", "<C-h>", ":Pick help<CR>")
-vim.keymap.set("n", "<C-o>", ":Oil<CR>")
+vim.keymap.set("n", "<C-e>", ":Oil<CR>")
 
-vim.keymap.set("n", "<leader>d", function()
+vim.keymap.set("n", "<leader>dg", function()
     vim.diagnostic.setqflist()
     vim.cmd("copen")
 end, { desc = "Show diagnostics in quickfix list" })
-vim.keymap.set("n", "<C-q>", function()
+vim.keymap.set("n", "<leader>qf>", function()
     local qf_win = vim.fn.getwininfo(vim.fn.getqflist({ winid = 0 }).winid)
     if not qf_win or #qf_win == 0 then
         vim.cmd("copen")
@@ -75,7 +82,7 @@ vim.keymap.set("n", "<C-q>", function()
     end
 end, { desc = "Toggle quickfix list" })
 
-
+-- KEYMAP END --
 
 vim.diagnostic.config({
     virtual_text = {