more color handling improvements