New builds
Add support for toggle on checkbox