diff --git a/lib/review/epubmaker.rb b/lib/review/epubmaker.rb
index 9010420ac..666181708 100644
--- a/lib/review/epubmaker.rb
+++ b/lib/review/epubmaker.rb
@@ -315,22 +315,25 @@ def build_part(part, basetmpdir, htmlfile)
       File.open(File.join(basetmpdir, htmlfile), 'w') do |f|
         @part_number = part.number
         @part_title = part.name.strip
-        @body = ReVIEW::Template.generate(path: 'html/_part_body.html.erb', binding: binding)
-
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_part_body.html.erb', systemfile: 'html/_part_body.html.erb'), binding: binding)
         @language = @producer.config['language']
         @stylesheets = @producer.config['stylesheet']
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)
       end
     end
 
-    def template_name
+    def template_name(localfile: 'layout.html.erb', systemfile: nil)
       if @basedir
-        layoutfile = File.join(@basedir, 'layouts', 'layout.html.erb')
+        layoutfile = File.join(@basedir, 'layouts', localfile)
         if File.exist?(layoutfile)
           return layoutfile
         end
       end
 
+      if systemfile
+        return systemfile
+      end
+
       if @producer.config['htmlversion'].to_i == 5
         './html/layout-html5.html.erb'
       else
@@ -552,25 +555,12 @@ def copy_frontmatter(basetmpdir)
     end
 
     def build_titlepage(basetmpdir, htmlfile)
-      # TODO: should be created via epubcommon
       @title = h(@config.name_of('booktitle'))
       File.open(File.join(basetmpdir, htmlfile), 'w') do |f|
-        @body = ''
-        @body << %Q(<div class="titlepage">\n)
-        @body << %Q(<h1 class="tp-title">#{h(@config.name_of('booktitle'))}</h1>\n)
-        if @config['subtitle']
-          @body << %Q(<h2 class="tp-subtitle">#{h(@config.name_of('subtitle'))}</h2>\n)
-        end
-        if @config['aut']
-          @body << %Q(<h2 class="tp-author">#{h(@config.names_of('aut').join(ReVIEW::I18n.t('names_splitter')))}</h2>\n)
-        end
-        if @config['pbl']
-          @body << %Q(<h3 class="tp-publisher">#{h(@config.names_of('pbl').join(ReVIEW::I18n.t('names_splitter')))}</h3>\n)
-        end
-        @body << '</div>'
-
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_titlepage.html.erb', systemfile: 'html/_titlepage.html.erb'), binding: binding)
         @language = @producer.config['language']
         @stylesheets = @producer.config['stylesheet']
+
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)
       end
     end
diff --git a/lib/review/epubmaker/epubcommon.rb b/lib/review/epubmaker/epubcommon.rb
index 7c98f9bc1..1940b3bfe 100644
--- a/lib/review/epubmaker/epubcommon.rb
+++ b/lib/review/epubmaker/epubcommon.rb
@@ -101,14 +101,18 @@ def coverimage
         end
       end
 
-      def template_name
+      def template_name(localfile: 'layout.html.erb', systemfile: nil)
         if @workdir
-          layoutfile = File.join(@workdir, 'layouts', 'layout.html.erb')
+          layoutfile = File.join(@workdir, 'layouts', localfile)
           if File.exist?(layoutfile)
             return layoutfile
           end
         end
 
+        if systemfile
+          return systemfile
+        end
+
         if config['htmlversion'].to_i == 5
           './html/layout-html5.html.erb'
         else
@@ -126,7 +130,7 @@ def cover
           @coverimage_src = coverimage
           raise ApplicationError, "coverimage #{config['coverimage']} not found. Abort." unless @coverimage_src
         end
-        @body = ReVIEW::Template.generate(path: './html/_cover.html.erb', binding: binding)
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_cover.html.erb', systemfile: 'html/_cover.html.erb'), binding: binding)
 
         @title = h(config.name_of('title'))
         @language = config['language']
@@ -152,7 +156,7 @@ def titlepage
         if config.names_of('pbl')
           @publisher_str = join_with_separator(config.names_of('pbl'), ReVIEW::I18n.t('names_splitter'))
         end
-        @body = ReVIEW::Template.generate(path: './html/_titlepage.html.erb', binding: binding)
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_titlepage.html.erb', systemfile: './html/_titlepage.html.erb'), binding: binding)
 
         @language = config['language']
         @stylesheets = config['stylesheet']
@@ -164,7 +168,7 @@ def colophon
         @title = h(ReVIEW::I18n.t('colophontitle'))
         @isbn_hyphen = isbn_hyphen
 
-        @body = ReVIEW::Template.generate(path: './html/_colophon.html.erb', binding: binding)
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_colophon.html.erb', systemfile: './html/_colophon.html.erb'), binding: binding)
 
         @language = config['language']
         @stylesheets = config['stylesheet']
@@ -203,7 +207,7 @@ def colophon_history
           end
         end
 
-        ReVIEW::Template.generate(path: './html/_colophon_history.html.erb', binding: binding)
+        ReVIEW::Template.generate(path: template_name(localfile: '_colophon_history.html.erb', systemfile: './html/_colophon_history.html.erb'), binding: binding)
       end
 
       def date_to_s(date)
diff --git a/lib/review/webmaker.rb b/lib/review/webmaker.rb
index 08aa1b8d5..02f24a796 100644
--- a/lib/review/webmaker.rb
+++ b/lib/review/webmaker.rb
@@ -146,26 +146,27 @@ def build_body(basetmpdir, _yamlfile)
     def build_part(part, basetmpdir, htmlfile)
       @title = h("#{ReVIEW::I18n.t('part', part.number)} #{part.name.strip}")
       File.open("#{basetmpdir}/#{htmlfile}", 'w') do |f|
-        @body = ''
-        @body << %Q(<div class="part">\n)
-        @body << %Q(<h1 class="part-number">#{ReVIEW::I18n.t('part', part.number)}</h1>\n)
-        @body << %Q(<h2 class="part-title">#{part.name.strip}</h2>\n) if part.name.strip.present?
-        @body << "</div>\n"
-
+        @part_number = part.number
+        @part_title = part.name.strip
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_part_body.html.erb', systemfile: 'html/_part_body.html.erb'), binding: binding)
         @language = @config['language']
         @stylesheets = @config['stylesheet']
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)
       end
     end
 
-    def template_name
+    def template_name(localfile: 'layout-web.html.erb', systemfile: nil)
       if @basedir
-        layoutfile = File.join(@basedir, 'layouts', 'layout-web.html.erb')
+        layoutfile = File.join(@basedir, 'layouts', localfile)
         if File.exist?(layoutfile)
           return layoutfile
         end
       end
 
+      if systemfile
+        return systemfile
+      end
+
       if @config['htmlversion'].to_i == 5
         'web/html/layout-html5.html.erb'
       else
@@ -281,18 +282,8 @@ def build_indexpage(basetmpdir)
 
     def build_titlepage(basetmpdir, htmlfile)
       @title = h('titlepage')
-      File.open("#{basetmpdir}/#{htmlfile}", 'w') do |f|
-        @body = ''
-        @body << %Q(<div class="titlepage">)
-        @body << %Q(<h1 class="tp-title">#{h(@config.name_of('booktitle'))}</h1>)
-        if @config['aut']
-          @body << %Q(<h2 class="tp-author">#{join_with_separator(@config.names_of('aut'), ReVIEW::I18n.t('names_splitter'))}</h2>)
-        end
-        if @config['pbl']
-          @body << %Q(<h3 class="tp-publisher">#{join_with_separator(@config.names_of('pbl'), ReVIEW::I18n.t('names_splitter'))}</h3>)
-        end
-        @body << '</div>'
-
+      File.open(File.join(basetmpdir, htmlfile), 'w') do |f|
+        @body = ReVIEW::Template.generate(path: template_name(localfile: '_titlepage.html.erb', systemfile: 'html/_titlepage.html.erb'), binding: binding)
         @language = @config['language']
         @stylesheets = @config['stylesheet']
         f.write ReVIEW::Template.generate(path: template_name, binding: binding)
diff --git a/templates/html/_titlepage.html.erb b/templates/html/_titlepage.html.erb
index 45e508578..8c28915e6 100644
--- a/templates/html/_titlepage.html.erb
+++ b/templates/html/_titlepage.html.erb
@@ -1,20 +1,12 @@
-  <h1 class="tp-title"><%= @title_str %></h1>
-<% if @subtitle_str %>
-  <h2 class="tp-subtitle"><%= h(@subtitle_str) %></h2>
+<div class="titlepage">
+<h1 class="tp-title"><%= h(@config.name_of('booktitle')) %></h1>
+<% if @config['subtitle'] %>
+<h2 class="tp-subtitle"><%= h(@config.name_of('subtitle')) %></h2>
 <% end %>
-<% if @author_str %>
-  <p>
-    <br />
-    <br />
-  </p>
-  <h2 class="tp-author"><%= h(@author_str) %></h2>
+<% if @config['aut'] %>
+<h2 class="tp-author"><%= h(@config.names_of('aut').join(ReVIEW::I18n.t('names_splitter'))) %></h2>
 <% end %>
-<% if @publisher_str %>
-  <p>
-    <br />
-    <br />
-    <br />
-    <br />
-  </p>
-  <h3 class="tp-publisher"><%= h(@publisher_str) %></h3>
+<% if @config['pbl'] %>
+<h3 class="tp-publisher"><%= h(@config.names_of('pbl').join(ReVIEW::I18n.t('names_splitter'))) %></h3>
 <% end %>
+</div>
diff --git a/test/test_epubmaker.rb b/test/test_epubmaker.rb
index cee77f001..0380fbb05 100644
--- a/test/test_epubmaker.rb
+++ b/test/test_epubmaker.rb
@@ -6,6 +6,7 @@ def setup
     config = ReVIEW::Configure.values
     config.merge!(
       'bookname' => 'sample',
+      'booktitle' => 'Sample Book',
       'title' => 'Sample Book',
       'epubversion' => 2,
       'urnid' => 'http://example.jp/',
@@ -806,19 +807,11 @@ def test_title
   <title>Sample Book</title>
 </head>
 <body>
-  <h1 class="tp-title">Sample Book</h1>
-  <p>
-    <br />
-    <br />
-  </p>
-  <h2 class="tp-author">Mr.Smith</h2>
-  <p>
-    <br />
-    <br />
-    <br />
-    <br />
-  </p>
-  <h3 class="tp-publisher">BLUEPRINT</h3>
+<div class="titlepage">
+<h1 class="tp-title">Sample Book</h1>
+<h2 class="tp-author">Mr.Smith</h2>
+<h3 class="tp-publisher">BLUEPRINT</h3>
+</div>
 </body>
 </html>
 EOT
@@ -842,19 +835,11 @@ def test_title_single_value_param
   <title>Sample Book</title>
 </head>
 <body>
-  <h1 class="tp-title">Sample Book</h1>
-  <p>
-    <br />
-    <br />
-  </p>
-  <h2 class="tp-author">Mr.Smith</h2>
-  <p>
-    <br />
-    <br />
-    <br />
-    <br />
-  </p>
-  <h3 class="tp-publisher">BLUEPRINT</h3>
+<div class="titlepage">
+<h1 class="tp-title">Sample Book</h1>
+<h2 class="tp-author">Mr.Smith</h2>
+<h3 class="tp-publisher">BLUEPRINT</h3>
+</div>
 </body>
 </html>
 EOT