diff --git a/share/all.css b/share/all.css
index cc72132..b814fb4 100644
--- a/share/all.css
+++ b/share/all.css
@@ -11,7 +11,7 @@
   /* for Chrome & Safari */
   -webkit-text-stroke-width:0.13px; 
 }
-.pw {
+.b {
   border: 1px solid black;
   margin: 13px auto;
   overflow: hidden;
diff --git a/src/HTMLRenderer/export.cc b/src/HTMLRenderer/export.cc
index 3ae631b..ed7af33 100644
--- a/src/HTMLRenderer/export.cc
+++ b/src/HTMLRenderer/export.cc
@@ -21,7 +21,7 @@ void HTMLRenderer::export_remote_font(const FontInfo & info, const string & suff
         auto fn = str_fmt("f%llx%s", info.id, suffix.c_str());
         if(param->single_html)
         {
-            allcss_fout << "'data:font/opentype;base64," << base64stream(ifstream(tmp_dir + "/" + (char*)fn, ifstream::binary)) << "'";
+            allcss_fout << "'data:font/" << fontfileformat << ";base64," << base64stream(ifstream(tmp_dir + "/" + (char*)fn, ifstream::binary)) << "'";
         }
         else
         {
diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc
index 3c9770b..643ce67 100644
--- a/src/HTMLRenderer/general.cc
+++ b/src/HTMLRenderer/general.cc
@@ -174,11 +174,8 @@ void HTMLRenderer::startPage(int pageNum, GfxState *state)
 
     assert((!line_opened) && "Open line in startPage detected!");
 
-    // Add by Hongliang Tian
-    // wrapper for page
-    html_fout << "<div class=\"pw\" style=\"width:" << pageWidth << "px;height:" << pageHeight << "px;\">" << endl; 
-
-    html_fout << "<div id=\"p" << pageNum << "\" class=\"p\" style=\"width:" << pageWidth << "px;height:" << pageHeight << "px;";
+    html_fout << "<div class=\"b\" style=\"width:" << pageWidth << "px;height:" << pageHeight << "px;\">"
+        << "<div id=\"p" << pageNum << "\" class=\"p\" style=\"width:" << pageWidth << "px;height:" << pageHeight << "px;";
 
     html_fout << "background-image:url(";
 
@@ -225,8 +222,7 @@ void HTMLRenderer::startPage(int pageNum, GfxState *state)
 void HTMLRenderer::endPage() {
     close_line();
     // close page
-    // Modified by Hongliang Tian
-    html_fout << "</div>" << endl << "</div>" << endl;
+    html_fout << "</div>" << "</div>" << endl;
 }
 
 void HTMLRenderer::process_single_html()
diff --git a/src/include/HTMLRenderer.h b/src/include/HTMLRenderer.h
index 59f66c6..585e194 100644
--- a/src/include/HTMLRenderer.h
+++ b/src/include/HTMLRenderer.h
@@ -35,6 +35,7 @@
  *
  * CSS classes
  *
+ * b - page Box
  * p - Page
  * l - Line
  * _ - white space
diff --git a/src/pdf2htmlEX.cc b/src/pdf2htmlEX.cc
index 4406893..87da7c2 100644
--- a/src/pdf2htmlEX.cc
+++ b/src/pdf2htmlEX.cc
@@ -76,7 +76,7 @@ void parse_options (int argc, char **argv)
         .add("space-as-offset", &param.space_as_offset, 0, "treat space characters as offsets")
 
         .add("font-suffix", &param.font_suffix, ".ttf", "suffix for extracted font files")
-        .add("font-format", &param.font_format, "truetype", "format for extracted font files")
+        .add("font-format", &param.font_format, "opentype", "format for extracted font files")
 
         .add("debug", &param.debug, 0, "output debug information")
         .add("clean-tmp", &param.clean_tmp, 1, "clean temporary files after processing")