Fix theme overrides