refactor bundleClass for theme