Added macros file and updated defaults