added new images and added theme
fixed merge conflict
merge conflict fixed