@talbs - I think these do need to be mixins though, as these are theme specific and not class specific...