Close #28: remove theme prefixes