fixed more colours issues