Remove remaining hardcoded theme names