diff --git a/lua/custom/default.lua b/lua/custom/default.lua
index 9508436..f2192bc 100644
--- a/lua/custom/default.lua
+++ b/lua/custom/default.lua
@@ -37,7 +37,7 @@ pcode.progress = 1
 -- 2 = logo only
 -- 3 = initial only
 -- 4 = off
-pcode.show_mode = 3
+pcode.show_mode = 2
 
 -- true or false
 pcode.format_on_save = true
diff --git a/lua/plugins/notify.lua b/lua/plugins/notify.lua
index 54cdb9f..beac4d7 100644
--- a/lua/plugins/notify.lua
+++ b/lua/plugins/notify.lua
@@ -25,7 +25,8 @@ return {
     local notify = require("notify")
     -- this for transparency
     -- notify.setup { background_colour = "#000000", render = "compact" }
-    notify.setup({ render = "compact" })
+    -- notify.setup({ render = "compact" })
+    notify.setup({ render = "wrapped-compact" })
     -- this overwrites the vim notify function
     vim.notify = notify.notify
   end,
diff --git a/lua/plugins/nvimtree.lua b/lua/plugins/nvimtree.lua
index e4912c4..d678876 100644
--- a/lua/plugins/nvimtree.lua
+++ b/lua/plugins/nvimtree.lua
@@ -220,7 +220,7 @@ return {
   end,
 }
  ]]
- 
+
 return {
   "nvim-tree/nvim-tree.lua",
   cmd = { "NvimTreeFindFileToggle", "NvimTree", "NvimTreeOpen", "NvimTreeToggle", "NvimTreeFocus", "NvimTreeClose" },
@@ -230,7 +230,6 @@ return {
   opts = function()
     local icons = pcode.icons
     return {
-      filters = { dotfiles = false },
       disable_netrw = true,
       hijack_cursor = true,
       sync_root_with_cwd = true,
@@ -304,6 +303,18 @@ return {
           ".prettierignore",
         },
       },
+      notify = {
+        threshold = vim.log.levels.INFO,
+        -- threshold = vim.log.levels.ERROR,
+      },
+      git = {
+        enable = true,
+        ignore = false,
+        show_on_dirs = true,
+        show_on_open_dirs = true,
+        disable_for_dirs = {},
+        timeout = 400,
+      },
     }
   end,
   config = function(_, opts)
@@ -313,4 +324,4 @@ return {
       vim.cmd("edit " .. file.fname)
     end)
   end,
-}
\ No newline at end of file
+}
diff --git a/lua/user/autocommands.lua b/lua/user/autocommands.lua
index 8b0c0c4..d2b4b14 100644
--- a/lua/user/autocommands.lua
+++ b/lua/user/autocommands.lua
@@ -1,62 +1,141 @@
 -- 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
+-- 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
+-- ]])
 
-  augroup _git
-    autocmd!
-    autocmd FileType gitcommit setlocal wrap
-    autocmd FileType gitcommit setlocal spell
-  augroup end
+local api = vim.api
 
-  augroup _markdown
-    autocmd!
-    autocmd FileType markdown setlocal wrap
-    autocmd FileType markdown setlocal spell
-  augroup end
+-- 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>",
+})
 
-  augroup _auto_resize
-    autocmd!
-    autocmd VimResized * tabdo wincmd =
-  augroup end
+api.nvim_create_autocmd("TextYankPost", {
+  group = "_general_settings",
+  callback = function()
+    require("vim.highlight").on_yank({ higroup = "Visual", timeout = 200 })
+  end,
+})
 
-  augroup _alpha
-    autocmd!
-    autocmd User AlphaReady set showtabline=0 | autocmd BufUnload <buffer> set showtabline=2
-  augroup end
+api.nvim_create_autocmd("FileType", {
+  group = "_general_settings",
+  pattern = "qf",
+  command = "set nobuflisted",
+})
 
-  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
+-- Git Settings
+api.nvim_create_augroup("_git", { clear = true })
+api.nvim_create_autocmd("FileType", {
+  group = "_git",
+  pattern = "gitcommit",
+  command = "setlocal wrap spell",
+})
 
-  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
-]])
+-- Markdown Settings
+api.nvim_create_augroup("_markdown", { clear = true })
+api.nvim_create_autocmd("FileType", {
+  group = "_markdown",
+  pattern = "markdown",
+  command = "setlocal wrap spell",
+})
+
+-- Auto Resize
+api.nvim_create_augroup("_auto_resize", { clear = true })
+api.nvim_create_autocmd("VimResized", {
+  group = "_auto_resize",
+  command = "tabdo wincmd =",
+})
+
+-- Alpha Settings
+api.nvim_create_augroup("_alpha", { clear = true })
+api.nvim_create_autocmd("User", {
+  group = "_alpha",
+  pattern = "AlphaReady",
+  command = "set showtabline=0 | autocmd BufUnload <buffer> set showtabline=2",
+})
+
+-- Terminal Settings
+api.nvim_create_augroup("neovim_terminal", { clear = true })
+api.nvim_create_autocmd("TermOpen", {
+  group = "neovim_terminal",
+  command = "startinsert | set nonumber norelativenumber | nnoremap <buffer> <C-c> i<C-c>",
+})
+
+-- Function to Create Non-Existent Directory on BufWrite
+local function MkNonExDir(file, buf)
+  if vim.fn.empty(vim.fn.getbufvar(buf, "&buftype")) == 1 and not string.match(file, "^%w+://") then
+    local dir = vim.fn.fnamemodify(file, ":h")
+    if vim.fn.isdirectory(dir) == 0 then
+      vim.fn.mkdir(dir, "p")
+    end
+  end
+end
+
+api.nvim_create_augroup("BWCCreateDir", { clear = true })
+api.nvim_create_autocmd("BufWritePre", {
+  group = "BWCCreateDir",
+  callback = function(_)
+    MkNonExDir(vim.fn.expand("<afile>"), vim.fn.expand("<abuf>"))
+  end,
+})
 
 -- for fix error last close buffer
 vim.api.nvim_create_autocmd({ "QuitPre" }, {