changed the themes on the program
merge