Use color constants, including new orange