diff --git a/.bin/dev-here b/.bin/dev-here
index 0cf9b62..2399f00 100755
--- a/.bin/dev-here
+++ b/.bin/dev-here
@@ -21,9 +21,9 @@ find "${DEVDIR}" -type f \
 cscope -qbkCRvf ${DEVDIRPATH}/cscope.out -i${DEVDIRPATH}/files
 
 # create tags file
-ectags --sort=yes \
+uctags --sort=yes \
        --fields=afiksSt \
-       --extra=fq \
+       --extras=fq \
        --totals=yes \
        -L ${DEVDIRPATH}/files \
        -f ${DEVDIRPATH}/tags
diff --git a/.vimrc b/.vimrc
index be39f79..b6c1acc 100644
--- a/.vimrc
+++ b/.vimrc
@@ -40,6 +40,12 @@ set fillchars=vert:\|,eob:\
 
 nnoremap # *``
 
+nmap <F12> :TagbarToggle<CR>
+let g:tagbar_ctags_bin = "ectags"
+
+xmap ga <Plug>(EasyAlign)
+nmap ga <Plug>(EasyAlign)
+
 augroup code
     au!
     au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal! g'\"" | endif