Merge "New color spec" into sc-dev