Few more fixes to new color scheme