Update mixin / class structure to avoid unwanted duplication

This is the first step in avoiding CSS duplication due to @import.  More to come, but this is a good first step.  Cuts a few CSS files down by ~2k.