Finish converting all option buttons to the new style