diff --git a/lazy-lock.json b/lazy-lock.json
index bc324a9..9f48b2e 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -33,15 +33,15 @@
   "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "0671e0eabc6842676d3310370e8fae4e1c51d7f9" },
-  "nvim-lint": { "branch": "master", "commit": "f707b3ae50417067fa63fdfe179b0bff6b380da1" },
+  "nvim-lint": { "branch": "master", "commit": "16b21a7d04d06661f92f273a0744fd81fb19e09e" },
   "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
   "nvim-material-icon": { "branch": "main", "commit": "38fc13fe4811c4bf62533180ff5e7bbd237c5ef5" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
   "nvim-scrollview": { "branch": "main", "commit": "bc37a942debe191fffd072f0f1f2ec7c56c54b17" },
   "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" },
-  "nvim-treesitter": { "branch": "master", "commit": "19079207ba4a8c7ed956f40a111a22b1a2dfa6e8" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "b91c98afa6c42819aea6cbc1ba38272f5456a5cf" },
+  "nvim-treesitter": { "branch": "master", "commit": "68b2bdd99d889e9705f7e90ae64d990f3ff03cf3" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" },
   "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" },
   "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
diff --git a/lua/user/autocommands.lua b/lua/user/autocommands.lua
index d2b4b14..b4a0514 100644
--- a/lua/user/autocommands.lua
+++ b/lua/user/autocommands.lua
@@ -1,72 +1,7 @@
--- autocmd BufWinEnter * :set formatoptions-=cro
--- vim.cmd([[
---   augroup _general_settings
---     autocmd!
---     autocmd FileType qf,help,man,lspinfo nnoremap <silent> <buffer> q :close<CR>
---     autocmd TextYankPost * silent!lua require('vim.highlight').on_yank({higroup = 'Visual', timeout = 200})
---     " autocmd BufWinEnter * :set formatoptions=croql
---     " autocmd BufWinEnter * :set textwidth=80
---     " autocmd BufWinEnter * :set colorcolumn=+1
---     " autocmd BufWinEnter * :set nolazyredraw
---     " autocmd BufWinEnter * :hi ColorColumn guibg=#1B243000 ctermbg=246
---     autocmd FileType qf set nobuflisted
---   augroup end
---
---   augroup _git
---     autocmd!
---     autocmd FileType gitcommit setlocal wrap
---     autocmd FileType gitcommit setlocal spell
---   augroup end
---
---   augroup _markdown
---     autocmd!
---     autocmd FileType markdown setlocal wrap
---     autocmd FileType markdown setlocal spell
---   augroup end
---
---   augroup _auto_resize
---     autocmd!
---     autocmd VimResized * tabdo wincmd =
---   augroup end
---
---   augroup _alpha
---     autocmd!
---     autocmd User AlphaReady set showtabline=0 | autocmd BufUnload <buffer> set showtabline=2
---   augroup end
---
---   augroup neovim_terminal
---     autocmd!
---     " Enter Terminal-mode (insert) automatically
---     autocmd TermOpen * startinsert
---     " Disables number lines on terminal buffers
---     autocmd TermOpen * :set nonumber norelativenumber
---     " allows you to use Ctrl-c on terminal window
---     autocmd TermOpen * nnoremap <buffer> <C-c> i<C-c>
---   augroup END
---
---   function s:MkNonExDir(file, buf)
---     if empty(getbufvar(a:buf, '&buftype')) && a:file!~#'\v^\w+\:\/'
---         let dir=fnamemodify(a:file, ':h')
---         if !isdirectory(dir)
---             call mkdir(dir, 'p')
---         endif
---     endif
---     endfunction
---     augroup BWCCreateDir
---     autocmd!
---     autocmd BufWritePre * :call s:MkNonExDir(expand('<afile>'), +expand('<abuf>'))
---   augroup END
--- ]])
-
 local api = vim.api
 
 -- General Settings
 api.nvim_create_augroup("_general_settings", { clear = true })
-api.nvim_create_autocmd({ "FileType" }, {
-  group = "_general_settings",
-  pattern = { "qf", "help", "man", "lspinfo" },
-  command = "nnoremap <silent> <buffer> q :close<CR>",
-})
 
 api.nvim_create_autocmd("TextYankPost", {
   group = "_general_settings",