echo doctype directly in theme rather than in template and minor fix