Moved custom macros / envs to separate file