More revisions and add changes for other sample swatches