Removed vanilla/flavoured radio buttons
Merge branch 'master' into alongside