various color fixes