Tweaked the json files and started a permanent fix for substring names
screwing up highlighting.