diff --git a/nvim/plugin-config.vim b/nvim/plugin-config.vim
index 96c0a2d..c526538 100644
--- a/nvim/plugin-config.vim
+++ b/nvim/plugin-config.vim
@@ -1,20 +1,21 @@
 " *** *** *** Plugin Configuration *** *** ***
 " ********************************************
 
-source ~/.config/nvim/plugin-config/autopairs.lua
 source ~/.config/nvim/plugin-config/base16.vim
+source ~/.config/nvim/plugin-config/lsp-installer.lua
+source ~/.config/nvim/plugin-config/lsp-config.vim
+source ~/.config/nvim/plugin-config/trouble.lua
+source ~/.config/nvim/plugin-config/lspkind.lua
+source ~/.config/nvim/plugin-config/diagnosticls-configs.lua
+source ~/.config/nvim/plugin-config/cmp.lua
+source ~/.config/nvim/plugin-config/autopairs.lua
 source ~/.config/nvim/plugin-config/blamer.vim
 source ~/.config/nvim/plugin-config/bookmarks.vim
 source ~/.config/nvim/plugin-config/bufferline.lua
-source ~/.config/nvim/plugin-config/cmp.lua
 source ~/.config/nvim/plugin-config/colorizer.lua
-source ~/.config/nvim/plugin-config/diagnosticls-configs.lua
 source ~/.config/nvim/plugin-config/gitsigns.lua
 source ~/.config/nvim/plugin-config/goyo.vim
 source ~/.config/nvim/plugin-config/harpoon.lua
-source ~/.config/nvim/plugin-config/lsp-config.lua
-source ~/.config/nvim/plugin-config/lsp-installer.lua
-source ~/.config/nvim/plugin-config/lspkind.lua
 source ~/.config/nvim/plugin-config/lualine.lua
 source ~/.config/nvim/plugin-config/neoscroll.lua
 source ~/.config/nvim/plugin-config/pandoc.vim
@@ -24,8 +25,8 @@ source ~/.config/nvim/plugin-config/speeddating.vim
 source ~/.config/nvim/plugin-config/telescope.lua
 source ~/.config/nvim/plugin-config/tree.lua
 source ~/.config/nvim/plugin-config/treesitter.lua
-source ~/.config/nvim/plugin-config/trouble.lua
 source ~/.config/nvim/plugin-config/ultisnips.vim
 source ~/.config/nvim/plugin-config/vim-easymotion.vim
 source ~/.config/nvim/plugin-config/vimux.vim
 source ~/.config/nvim/plugin-config/web-devicons.lua
+
diff --git a/nvim/plugin-config/lsp-config.lua b/nvim/plugin-config/lsp-config.lua
deleted file mode 100644
index dae4aba..0000000
--- a/nvim/plugin-config/lsp-config.lua
+++ /dev/null
@@ -1,23 +0,0 @@
--- lspconfig
--- https://github.com/neovim/nvim-lspconfig
-
-local opts = { noremap = true, silent = true }
-
-vim.api.nvim_set_keymap('n', 'gD',         [['<Cmd>lua vim.lsp.buf.declaration()<CR>']],                                opts)
-vim.api.nvim_set_keymap('n', 'gd',         [['<Cmd>lua vim.lsp.buf.definition()<CR>']],                                 opts)
-vim.api.nvim_set_keymap('n', 'K',          [['<Cmd>lua vim.lsp.buf.hover()<CR>']],                                      opts)
-vim.api.nvim_set_keymap('n', 'gi',         [['<cmd>lua vim.lsp.buf.implementation()<CR>']],                             opts)
-vim.api.nvim_set_keymap('n', '<C-k>',      [['<cmd>lua vim.lsp.buf.signature_help()<CR>']],                             opts)
-vim.api.nvim_set_keymap('n', '<leader>wa', [['<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>']],                       opts)
-vim.api.nvim_set_keymap('n', '<leader>wr', [['<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>']],                    opts)
-vim.api.nvim_set_keymap('n', '<leader>wl', [['<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>']], opts)
-vim.api.nvim_set_keymap('n', '<leader>D',  [['<cmd>lua vim.lsp.buf.type_definition()<CR>']],                            opts)
-vim.api.nvim_set_keymap('n', '<leader>rn', [['<cmd>lua vim.lsp.buf.rename()<CR>']],                                     opts)
-vim.api.nvim_set_keymap('n', 'gr',         [['<cmd>lua vim.lsp.buf.references()<CR>']],                                 opts)
-vim.api.nvim_set_keymap('n', '<leader>e',  [['<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>']],               opts)
-vim.api.nvim_set_keymap('n', 'Ä',          [['<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>']],                           opts)
-vim.api.nvim_set_keymap('n', 'ä',          [['<cmd>lua vim.lsp.diagnostic.goto_next()<CR>']],                           opts)
-vim.api.nvim_set_keymap('n', '<leader>q',  [['<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>']],                         opts)
-vim.api.nvim_set_keymap('n', 'g0',         [[<Cmd>lua vim.lsp.buf.document_symbol()<CR>]],                              opts)
-vim.api.nvim_set_keymap('n', 'gW',         [[<Cmd>lua vim.lsp.buf.workspace_symbol()<CR>]],                             opts)
-vim.api.nvim_set_keymap('n', 'ga',         [[<Cmd>lua vim.lsp.buf.code_action()<CR>]],                                  opts)
diff --git a/nvim/plugin-config/lsp-config.vim b/nvim/plugin-config/lsp-config.vim
new file mode 100644
index 0000000..82fd7c3
--- /dev/null
+++ b/nvim/plugin-config/lsp-config.vim
@@ -0,0 +1,22 @@
+" lspconfig
+" https://github.com/neovim/nvim-lspconfig
+
+nnoremap <silent> <C-k>      <cmd>lua vim.lsp.buf.signature_help()<CR>
+nnoremap <silent> <leader>D  <cmd>lua vim.lsp.buf.type_definition()<CR>
+nnoremap <silent> <leader>e  <cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>
+nnoremap <silent> <leader>q  <cmd>lua vim.lsp.diagnostic.set_loclist()<CR>
+nnoremap <silent> <leader>rn <cmd>lua vim.lsp.buf.rename()<CR>
+nnoremap <silent> <leader>wa <cmd>lua vim.lsp.buf.add_workspace_folder()<CR>
+nnoremap <silent> <leader>wl <cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>
+nnoremap <silent> <leader>wr <cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>
+nnoremap <silent> K          <cmd>lua vim.lsp.buf.hover()<CR>
+nnoremap <silent> g0         <cmd>lua vim.lsp.buf.document_symbol()<CR>
+nnoremap <silent> gD         <cmd>lua vim.lsp.buf.declaration()<CR>
+nnoremap <silent> gW         <cmd>lua vim.lsp.buf.workspace_symbol()<CR>
+nnoremap <silent> ga         <cmd>lua vim.lsp.buf.code_action()<CR>
+nnoremap <silent> gd         <cmd>lua vim.lsp.buf.definition()<CR>
+nnoremap <silent> gd         <cmd>lua vim.lsp.buf.definition()<CR>
+nnoremap <silent> gi         <cmd>lua vim.lsp.buf.implementation()<CR>
+nnoremap <silent> gr         <cmd>lua vim.lsp.buf.references()<CR>
+nnoremap <silent> Ä          <cmd>lua vim.lsp.diagnostic.goto_prev()<CR>
+nnoremap <silent> ä          <cmd>lua vim.lsp.diagnostic.goto_next()<CR>
diff --git a/nvim/plugins.vim b/nvim/plugins.vim
index 01e4e75..f06a72a 100644
--- a/nvim/plugins.vim
+++ b/nvim/plugins.vim
@@ -19,10 +19,10 @@ Plug 'creativenull/diagnosticls-configs-nvim'
 
 " Completion
 Plug 'hrsh7th/nvim-cmp'
-Plug 'hrsh7th/cmp-buffer'
-Plug 'hrsh7th/cmp-cmdline'
 Plug 'hrsh7th/cmp-nvim-lsp'
+Plug 'hrsh7th/cmp-buffer'
 Plug 'hrsh7th/cmp-path'
+Plug 'hrsh7th/cmp-cmdline'
 Plug 'SirVer/ultisnips'
 Plug 'honza/vim-snippets'
 Plug 'quangnguyen30192/cmp-nvim-ultisnips'