Refactored mixes
Refactored settings