more templating, organize less mixins, vars, etc