Theme works
Conflict solved