Add colorcolumn and stripwhitespace