Adjust for new badge styles