Again with color fixes