diff --git a/fonts/manifest.yml b/fonts/manifest.yml
index 0ec06d1b1..de57288ff 100644
--- a/fonts/manifest.yml
+++ b/fonts/manifest.yml
@@ -82,29 +82,6 @@ Source Han Sans:
 Source Han Sans Normal:
   - Regular
 
-Source Code Pro:
-  - Regular
-  - Italic
-  - Bold Italic
-  - Bold
-
-Source Sans Pro:
-  - Italic
-  - Bold Italic
-  - Regular
-  - Bold
-
-Source Sans Pro Light:
-  - Regular
-  - Italic
-
-Source Serif Pro:
-  - Bold
-  - Bold Italic
-  - Regular
-  - Italic
-
-
 Fira Code:
   - Regular
  
diff --git a/xslt_src/cc.standard.core.xsl b/xslt_src/cc.standard.core.xsl
index fef64e20b..eb5c9757a 100644
--- a/xslt_src/cc.standard.core.xsl
+++ b/xslt_src/cc.standard.core.xsl
@@ -248,9 +248,9 @@
 				</fo:static-content>
 				<xsl:call-template name="insertHeaderFooter"/>
 				<fo:flow flow-name="xsl-region-body">
-					<fo:block font-size="16pt" font-weight="bold" margin-bottom="17pt" role="H1">
+					<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="17pt" role="H1">
 						<xsl:value-of select="/csd:csd-standard/csd:bibdata/csd:title[@language = 'en']"/>
-					</fo:block>
+					</fo:block> -->
 					<fo:block>
 						<xsl:call-template name="processMainSectionsDefault"/>
 					</fo:block>
@@ -432,6 +432,11 @@
 	<!-- ============================= -->
 	<!-- ============================= -->
 	
+	<xsl:template match="csd:sections/csd:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="16pt" font-weight="bold" margin-bottom="17pt" role="H1">
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
 	
 	<xsl:template match="csd:title" name="title">
 		
diff --git a/xslt_src/common.xsl b/xslt_src/common.xsl
index 983e53f33..d58362fdd 100644
--- a/xslt_src/common.xsl
+++ b/xslt_src/common.xsl
@@ -9542,6 +9542,8 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 	
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3" />
 	
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
@@ -17013,7 +17015,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>
diff --git a/xslt_src/iec.international-standard.core.xsl b/xslt_src/iec.international-standard.core.xsl
index b8d08801a..a4dfa8911 100644
--- a/xslt_src/iec.international-standard.core.xsl
+++ b/xslt_src/iec.international-standard.core.xsl
@@ -1380,10 +1380,13 @@
 		<fo:block break-after="page"/>
 	</xsl:template>
 	
-	<xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/iec:p[starts-with(@class, 'zzSTDTitle')]" priority="3">
+	<xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/iec:p[starts-with(@class, 'zzSTDTitle')]" priority="4">
 		<fo:block-container font-size="12pt" text-align="center">
 			<xsl:if test="following-sibling::*[1][not(self::iec:p[starts-with(@class, 'zzSTDTitle')])]">
 				<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+				<xsl:if test="ancestor::*[local-name() = 'sections']">
+					<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
+				</xsl:if>
 			</xsl:if>
 			<fo:block>
 				<xsl:if test="iec:strong"> <!-- title -->
@@ -1394,6 +1397,10 @@
 		</fo:block-container>
 	</xsl:template>
 	
+	<xsl:template match="*[local-name() = 'sections']/iec:p[@class = 'zzSTDTitle1']//text()" priority="4">
+		<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
+	</xsl:template>
+	
 	<xsl:template name="insertPrefacepages">
 		<xsl:param name="lang" select="$lang"/>
 		<fo:block break-after="page"/>
@@ -1439,7 +1446,7 @@
 			<xsl:call-template name="insertHeaderFooter"/>
 			<fo:flow flow-name="xsl-region-body">
 				
-				<fo:block-container font-size="12pt" text-align="center" margin-bottom="36pt">
+				<!-- <fo:block-container font-size="12pt" text-align="center" margin-bottom="36pt">
 					
 					<fo:block font-weight="bold" role="H1">						
 					
@@ -1449,7 +1456,7 @@
 						
 						<fo:block>&#xa0;</fo:block>
 					</fo:block>
-				</fo:block-container>
+				</fo:block-container> -->
 				
 				<!-- Main sections -->
 				<fo:block>				
diff --git a/xslt_src/ieee.standard.core.xsl b/xslt_src/ieee.standard.core.xsl
index 905eaa69d..031f6913e 100644
--- a/xslt_src/ieee.standard.core.xsl
+++ b/xslt_src/ieee.standard.core.xsl
@@ -1100,7 +1100,7 @@
 							<fo:flow flow-name="xsl-region-body">
 								<!-- debugpage=<xsl:copy-of select="."/> -->
 								
-								<xsl:if test="position() = 1">
+								<!-- <xsl:if test="position() = 1">
 									
 									<xsl:choose>
 										<xsl:when test="$current_template = 'draft'">
@@ -1113,8 +1113,6 @@
 												<xsl:copy-of select="$title_prefix"/>
 												<xsl:copy-of select="$title"/>
 												
-												
-												<!-- <xsl:copy-of select="$draft_title_part"/> -->
 											</fo:block>
 										</xsl:when>
 										
@@ -1126,29 +1124,20 @@
 											</fo:block>
 										</xsl:when>
 										
-										<xsl:otherwise> <!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
+										<xsl:otherwise>  --><!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
 										
-											<xsl:attribute name="font-family">Calibri Light</xsl:attribute>
+											<!-- <xsl:attribute name="font-family">Calibri Light</xsl:attribute>
 											<xsl:attribute name="font-size">12pt</xsl:attribute>
 											
 											<fo:block font-family="Arial Black" font-size="20pt" margin-top="18pt">
 												<xsl:copy-of select="$title"/>
-												<!-- <xsl:copy-of select="$draft_title_part"/> -->
 											</fo:block>
 											<xsl:call-template name="addBlueBox"/>
-											<!-- <fo:block font-size="1" margin-top="3mm">
-												<fo:instream-foreign-object content-width="57mm" content-height="3mm" scaling="non-uniform" fox:alt-text="Image Box">
-													<xsl:call-template name="insertImageBoxSVG">
-														<xsl:with-param name="color"><xsl:value-of select="$color_blue"/></xsl:with-param>
-													</xsl:call-template>
-												</fo:instream-foreign-object>
-											</fo:block>
-											<fo:block margin-top="12pt" margin-bottom="12pt">&#xa0;</fo:block> -->
 											<fo:block margin-bottom="12pt">&#xa0;</fo:block>
 										</xsl:otherwise>
 									</xsl:choose>
 									
-								</xsl:if>
+								</xsl:if> -->
 								
 								<xsl:apply-templates select="*" mode="page"/>
 								<xsl:if test="position() = last()"><fo:block id="lastBlockMain"/></xsl:if>
@@ -1781,6 +1770,32 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template match="ieee:p[@class = 'zzSTDTitle1']" priority="4">
+		<xsl:choose>
+			<xsl:when test="$current_template = 'draft'">
+				<fo:block font-family="Arial" font-size="23pt" font-weight="bold" margin-top="70pt" margin-bottom="48pt">
+					<xsl:if test="contains('amendment corrigendum erratum', $subdoctype) and $subdoctype != ''">
+						<xsl:attribute name="font-size">24pt</xsl:attribute>
+					</xsl:if>
+					<xsl:apply-templates />
+				</fo:block>
+			</xsl:when>
+			<xsl:when test="$current_template = 'standard'">
+				<fo:block font-family="Arial" font-weight="bold" margin-top="13mm" space-after="12pt">
+					<xsl:apply-templates />
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise> <!-- $current_template = 'whitepaper' or $current_template = 'icap-whitepaper' or $current_template = 'industry-connection-report' -->
+			
+				<fo:block font-family="Arial Black" font-size="20pt" margin-top="18pt">
+					<xsl:apply-templates />
+				</fo:block>
+				<xsl:call-template name="addBlueBox"/>
+				<fo:block margin-bottom="12pt">&#xa0;</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<xsl:template match="node()">		
 		<xsl:apply-templates />			
 	</xsl:template>
diff --git a/xslt_src/iso.international-standard.core.xsl b/xslt_src/iso.international-standard.core.xsl
index 3435fe25e..830a54ecb 100644
--- a/xslt_src/iso.international-standard.core.xsl
+++ b/xslt_src/iso.international-standard.core.xsl
@@ -1414,12 +1414,9 @@
 						<fo:flow flow-name="xsl-region-body">
 						
 							
-							<fo:block-container>
-								<!-- Information and documentation — Codes for transcription systems -->
-								<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt">
-									<xsl:value-of select="$title-en"/>
-								</fo:block>
-								 -->
+							<!-- Information and documentation — Codes for transcription systems -->
+							<!-- <fo:block-container>
+								
 								<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
 								
 									<fo:block role="SKIP">
@@ -1445,7 +1442,7 @@
 									
 								</fo:block>
 							
-							</fo:block-container>
+							</fo:block-container> -->
 							<!-- Clause(s) -->
 							<fo:block>
 								
@@ -1825,6 +1822,31 @@
 		</xsl:if>
 	</xsl:template>
 	
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
+			<xsl:if test="following-sibling::*[1][self::iso:p][starts-with(@class, 'zzSTDTitle')]">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
+	
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']/iso:span[@class = 'nonboldtitle']" priority="3">
+		<!-- Example: <span class="nonboldtitle">Part 1:</span> -->
+		<fo:block font-weight="normal" margin-top="12pt" line-height="1.1" role="SKIP">
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
+	
+	
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle2']" priority="4">
+		<!-- Example: <p class="zzSTDTitle2" displayorder="3">AMENDMENT 1: Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions</p> -->
+		<xsl:if test="$doctype = 'amendment'">
+			<fo:block font-size="18pt" margin-top="12pt" margin-bottom="20pt" margin-right="0mm" font-weight="normal" line-height="1.1" role="H1">
+				<xsl:apply-templates />
+			</fo:block>
+		</xsl:if>
+	</xsl:template>
 	
 	<!-- ==================== -->
 	<!-- END display titles   -->
diff --git a/xslt_src/itu.recommendation.core.xsl b/xslt_src/itu.recommendation.core.xsl
index c2fa1f731..0c5e2a245 100644
--- a/xslt_src/itu.recommendation.core.xsl
+++ b/xslt_src/itu.recommendation.core.xsl
@@ -48,17 +48,19 @@
 	<xsl:variable name="contents_">
 		<contents>
 			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:preface/node()" mode="contents"/> -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" mode="contents" /> <!-- @id = 'scope' -->
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" mode="contents" /> -->
 				
 			<!-- Normative references -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" mode="contents" /> <!-- @id = 'references' -->
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" mode="contents" />
 			
-			<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" mode="contents" /> <!-- @id != 'scope' -->
+			<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" mode="contents" />
 				
-			<xsl:apply-templates select="/itu:itu-standard/itu:annex" mode="contents"/>
+			<xsl:apply-templates select="/itu:itu-standard/itu:annex" mode="contents"/> -->
 			
 			<!-- Bibliography -->
-			<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]" mode="contents"/> <!-- @id = 'bibliography' -->
+			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]" mode="contents"/> -->
+			
+			<xsl:call-template name="processMainSectionsDefault_Contents"/>
 			
 			<xsl:apply-templates select="//itu:table" mode="contents"/>
 			
@@ -1090,7 +1092,7 @@
 				
 				<fo:flow flow-name="xsl-region-body">
 				
-					<xsl:if test="$doctype != 'service-publication'">
+					<!-- <xsl:if test="$doctype != 'service-publication' and 1 = 2"> 
 						<fo:block-container font-size="14pt" >
 							<xsl:choose>
 								<xsl:when test="$doctype = 'resolution'">
@@ -1119,7 +1121,7 @@
 								<xsl:variable name="subtitle" select="/itu:itu-standard/itu:bibdata/itu:title[@type = 'subtitle' and @language = $lang]"/>
 								<xsl:if test="$subtitle != ''">
 									<fo:block margin-top="18pt" font-weight="normal" font-style="italic">
-										<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+										<xsl:if test="$lang = 'ar'">
 											<xsl:attribute name="font-style">normal</xsl:attribute>
 										</xsl:if>
 										<xsl:value-of select="$subtitle"/>
@@ -1130,7 +1132,7 @@
 								<xsl:if test="$doctype = 'resolution' and $resolution-placedate != ''">
 									<fo:block font-size="11pt" margin-top="6pt" font-weight="normal">
 										<fo:inline font-style="italic">
-											<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+											<xsl:if test="$lang = 'ar'">
 												<xsl:attribute name="font-style">normal</xsl:attribute>
 											</xsl:if>
 											<xsl:text>(</xsl:text><xsl:value-of select="$resolution-placedate"/><xsl:text>)</xsl:text>
@@ -1140,23 +1142,26 @@
 								</xsl:if>
 							</fo:block>
 						</fo:block-container>
-					</xsl:if>
+					</xsl:if> -->
 					
 					
 					<!-- Clause(s) -->
 					<fo:block>
 						<!-- Scope -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" /> <!-- @id = 'scope' -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" /> -->
 							
 						<!-- Normative references -->						
-						<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" /> <!-- @id = 'references' -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[@normative='true']" />
 							
-						<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" /> <!-- @id != 'scope' -->
+						<xsl:apply-templates select="/itu:itu-standard/itu:sections/*[not(@type='scope')]" />
 							
-						<xsl:apply-templates select="/itu:itu-standard/itu:annex"/>
+						<xsl:apply-templates select="/itu:itu-standard/itu:annex"/> -->
 						
 						<!-- Bibliography -->
-						<xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]"/> <!-- @id = 'bibliography' -->
+						<!-- <xsl:apply-templates select="/itu:itu-standard/itu:bibliography/itu:references[not(@normative='true')]"/> -->
+						
+						<xsl:call-template name="processMainSectionsDefault"/>
+						
 					</fo:block>
 					
 				</fo:flow>
@@ -1309,6 +1314,37 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="itu:clause[@type = 'keyword']" priority="4"/>
+
+	<xsl:template match="itu:sections/itu:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="14pt">
+			<xsl:choose>
+				<xsl:when test="$doctype = 'resolution'">
+					<xsl:attribute name="text-align">center</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:attribute name="font-weight">bold</xsl:attribute>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
+	
+	<xsl:template match="itu:sections/itu:p[@class = 'zzSTDTitle2']" priority="4">
+		<fo:block font-size="14pt" font-weight="bold" text-align="center" margin-top="15pt" margin-bottom="15pt" role="H1">
+			<xsl:if test="$lang = 'ar'"> <!-- to prevent rendering `###` due the missing Arabic glyphs in the italic font (Times New Roman) -->
+				<xsl:attribute name="font-style">normal</xsl:attribute>
+			</xsl:if>
+			<!-- Example: <p align="center" class="zzSTDTitle2" displayorder="4"><em>(Hammamet, 2016</em>) -->
+			<xsl:if test="@align = 'center'">
+				<xsl:attribute name="font-size">11pt</xsl:attribute>
+				<xsl:attribute name="margin-top">6pt</xsl:attribute>
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="node()">		
 		<xsl:apply-templates />			
 	</xsl:template>
@@ -1772,14 +1808,14 @@
 	</xsl:template> -->
 
 	<!-- footnotes for title -->
-	<xsl:template match="itu:bibdata/itu:note[@type = 'title-footnote']" mode="title_footnote">
+	<!-- <xsl:template match="itu:bibdata/itu:note[@type = 'title-footnote']" mode="title_footnote">
 		<xsl:variable name="number" select="position()"/>
 		<fo:footnote>
 			<fo:inline font-size="60%" keep-with-previous.within-line="always" vertical-align="super">
 				<fo:basic-link internal-destination="title_footnote_{$number}" fox:alt-text="titlefootnote  {$number}">
 					<xsl:value-of select="$number"/>
 				</fo:basic-link>
-				<xsl:if test="position() != last()">,</xsl:if><!-- <fo:inline  baseline-shift="20%">,</fo:inline> -->
+				<xsl:if test="position() != last()">,</xsl:if>
 			</fo:inline>
 			<fo:footnote-body>
 				<fo:block font-size="11pt" margin-bottom="12pt" text-align="justify">
@@ -1790,7 +1826,7 @@
 				</fo:block>
 			</fo:footnote-body>
 		</fo:footnote>
-	</xsl:template>
+	</xsl:template> -->
 
 	
 	
diff --git a/xslt_src/jcgm.standard.core.xsl b/xslt_src/jcgm.standard.core.xsl
index e3c0d9b01..0312c7397 100644
--- a/xslt_src/jcgm.standard.core.xsl
+++ b/xslt_src/jcgm.standard.core.xsl
@@ -418,12 +418,15 @@
 				
 				<fo:flow flow-name="xsl-region-body" line-height="115%">
 					
-					<fo:block-container>
+					
+					<xsl:if test="count(//*[local-name() = 'bipm-standard']) != 1 ">
+						<!-- <fo:block-container> -->
 						<!-- Show title -->
 						<!-- Example: Evaluation of measurement data — An introduction to the `Guide to the expression of uncertainty in measurement' and related documents -->
 						
 						<xsl:for-each select="//*[local-name() = 'bipm-standard']">
-							<fo:block font-size="20pt" font-weight="bold" margin-bottom="20pt" space-before="36pt" line-height="1.1">
+						
+							<!-- <fo:block font-size="20pt" font-weight="bold" margin-bottom="20pt" space-before="36pt" line-height="1.1">
 								<xsl:variable name="curr_lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
 								
 								<xsl:variable name="title-main">
@@ -451,10 +454,13 @@
 									<fo:block margin-top="12pt"><xsl:copy-of select="$edition"/></fo:block>
 								</xsl:if>
 								
-							</fo:block>
+							</fo:block> -->
+							
+							<xsl:apply-templates select="jcgmsections/jcgm:p[starts-with(@class, 'zzSTDTitle')]"/>
+							
 						</xsl:for-each>
-					
-					</fo:block-container>
+						<!-- </fo:block-container> -->
+					</xsl:if>
 					<!-- Clause(s) -->
 					<fo:block>
 						<xsl:choose>
@@ -606,6 +612,32 @@
 		</fo:block>
 	</xsl:template>
 
+	<xsl:template match="jcgm:sections/jcgm:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="20pt" font-weight="bold" margin-bottom="20pt" space-before="36pt" line-height="1.1" role="H1">
+			<xsl:if test="following-sibling::*[1][self::jcgm:p][starts-with(@class, 'zzSTDTitle')]">
+				<xsl:attribute name="margin-bottom">0</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates />
+		</fo:block>
+		<xsl:variable name="curr_lang" select="ancestor::jcgm:bipm-standard/*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
+		<xsl:variable name="edition">
+			<xsl:apply-templates select="ancestor::jcgm:bipm-standard/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) = '']">
+				<xsl:with-param name="curr_lang" select="$curr_lang"/>
+			</xsl:apply-templates>
+		</xsl:variable>
+		<xsl:if test="normalize-space($edition) != ''">
+			<fo:block font-size="20pt" font-weight="bold" margin-top="12pt" margin-bottom="20pt" line-height="1.1">
+				<xsl:copy-of select="$edition"/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template>
+	
+	<xsl:template match="jcgm:sections/jcgm:p[@class = 'zzSTDTitle2']" priority="4">
+		<fo:block font-size="20pt" font-weight="bold" margin-top="12pt" margin-bottom="20pt" line-height="1.1">
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
+
 	<xsl:template match="node()">		
 		<xsl:apply-templates />			
 	</xsl:template>
diff --git a/xslt_src/jis.international-standard.core.xsl b/xslt_src/jis.international-standard.core.xsl
index 009315edc..f40dad5e2 100644
--- a/xslt_src/jis.international-standard.core.xsl
+++ b/xslt_src/jis.international-standard.core.xsl
@@ -482,7 +482,7 @@
 							
 							<fo:flow flow-name="xsl-region-body">
 								
-								<xsl:if test="position() = 1">
+								<!-- <xsl:if test="position() = 1">
 									<fo:table table-layout="fixed" width="100%">
 										<fo:table-column column-width="proportional-column-width(35)"/>
 										<fo:table-column column-width="proportional-column-width(97)"/>
@@ -497,7 +497,7 @@
 															<xsl:with-param name="key">doctype_dict.<xsl:value-of select="$doctype"/></xsl:with-param>
 														</xsl:call-template>
 													</fo:block>
-													</fo:table-cell>
+												</fo:table-cell>
 												<fo:table-cell text-align="right">
 													<fo:block font-family="Arial" font-size="16pt">
 														<xsl:value-of select="java:replaceAll(java:java.lang.String.new($docnumber), '^(JIS)(.*)', '$1')"/>
@@ -520,22 +520,22 @@
 									<fo:block font-family="IPAexGothic" font-size="19pt" text-align="center" margin-top="12mm" margin-bottom="4mm"><xsl:value-of select="$title_ja"/></fo:block>
 									<fo:block font-family="Arial" font-size="13pt" text-align="center" margin-bottom="10mm"><xsl:value-of select="$title_en"/></fo:block>
 									
-								</xsl:if>
+								</xsl:if> -->
 								
 								
 								<!-- Annex Commentary first page -->
-								<xsl:if test="$isCommentary = 'true'">
+								<!-- <xsl:if test="$isCommentary = 'true'"> -->
 									
 									<!-- Example: JIS Z 8301：2019  -->
-									<fo:block font-family="IPAexGothic" font-size="15pt" text-align="center">
+									<!-- <fo:block font-family="IPAexGothic" font-size="15pt" text-align="center">
 										<fo:inline font-family="Arial">JIS <xsl:value-of select="$docidentifier_number"/></fo:inline>
 										<fo:inline baseline-shift="10%"><fo:inline font-size="10pt">：</fo:inline>
 										<fo:inline font-family="Times New Roman" font-size="10pt"><xsl:value-of select="$docidentifier_year"/></fo:inline></fo:inline>
-									</fo:block>
+									</fo:block> -->
 
 									<!-- title -->
-									<fo:block role="H1" font-family="IPAexGothic" font-size="16pt" text-align="center" margin-top="6mm"><xsl:value-of select="$title_ja"/></fo:block>
-								</xsl:if>
+									<!-- <fo:block role="H1" font-family="IPAexGothic" font-size="16pt" text-align="center" margin-top="6mm"><xsl:value-of select="$title_ja"/></fo:block> -->
+								<!-- </xsl:if> -->
 								
 								<xsl:apply-templates select="*" mode="page"/>
 								
@@ -731,6 +731,130 @@
 		</fo:page-sequence>
 	</xsl:template> <!-- insertInnerCoverPage -->
 	
+	<xsl:template match="jis:p[@class = 'JapaneseIndustrialStandard']" priority="4">
+		<fo:table table-layout="fixed" width="100%">
+			<fo:table-column column-width="proportional-column-width(36)"/>
+			<fo:table-column column-width="proportional-column-width(92)"/>
+			<fo:table-column column-width="proportional-column-width(36)"/>
+			<fo:table-body>
+				<fo:table-row>
+					<fo:table-cell>
+						<fo:block>&#xa0;</fo:block>
+					</fo:table-cell>
+					<fo:table-cell font-family="IPAexGothic" font-size="14pt" text-align="center">
+						<fo:block><xsl:apply-templates /></fo:block>
+					</fo:table-cell>
+					<fo:table-cell padding-left="5mm">
+						<fo:block font-family="Arial" font-size="16pt">
+							<xsl:apply-templates select="jis:span[@class = 'JIS']">
+								<xsl:with-param name="process">true</xsl:with-param>
+							</xsl:apply-templates>
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</xsl:template>
+	
+	<xsl:template match="jis:p[@class = 'StandardNumber']" priority="4">
+		<fo:table table-layout="fixed" width="100%">
+			<fo:table-column column-width="proportional-column-width(36)"/>
+			<fo:table-column column-width="proportional-column-width(92)"/>
+			<fo:table-column column-width="proportional-column-width(36)"/>
+			<fo:table-body>
+				<fo:table-row>
+					<fo:table-cell>
+						<fo:block>&#xa0;</fo:block>
+					</fo:table-cell>
+					<fo:table-cell>
+						<fo:block>&#xa0;</fo:block>
+					</fo:table-cell>
+					<fo:table-cell>
+						<fo:block>
+							<xsl:apply-templates />
+						</fo:block>
+					</fo:table-cell>
+				</fo:table-row>
+			</fo:table-body>
+		</fo:table>
+	</xsl:template>
+	
+	<xsl:template match="jis:p[@class = 'StandardNumber']//text()[not(ancestor::jis:span)]" priority="4">
+		<fo:inline font-family="Arial" font-size="16pt">
+			<xsl:choose>
+				<xsl:when test="contains(., ':')">
+					<xsl:value-of select="substring-before(., ':')"/>
+					<fo:inline baseline-shift="10%" font-size="10pt" font-family="IPAexMincho">：</fo:inline>
+					<xsl:value-of select="substring-after(., ':')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</fo:inline>
+	</xsl:template>
+	
+	<xsl:template match="jis:p[@class = 'StandardNumber']/jis:span[@class = 'EffectiveYear']" priority="4">
+		<fo:inline font-size="10pt" baseline-shift="10%">
+			<fo:inline font-family="Times New Roman"><xsl:apply-templates/></fo:inline>
+		</fo:inline>
+	</xsl:template>
+	
+	<xsl:template match="jis:p[@class = 'JapaneseIndustrialStandard']/jis:tab" priority="4"/>
+		<!-- <fo:inline role="SKIP" padding-right="0mm">&#x200B;</fo:inline>
+	</xsl:template> -->
+	<xsl:template match="jis:p[@class = 'JapaneseIndustrialStandard']/jis:span[@class = 'JIS']" priority="4">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:inline font-size="16pt" font-family="Arial"><xsl:apply-templates/></fo:inline>
+		</xsl:if>
+	</xsl:template>
+	
+	<xsl:template match="jis:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-family="IPAexGothic" font-size="19pt" text-align="center" margin-top="12mm" margin-bottom="4mm">
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
+	
+	<xsl:template match="jis:p[@class = 'zzSTDTitle2']" priority="4">
+		<fo:block font-family="Arial" font-size="13pt" text-align="center" margin-bottom="10mm">
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
+	
+	<!-- for commentary annex -->
+	<xsl:template match="jis:p[@class = 'CommentaryStandardNumber']" priority="4">
+		<fo:block font-family="IPAexGothic" font-size="15pt" text-align="center">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	
+	<xsl:template match="jis:p[@class = 'CommentaryStandardNumber']//text()[not(ancestor::jis:span)]" priority="4">
+		<fo:inline font-family="Arial">
+			<xsl:choose>
+				<xsl:when test="contains(., ':')">
+					<xsl:value-of select="substring-before(., ':')"/>
+					<fo:inline baseline-shift="10%" font-size="10pt" font-family="IPAexMincho">：</fo:inline>
+					<xsl:value-of select="substring-after(., ':')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</fo:inline>
+	</xsl:template>
+	
+	<xsl:template match="jis:p[@class = 'CommentaryStandardNumber']/jis:span[@class = 'CommentaryEffectiveYear']" priority="4">
+		<fo:inline  baseline-shift="10%" font-family="Times New Roman" font-size="10pt"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+	
+	<xsl:template match="jis:p[@class = 'CommentaryStandardName']" priority="4">
+		<fo:block role="H1" font-family="IPAexGothic" font-size="16pt" text-align="center" margin-top="6mm">
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
+	
+	
 	<!-- ============================= -->
 	<!-- CONTENTS                      -->
 	<!-- ============================= -->
@@ -873,7 +997,7 @@
 			<xsl:choose>
 				<xsl:when test="@type = 'section-title'">18pt</xsl:when>
 				<xsl:when test="@ancestor = 'foreword' and $level = '1'">14pt</xsl:when>
-				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[1][local-name() = 'annex' and @commentary = 'true']">16pt</xsl:when>
+				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[local-name() = 'annex'][1][@commentary = 'true']">16pt</xsl:when>
 				<xsl:when test="@ancestor = 'annex' and $level = '1'">14pt</xsl:when>
 				<!-- <xsl:when test="@ancestor = 'foreword' and $level &gt;= '2'">12pt</xsl:when>
 				<xsl:when test=". = 'Executive summary'">18pt</xsl:when>
@@ -911,7 +1035,7 @@
 		<xsl:variable name="margin-top">
 			<xsl:choose>
 				<xsl:when test="@ancestor = 'foreword' and $level = 1">9mm</xsl:when>
-				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[1][local-name() = 'annex' and @commentary = 'true']">1mm</xsl:when>
+				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[local-name() = 'annex'][1][@commentary = 'true']">1mm</xsl:when>
 				<xsl:when test="$level = 1">6.5mm</xsl:when>
 				<xsl:when test="@ancestor = 'foreword' and $level = 2">0mm</xsl:when>
 				<xsl:when test="@ancestor = 'annex' and $level = 2">4.5mm</xsl:when>
@@ -932,7 +1056,7 @@
 		<xsl:variable name="margin-bottom">
 			<xsl:choose>
 				<xsl:when test="@ancestor = 'foreword' and $level = 1">9mm</xsl:when>
-				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[1][local-name() = 'annex' and @commentary = 'true']">7mm</xsl:when>
+				<xsl:when test="@ancestor = 'annex' and $level = '1' and preceding-sibling::*[local-name() = 'annex'][1][@commentary = 'true']">7mm</xsl:when>
 				<xsl:when test="$level = 1 and following-sibling::jis:clause">8pt</xsl:when>
 				<xsl:when test="$level = 1">12pt</xsl:when>
 				<xsl:when test="$level = 2 and following-sibling::jis:clause">8pt</xsl:when>
@@ -1205,7 +1329,7 @@
 		</xsl:if>
 	</xsl:template>
 	
-	<xsl:template match="*[local-name() = 'span'][@class = 'surname' or @class = 'givenname']" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'span'][@class = 'surname' or @class = 'givenname' or @class = 'JIS' or @class = 'EffectiveYear' or @class = 'CommentaryEffectiveYear']" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:apply-templates select="@* | node()" mode="update_xml_step1"/>
 		</xsl:copy>
@@ -1416,7 +1540,10 @@
 	
 	<xsl:template match="*[local-name() = 'font_en'][normalize-space() != '']">
 		<xsl:if test="ancestor::*[local-name() = 'td' or local-name() = 'th']"><xsl:value-of select="$zero_width_space"/></xsl:if>
-		<fo:inline font-family="Times New Roman">
+		<fo:inline>
+			<xsl:if test="not(ancestor::jis:p[@class = 'zzSTDTitle2']) and not(ancestor::jis:span[@class = 'JIS'])">
+				<xsl:attribute name="font-family">Times New Roman</xsl:attribute>
+			</xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'preferred']">
 				<xsl:attribute name="font-weight">normal</xsl:attribute>
 			</xsl:if>
diff --git a/xslt_src/mpfa.standards.core.xsl b/xslt_src/mpfa.standards.core.xsl
index 01787a5d4..e57e05cfe 100644
--- a/xslt_src/mpfa.standards.core.xsl
+++ b/xslt_src/mpfa.standards.core.xsl
@@ -208,12 +208,10 @@
 				</xsl:call-template>
 				<fo:flow flow-name="xsl-region-body">
 					<fo:block-container>
-					
-						
 						
-						<fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1">
+						<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1">
 							<xsl:value-of select="$title-en"/>
-						</fo:block>
+						</fo:block> -->
 						
 						<!-- Main sections -->
 						<xsl:apply-templates select="/mpfd:mpfd-standard/mpfd:sections/*"/>
@@ -334,6 +332,12 @@
 		</fo:block>	
 	</xsl:template>
 	
+	<xsl:template match="mpfd:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt" role="H1">
+			<xsl:apply-templates />
+		</fo:block>
+	</xsl:template>
+	
 	<xsl:template match="node()">
 		<xsl:apply-templates />			
 	</xsl:template>