Sorry to hear about your badges system. I am not sure what level you are working at but I am finding forallrubrics.com/forallbadges.com great place to host. No guarantees with anything of course but the ability to link a rubric to a badge has been great for thinking though structure.