Issue #89: Improve TOC default swatches.
Clean up.
Apply formatting.
Clean up.
Merge branch '#89/improve-toc-default-swatches' into develop