New highlights and annotation items. Fixes #539