Reformatting CSS file to use mixins