[Vim/Zsh] More changes.