Add support for color 'None'