added thx.macro.MacroTypes