Fix Branding: Once and For All