move variables and fix mixins