drop old-format config defaults
use Globals variables
merge remote changes