WIP: Fixing theme extractor