New Settings and Styles refactoring