scss mixins and variables updated