Updated badge sources and order