Added swatch palette and two active swatches that appear in the left toolbar. general cleanup