rework mixin order