remove the dependency on the theme