macros execution fixes in md & portal new theme "initial"