more different colors and cleaning up the color code