Themes
Correction bug + clean