Fixed bug in color, decided work was ugly, redid it.

Will probably be changed