fix3
Merge branch 'Theme-and-combo-buttons-by-@xiushudongfang' into adhoc-and-Theme-and-combo