A few more tweaks on the new stuff in the chromatic module.  Including updating demo12 to use new style.
(#511)