modified to include new themes