Workaround and new color scheme