Add auto-highlighting option