Merge "Add Preference highlighting"