Help keep Salon independent

Topic: FL-13