new colours, several tweakings