fixes to color changes