Settings revamp... WIP