Remove theme engine revert patches