Tidy up highlighting code and ensure read-only access to dictionary by highlight areas
Tidy up highlighting code and ensure read-only access to dictionary by highlight areas

peppy/osu,ppy/osu,ppy/osu,ppy/osu,peppy/osu,peppy/osu