updates to mixins and additional partials