moving to select choice
Merge branch 'feat-highlight'

* feat-highlight:
  moving to select choice
updating builds