Improved color handling
color tweaks