Update tooltips to use highlight colour
Show tooltip keystrokes in brackets