moved color definitions