diff --git a/.gitignore b/.gitignore
index fd6529b..22d1c68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+tags
+.session.vim
 *.pyc
 .netrwhist
 .VimballRecord
diff --git a/vimfiles.stefan/plugin/toptica.vim b/vimfiles.stefan/plugin/toptica.vim
index 96b450f..287a5a7 100644
--- a/vimfiles.stefan/plugin/toptica.vim
+++ b/vimfiles.stefan/plugin/toptica.vim
@@ -341,3 +341,8 @@ endfunction
 " update python tags
 " cd ~/dclpro/firmware
 " ctags --recurse --languages=python src
+
+" ------
+" Pandoc
+" ------
+command TopticaBeamer execute('!pandoc -s -t beamer -H toptica-style.tex -o %:r.pdf %')
diff --git a/vimfiles.stefan/plugin/vimsuite.vim b/vimfiles.stefan/plugin/vimsuite.vim
index cf39317..d975906 100644
--- a/vimfiles.stefan/plugin/vimsuite.vim
+++ b/vimfiles.stefan/plugin/vimsuite.vim
@@ -489,91 +489,6 @@ function FindUglyC()
     execute '/' . UglyCstring
 endfunction
 
-" options for Vimball
-let g:vimball_home = expand(g:vimsuite . '/vimfiles')
-
-" GetLatestVimScripts
-command GetLatestVimScriptsThroughProxy call s:GetLatestVimScriptsThroughProxy()
-function s:GetLatestVimScriptsThroughProxy()
-    " Get Proxy data
-    let proxy = input('Proxy: ', 'proxy.muc:8080')
-    let user = input('User: ', 'qx13468')
-    let password = inputsecret('Password: ')
-    let $http_proxy = 'http://' . user . ':' . password . '@' . proxy
-    " Set HOME for autoinstall
-    let home = $HOME
-    let $HOME=g:vimsuite
-    " Get the scripts
-    GetLatestVimScripts
-    " reset HOME
-    let $HOME = home
-endfunction
-let g:GetLatestVimScripts_wget = g:wget
-let g:GetLatestVimScripts_mv = g:mv
-
-" merge
-command -nargs=+ Merge call Merge(<args>)
-function Merge(...)
-    let args = a:0
-    if a:0 != 4
-        echo 'usage: Merge first,second,root,out'
-    else
-        let first  = fnamemodify(bufname(a:1), ':p:8')
-        let second = fnamemodify(bufname(a:2), ':p:8')
-        let root   = fnamemodify(bufname(a:3), ':p:8')
-        let out    = fnamemodify(bufname(a:4), ':p:8')
-        echo 'root-buffer  :' root
-        echo 'first-buffer :' first
-        echo 'second-buffer:' second
-        echo 'output-buffer:' out
-
-        execute '!'. g:diff . ' ' . root . ' '. first . ' | ' . g:patch . ' --force ' . second . ' --output="' . out
-        execute bufwinnr(4) . 'wincmd w'
-        execute 'edit'
-        execute 'wincmd ='
-    endif
-endfunction
-
-" -------------
-" abbreviations
-" -------------
-"iabbreviate li !IST_LIEBL: */<Left><Left><Left>
-
-
-" ---------
-" templates
-" ---------
-command InsertCHeader call Insert_Header('file_c.tpl')
-command InsertHHeader call Insert_Header('file_h.tpl')
-command InsertKGSHeader call Insert_Header('file_kgs.tpl')
-command InsertFHeader call Insert_Header('funct.tpl')
-command InsertHTMLHeader call Insert_Header('html.tpl')
-function Insert_Header(file)
-    let file = g:vimfiles . '/templates/' . a:file
-    execute ':read ' . file
-    " expand template
-    let l:filename = expand('%:t')
-    execute ':%s/%filename/' . l:filename . '/e'
-    let l:basename = substitute(expand('%:t:r'), '.*', '\U\0', '')
-    execute ':%s/%basename/' . l:basename . '/e'
-    let l:date = strftime("%d.%m.%Y")
-    execute ':%s/%date/' . l:date . '/e'
-    if !exists("g:DoxygenToolkit_authorName")
-        let g:DoxygenToolkit_authorName = input("Enter name of the author (gernarally yours...) : ")
-    endif
-    execute ':%s/%author/' . g:DoxygenToolkit_authorName . '/e'
-endfunction
-
-" -------
-" Outlook
-" -------
-
-command OutlookBugfix call s:OutlookBugfix()
-function s:OutlookBugfix()
-    silent execute ':%s$^\(\%([^,]*,\)\{55}\)"\/o[^,]*\"\(,"EX","[^(]*(\)\([^)]*\)\()",\)$\1"\3"\2\3\4$c'
-    silent execute ':%s$^\(\%([^,]*,\)\{47}\)"\/o[^,]*\"\(,"EX","[^(]*(\)\([^)]*\)\()",\)$\1"\3"\2\3\4$c'
-endfunction
-
 " ---------
 " VC plugin
 " ---------