Merge "Add 23 fancy accent colors" into p9.0