done some shizzle, new mixins and gallery cod
e
resolving conflicts GF