refactoring themes et al.