Moved BadgeStyle to Classes