new themes and few changes