Catchup with sass mixin refactor