Change some rogue "orange" colours to @highlightColor