added new mixins, new classes and dryed up more other classes