Update color scheme, add underscores for selecting