WIP Add highlights

Refactor the decoration storage.

More to come...
off-screen