Color and other small fixes