Implement improved incremental highlighting

- highlight other window too!
- close #42