IMO this whole change is wrong, you should probably adjust macro with buttons and not replace it all way long.