Fix highlight theming