Add choosers and other styles
Merge remote-tracking branch 'upstream/sass' into sass