Further reorganization of mixins and styles