Settings: Cleanup and update [WIP]