Added more colour macros, and basic colour definitions