Refactor of update to set/unset/reset. Highlighting based on set/unset instead of play