new mixin, indent improvements

i don't get why github treats this as if i changed every line in the file, i give up