Coloring

Fixed some coloring things