Themes Clean and Dark built
Conflict solved