Removed all the images from this project and abstracted them in a theme mechanism
Fixed merge bug