Added and organised colour vars for type