More polishing
Switch highlight color to #rebeccapurple
Minor fixes