diff --git a/dot_config/nvim/autoload/go.vim b/dot_config/nvim/autoload/go.vim
index d78e7b3..612c5df 100644
--- a/dot_config/nvim/autoload/go.vim
+++ b/dot_config/nvim/autoload/go.vim
@@ -5,5 +5,3 @@ function! go#Gofmt(path) abort
     exec 'edit!'
     call winrestview(winstate)
 endfunction
-
-    
diff --git a/dot_config/nvim/dot_editorconfig b/dot_config/nvim/dot_editorconfig
index 9ac0429..4627590 100644
--- a/dot_config/nvim/dot_editorconfig
+++ b/dot_config/nvim/dot_editorconfig
@@ -2,7 +2,6 @@ root = true
 [*.lua]
 indent_style = space
 indent_size = 2
-
 tab_width = 4
 quote_style = single
 insert_final_newline = true
diff --git a/dot_config/nvim/lua/configs/colors.lua b/dot_config/nvim/lua/configs/colors.lua
index 03e71e5..b2bb903 100644
--- a/dot_config/nvim/lua/configs/colors.lua
+++ b/dot_config/nvim/lua/configs/colors.lua
@@ -152,6 +152,17 @@ vim.api.nvim_create_autocmd('Colorscheme', {
   end
 })
 
+vim.api.nvim_create_autocmd('ColorschemePre', {
+  group = augr,
+  pattern = '*',
+  callback = function()
+    vim.fn.sign_define('DiagnosticSignError', { text = ' ', texthl = 'DiagnosticSignError' })
+    vim.fn.sign_define('DiagnosticSignWarn', { text = ' ', texthl = 'DiagnosticSignWarn' })
+    vim.fn.sign_define('DiagnosticSignInfo', { text = ' ', texthl = 'DiagnosticSignInfo' })
+    vim.fn.sign_define('DiagnosticSignHint', { text = '', texthl = 'DiagnosticSignHint' })
+  end
+})
+
 local term = vim.env.TERM
 if (term ~= 'linux' or vim.g.neoray)
 then
diff --git a/dot_config/nvim/lua/configs/nvim-cmp.lua b/dot_config/nvim/lua/configs/nvim-cmp.lua
index e7b1eea..f821eb6 100644
--- a/dot_config/nvim/lua/configs/nvim-cmp.lua
+++ b/dot_config/nvim/lua/configs/nvim-cmp.lua
@@ -10,6 +10,7 @@ function M.setup()
       { name = 'nvim_lua' },
       { name = 'buffer' },
       { name = 'path' },
+      { name = 'vsnip' },
       -- { name = 'nvim_lsp_signature_help' },
     },
     formatting = {
diff --git a/dot_config/nvim/lua/configs/packages.lua b/dot_config/nvim/lua/configs/packages.lua
index 1ad99d8..348dada 100644
--- a/dot_config/nvim/lua/configs/packages.lua
+++ b/dot_config/nvim/lua/configs/packages.lua
@@ -35,18 +35,22 @@ function M.setup()
     use { 'hrsh7th/cmp-path', requires = { 'hrsh7th/nvim-cmp' } }
     use { 'hrsh7th/cmp-nvim-lua', requires = { 'hrsh7th/nvim-cmp' } }
     use { 'hrsh7th/vim-vsnip', config = function()
-      vim.keymap.set({ 'i', 's' }, '<Tab>', [[vsnip#jumpable(1) ? '<Plug>(vsnip-jump-next)' : <Tab>]], { expr = true })
-      vim.keymap.set({ 'i', 's' }, '<S-Tab>', [[vsnip#jumpable(-1) ? '<Plug>(vsnip-jump-prev)' : <S-Tab>]], { expr = true })
+      vim.api.nvim_exec([[
+        imap <expr> <Tab>   vsnip#jumpable(1)   ? '<Plug>(vsnip-jump-next)'      : '<Tab>'
+        smap <expr> <Tab>   vsnip#jumpable(1)   ? '<Plug>(vsnip-jump-next)'      : '<Tab>'
+        imap <expr> <S-Tab> vsnip#jumpable(-1)  ? '<Plug>(vsnip-jump-prev)'      : '<S-Tab>'
+        smap <expr> <S-Tab> vsnip#jumpable(-1)  ? '<Plug>(vsnip-jump-prev)'      : '<S-Tab>'
+      ]], false)
     end }
 
+    use { 'rafamadriz/friendly-snippets' }
+
     use 'hrsh7th/cmp-nvim-lsp-signature-help'
 
     use { 'hrsh7th/cmp-vsnip', requires = { 'hrsh7th/nvim-cmp', 'hrsh7th/vim-vsnip' } }
     use { 'onsails/lspkind.nvim' }
     use 'ray-x/lsp_signature.nvim'
     use { 'RishabhRD/nvim-lsputils', requires = { 'RishabhRD/popfix' } }
-    -- use { 'weilbith/nvim-code-action-menu', cmd = 'CodeActionMenu' }
-    -- use { 'simrat39/symbols-outline.nvim', cmd = 'SymbolsOutline' }
 
     use { 'stevearc/dressing.nvim', config = function()
       require('dressing').setup({
@@ -64,7 +68,7 @@ function M.setup()
       config = require('configs.treesitter').setup,
     }
     use 'nvim-treesitter/playground'
-    use({ 'yioneko/nvim-yati', requires = 'nvim-treesitter/nvim-treesitter' })
+    use({ 'yioneko/nvim-yati', requires = 'nvim-treesitter/nvim-treesitter', tag = 'legacy' })
 
     use { 'nvim-telescope/telescope.nvim',
       requires = { 'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim' },
@@ -97,8 +101,10 @@ function M.setup()
 
     use {
       'b3nj5m1n/kommentary',
-      config = function() require('kommentary.config').configure_language('php',
-          { prefer_single_line_comments = true, })
+      config = function()
+        local kommentary = require('kommentary.config')
+        kommentary.configure_language('php', { prefer_single_line_comments = true, })
+        kommentary.configure_language('lua', { prefer_single_line_comments = true, })
       end
     }
 
@@ -122,7 +128,7 @@ function M.setup()
     }
 
     use {
-      'vim-vdebug/vdebug',
+      'vlada-dudr/vdebug',
       opt = true,
     }