calendar theme patch and node export patch revert