diff --git a/vim/.vim/UltiSnips/markdown.snippets b/vim/.vim/UltiSnips/markdown.snippets
new file mode 100644
index 0000000..bc107de
--- /dev/null
+++ b/vim/.vim/UltiSnips/markdown.snippets
@@ -0,0 +1,16 @@
+snippet firma "Signature"
+Un saludo,
+
+Amin Kasrou Aouam
+endsnippet
+
+snippet meta "YAML metadata for pandoc"
+---
+title: "$1"
+author: [Amin Kasrou Aouam]
+date: "`date +%F`"
+titlepage: true
+logo: /home/coolneng/Pictures/Logos/UGR.png
+...
+
+endsnippet
diff --git a/vim/.vim/bundle/ultisnips b/vim/.vim/bundle/ultisnips
new file mode 160000
index 0000000..6fdc364
--- /dev/null
+++ b/vim/.vim/bundle/ultisnips
@@ -0,0 +1 @@
+Subproject commit 6fdc3647f72e0a1f321ea6bd092ecd01f7c187ba
diff --git a/vim/.vimrc b/vim/.vimrc
index 4bdca45..9778e25 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -10,15 +10,15 @@ set t_Co=256
 set clipboard=unnamedplus
 set nofoldenable
 ""MuComplete
-set completeopt+=menuone
-set completeopt+=noinsert
-set shortmess+=c
-set hlsearch
-set incsearch
-set ignorecase
-set smartcase
-let g:mucomplete#enable_auto_at_startup = 1
-let g:mucomplete#completion_delay = 1
+"set completeopt+=menuone
+"set completeopt+=noinsert
+"set shortmess+=c
+"set hlsearch
+"set incsearch
+"set ignorecase
+"set smartcase
+"let g:mucomplete#enable_auto_at_startup = 1
+"let g:mucomplete#completion_delay = 1
 ""Keybindings
 set pastetoggle=<F2>
 map <Space> :noh<CR>
@@ -35,6 +35,10 @@ let g:vim_markdown_math=1
 autocmd FileType markdown nnoremap <silent> <F3> :<c-u>!pandoc %:p:S -o %:p:r:S.pdf --from markdown --template eisvogel --listings &<cr>
 autocmd FileType markdown nnoremap <silent> <F4> :<c-u>!pandoc %:p:S -o %:p:r:S.pdf -t beamer -V theme:metropolis --listings &<cr>
 autocmd FileType markdown nnoremap <silent> <F5> :<c-u>!zathura %:p:r:S.pdf &<cr>
+"" Snippets
+let g:UltiSnipsExpandTrigger = '<tab>'
+let g:UltiSnipsJumpForwardTrigger = '<tab>'
+let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
 ""Quitting whether Goyo is active or not
 function! g:Goyo_before()
   let b:quitting = 0