Fixed the coloring issues