Improved some color selections