T1001702 highlight dynamic

I created this branch about a year ago, I hope I got it now finally in a state where it can be merged.