Change highlighted props to state