Update some mixins, switch to Compass mixins