Moving toggle support to a mixin