Move styles that relate to multiple modules back into general styles