fix theme validation errors, reogranize content template, update modernizr