Added auto-highlight-mode