Improve changing of the colours.