diff --git a/plugin/keys.vim b/plugin/keys.vim
index 4b11aa5..cdd6b2c 100644
--- a/plugin/keys.vim
+++ b/plugin/keys.vim
@@ -1,6 +1,9 @@
 nnoremap <SPACE> <Nop>
 let g:mapleader = ' '
 
+"
+nnoremap <Leader>tk <C-w><C-]><C-w>T
+
 " Quickly insert an empty new line without entering insert mode
 nnoremap <Leader>o o<Esc>
 nnoremap <Leader>O O<Esc>
@@ -318,11 +321,15 @@ nmap <C-F4> :YcmCompleter GoTo<CR>:wincmd o<CR>
 
 " vim-clap
 nnoremap <leader>ag :Clap grep2 ++query=<cword><CR>
-nnoremap <silent> <leader>tg :Clap proj_tags ++query=<cword><CR>
+" nnoremap <silent> <leader>tg :Clap proj_tags ++query=<cword><CR>
 nmap <C-f> :Clap files<CR>
 nmap <C-t> :Clap tags<CR>
 nmap <C-b> :Clap buffers<CR>
 
+nnoremap <silent> <leader>tg :tag <C-R>=expand("<cword>")<CR><CR>
+nnoremap <silent> <leader>tp :ptag <C-R>=expand("<cword>")<CR><CR>
+nnoremap <silent> <leader>ts :ts <C-R>=expand("<cword>")<CR><CR>
+
 " gitgutter
 nmap <leader>ggt <Esc>:GitGutterToggle<CR>
 nmap <leader>nh <Plug>(GitGutterNextHunk)
@@ -369,5 +376,8 @@ nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
 " nnoremap <leader>la :call LanguageClient_workspace_applyEdit()<CR>
 " nnoremap <leader>lc :call LanguageClient#textDocument_completion()<CR>
 " nnoremap <leader>lh :call LanguageClient#textDocument_hover()<CR>
-" nnoremap <leader>ls :call LanguageClient_textDocument_documentSymbol()<CR>
-" nnoremap <leader>lm :call LanguageClient_contextMenu()<CR>
+nnoremap <leader>la :call LanguageClient#textDocument_codeAction()<CR>
+nnoremap <leader>rn :call LanguageClient#textDocument_rename()<CR>
+
+
+
diff --git a/plugins.toml b/plugins.toml
index 46698fd..758c2e0 100644
--- a/plugins.toml
+++ b/plugins.toml
@@ -99,12 +99,12 @@ build = 'bash -c "cp -R ~/.vim/ale_linters ."'
 on_ft = ['sh', 'vim']
 
 # LSP
-#[[plugins]]
-#repo = 'autozimu/LanguageClient-neovim'
-#rev = 'next'
-#build = 'bash ./install.sh'
 [[plugins]]
-repo = 'prabirshrestha/vim-lsp'
+repo = 'autozimu/LanguageClient-neovim'
+rev = 'dev'
+build = 'bash ./install.sh'
+#[[plugins]]
+#repo = 'prabirshrestha/vim-lsp'
 
 # snippets
 #[[plugins]]