Convert add-on to Nightingale & branding first part