UIKIT-7 refactor to use mixins