Moved some stuff to toolkit.vim