replaced a few @ with $ in mixins