color!

getting our colors in there and cleaning up some code