reworked the highlighter file for the new syntax
upgraded the groups class to work with new structure