Fix theme keys