switch standard tools to new format
switch macro tools to new xml object format