clean up report template and preprocess, cross theme compitable