Updated DEFAULT_SETTINGS