Highlight state considation

This builds on #1729 and makes our language a lot more consistent. For my sanity.
Alright. Deferring to you, but part of me was thinking that it would make lots of sense to focus them, as a verb, with side effects like scrolling the sidebar to move them into view.