Improved color handling