Revised settings key names/values