WIP A lot of reformatting, especially inside the highlighting implementation