Include new mixins and patials