Fixed coloring issues