Updated colors and fixed a bug