Fixed settings parsing
Pull in changes to defaults while maintaining user settings