Major settings rework