Now the themes are managed in a better way