adding support for combined files and themes