Merge "Add key color roles, rename surfaces, adjust spec."