WIP Add highlights

Refactor the decoration storage.

More to come...
do you mean on-screen?