more mixins and removed unused partials