Better support for color scheme