Added 2 new colors and changed color6
Set vim to expandtab