Modernize badges