More bug fixes
Updates gradients mixins.. tested