fix the theme feature in BB part