More color-related tweaking