update x86 config and move some config defaults to the config template