Merge "Apply new color scheme" into sc-dev