Merge "Document expected colors, deprecate old ones" into pi-dev