Added support for more colors