added more mixins and variable fixed