add some themes
resolved conflict