Fixing of the color overrides