More consistent named colour variables. Updated.