Rename listItemSelector to itemSelector since we use it on more than just list items
Conform image selection state to use itemSelector