diff --git a/home/.config/awesome/rc.lua b/home/.config/awesome/rc.lua
index 4912316..11b7bc3 100644
--- a/home/.config/awesome/rc.lua
+++ b/home/.config/awesome/rc.lua
@@ -492,6 +492,7 @@ awful.rules.rules = {
     { properties = { tag = "四" }, rule = { class = "Gnome-contact" } },
     { properties = { tag = "四" }, rule = { class = "Gscan2pdf" } },
     { properties = { tag = "四" }, rule = { class = "libreoffice" } },
+    { properties = { tag = "四" }, rule = { name = "org.pwmt.zathura" } },
     { properties = { tag = "五" }, rule = { class = "Audacious" } },
     { properties = { tag = "五" }, rule = { class = "Pavucontrol" } },
     { properties = { tag = "八" }, rule = { class = "Darktable" } },
diff --git a/home/.vimrc b/home/.vimrc
index e8a0dfb..a4c4961 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -6,6 +6,9 @@ call plug#begin('~/.vim/plugged')
 " Features
 Plug 'MarcWeber/vim-addon-local-vimrc'
 Plug 'majutsushi/tagbar'
+nmap <F8> :TagbarToggle<CR>
+Plug 'ludovicchabant/vim-gutentags'
+let g:gutentags_cache_dir='~/.cache/gutentags'
 
 " Syntax highlighting/Language support
 Plug 'ElmCast/elm-vim', { 'for': 'elm' }
@@ -16,6 +19,12 @@ Plug 'mechatroner/rainbow_csv'
 Plug 'posva/vim-vue', { 'for': 'vue' }
 Plug 'sirtaj/vim-openscad', { 'for': 'openscad' }
 
+Plug 'lervag/vimtex', { 'for': 'tex' }
+let g:tex_flavor='latex'
+let g:vimtex_view_method='zathura'
+set conceallevel=1
+let g:tex_conceal='abdmg'
+
 " Color schemes
 Plug 'altercation/vim-colors-solarized'
 call plug#end()
@@ -67,5 +76,7 @@ if has("gui_running")
   set guifont=Terminess\ Powerline
 endif
 
-" Tagbar
-nmap <F8> :TagbarToggle<CR>
+" Start clientserver (from vimtex.txt)
+if empty(v:servername) && exists('*remote_startserver')
+  call remote_startserver('VIM')
+endif