WIP Add highlights

Refactor the decoration storage.

More to come...
I think this should be called `filterDecorationsByType` or something like that.