Fixed some coloring issues