Added selection highlighting overrides