Make branding more easy for various app modes