pull in changes to color-pallet partial from master