Added CMSTT figure macros and files