Improve to update current line highlight when theme is changed