fixed some problems of theme set.