Added support for more colours