fix color column, highlight tailing whitespaces

and move files around