Adding more vim and color support