Theme and combo buttons
fix
fix2
fix3
Merge pull request #1 from sum2012/Theme-and-combo-buttons-by-@xiushudongfang

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