Updated SASS and Mixins