Remove transparency button, add swatches.