FIX: Changes for moving settings location