Update color var names. Add lightened color swatch