Theme merging