remove themes
updated themes
gros refacto