cleanup and added support for a second color. no color transitions yet