Fixed Coloring issues.