Merge "Add new ColorScheme styles"