WIP Add highlights

Refactor the decoration storage.

More to come...
Ooh, love this too!