WIP Add highlights

Refactor the decoration storage.

More to come...
Can we filter by type first and *then* index by screen row? Then you'd only need one filter method.