Fixed Coloring issues