Separate handling of modules and themes