Merge "Fixed a few coloring issues"