removed bourbon but kept two mixins to deal with outstanding issues