Disable highlighting adjustments on GUI
Merge branch 'adjust-highlighting'