Merge "Add color aspects keys"