WIP Add highlights

Refactor the decoration storage.

More to come...
Would be nice to separate the `markerId` and the `decoration.class` in the key with a `-` just in case the class is like `2` or something stupid.