Help keep Salon independent

Topic: OR-54