Updated to new color scheme