Merge "Map some more colors to new palette" into sc-dev