moved theme constructor to config functions file
Fixed merge conflicts
merging