OA-573 - Sorting tpls for is markup and classes changes are needed - removing tpls from the theme layer that do not require change