button toggles work with the new scheme