updates theme, adds google and tidy up
merge