themes: fix conflict