Change themes data structure: index by simple name
Adapt theme picker