Collect defns

This is a refactor which gets rid of a lot of logic and lines by combining the gui and term highlights.  There are very few visible changes to the theme, and these changes are made only in the interest of making the colorscheme more complete or consistent between gui and term.

With these changes (the gui and term colors for a syntax group being on the same line), it is much easier to spot missing/inconsistent pieces of the colorscheme.