Help keep Salon independent

Topic: phab 2