Settings: fixing now [WIP]