diff --git a/nvim/init.vim b/nvim/init.vim
index 6f7feba..2487070 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -340,6 +340,9 @@ map <Leader>j <Plug>(easymotion-j)
 map <Leader>k <Plug>(easymotion-k)
 map <Leader>h <Plug>(easymotion-linebackward)
 
+map <C-\> :vsp <CR>:exec("tag ".expand("<cword>"))<CR>
+map <A-]> :sp <CR>:exec("tag ".expand("<cword>"))<CR>
+
 command! -bang -nargs=* GGrep
   \ call fzf#vim#grep(
   \   'git grep --line-number '.shellescape(<q-args>), 0,
@@ -408,11 +411,11 @@ augroup END
 
 augroup rust_maps
 	au!
-	au FileType rust nmap <buffer> <Leader>rd <plug>DeopleteRustGoToDefinitionDefault
-	au FileType rust nmap <buffer> <Leader>rc <plug>DeopleteRustShowDocumentation
-	au FileType rust nmap <buffer> <Leader>rv <plug>DeopleteRustGoToDefinitionVSplit
-	au FileType rust nmap <buffer> <Leader>rh <plug>DeopleteRustGoToDefinitionSplit
-	au FileType rust nmap <buffer> <Leader>rt <plug>DeopleteRustGoToDefinitionTab
+	au FileType rust nmap <buffer> gd <plug>DeopleteRustGoToDefinitionDefault
+	au FileType rust nmap <buffer> K  <plug>DeopleteRustShowDocumentation
+	au FileType rust nmap <buffer> gv <plug>DeopleteRustGoToDefinitionVSplit
+	au FileType rust nmap <buffer> gh <plug>DeopleteRustGoToDefinitionSplit
+	au FileType rust nmap <buffer> gt <plug>DeopleteRustGoToDefinitionTab
 augroup END
 
 augroup rainbow_lisp
@@ -626,13 +629,13 @@ let g:hardtime_ignore_quickfix = 1
 let g:hardtime_maxcount = 3
 let g:hardtime_allow_different_key = 1
 
-let g:jedi#goto_command = "<Leader>jt"
-let g:jedi#goto_assignments_command = "<Leader>ja"
-let g:jedi#goto_definitions_command = "<Leader>jg"
-let g:jedi#documentation_command = "<Leader>jd"
-let g:jedi#usages_command = "<Leader>ju"
+let g:jedi#goto_command = "gt"
+let g:jedi#goto_assignments_command = "ga"
+let g:jedi#goto_definitions_command = "gd"
+let g:jedi#documentation_command = "K"
+let g:jedi#usages_command = "gu"
 let g:jedi#completions_command = "<Tab>"
-let g:jedi#rename_command = "<Leader>jr"
+let g:jedi#rename_command = "gr"
 
 let g:jedi#auto_initialization = 1
 let g:jedi#auto_vim_configuration = 0