added themes in separate files and modules