Changes for Branding extension, add more options