Proper chooser styles
Merge branch 'release/1.3.1'