a little change of the theme selector structure
service names fixes