Adding support for color theme