Remove class feature.
Handle expanding the theme better