Final round of changes for CSS color support.  Improved tests and clean up code.