Tidied up color use.