Various color fixes for consistency