colour changes fixes #597