Add Selectasaur and select styles
Fix merge conflicts