Color changes
More color fixes