Revert "sync with CIRANDAS/themes"

This reverts commit c2afe9224f10b30145e64734f57f21f3c5d73589.