added themes
mergeing
fixing merge