new color pairs & small fixes