Need to upgrade the CSS parser from the home-grown version from 1.0 timeframe to a proper CSS ANTLR parser. ANTLR is more extensible and easier to work with, and also there are excellent CSS grammars we can use.