Adding support for shades and tints