changed the theme to the one from http://www.css3templates.co.uk/templates/CSS3_simplistic/index.html
removed old files
fixed merge conflicts