WIP Add highlights

Refactor the decoration storage.

More to come...
Why folding here?