themes are now almost organized