diff --git a/src/main/plugins/org.dita.base/xsl/common/dita-textonly.xsl b/src/main/plugins/org.dita.base/xsl/common/dita-textonly.xsl
index 2d48545764..27abbbcd24 100644
--- a/src/main/plugins/org.dita.base/xsl/common/dita-textonly.xsl
+++ b/src/main/plugins/org.dita.base/xsl/common/dita-textonly.xsl
@@ -13,7 +13,7 @@ See the accompanying LICENSE file for applicable license.
      includes index terms, etc. 
 
      To use, process any content with mode="dita-ot:text-only" -->
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
   exclude-result-prefixes="dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/common/dita-utilities.xsl b/src/main/plugins/org.dita.base/xsl/common/dita-utilities.xsl
index 52194572fc..634e69c2d4 100644
--- a/src/main/plugins/org.dita.base/xsl/common/dita-utilities.xsl
+++ b/src/main/plugins/org.dita.base/xsl/common/dita-utilities.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 
 <!-- Common utilities that can be used by DITA transforms -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/common/functions.xsl b/src/main/plugins/org.dita.base/xsl/common/functions.xsl
index 370586a03d..9a53e987c5 100644
--- a/src/main/plugins/org.dita.base/xsl/common/functions.xsl
+++ b/src/main/plugins/org.dita.base/xsl/common/functions.xsl
@@ -8,7 +8,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/common/map2textonly.xsl b/src/main/plugins/org.dita.base/xsl/common/map2textonly.xsl
index 62d9b19fe0..3cf9006ad6 100644
--- a/src/main/plugins/org.dita.base/xsl/common/map2textonly.xsl
+++ b/src/main/plugins/org.dita.base/xsl/common/map2textonly.xsl
@@ -6,7 +6,7 @@ Copyright 2010 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
   exclude-result-prefixes="dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/common/output-message.xsl b/src/main/plugins/org.dita.base/xsl/common/output-message.xsl
index 434cd31aa9..b3cbb4cc5f 100644
--- a/src/main/plugins/org.dita.base/xsl/common/output-message.xsl
+++ b/src/main/plugins/org.dita.base/xsl/common/output-message.xsl
@@ -13,7 +13,7 @@ See the accompanying LICENSE file for applicable license.
   message in an installed plugin. Additional parameters to
   the message are optional.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/common/related-links.xsl b/src/main/plugins/org.dita.base/xsl/common/related-links.xsl
index bdd2423e2a..995ffaee8c 100644
--- a/src/main/plugins/org.dita.base/xsl/common/related-links.xsl
+++ b/src/main/plugins/org.dita.base/xsl/common/related-links.xsl
@@ -6,7 +6,7 @@ Copyright 2010 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
     exclude-result-prefixes="related-links xs">
diff --git a/src/main/plugins/org.dita.base/xsl/common/topic2textonly.xsl b/src/main/plugins/org.dita.base/xsl/common/topic2textonly.xsl
index 761b231873..7be176cbe3 100644
--- a/src/main/plugins/org.dita.base/xsl/common/topic2textonly.xsl
+++ b/src/main/plugins/org.dita.base/xsl/common/topic2textonly.xsl
@@ -6,7 +6,7 @@ Copyright 2010 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
   exclude-result-prefixes="dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/common/ui-d2textonly.xsl b/src/main/plugins/org.dita.base/xsl/common/ui-d2textonly.xsl
index 6a7c8e9fe0..9908207ad1 100644
--- a/src/main/plugins/org.dita.base/xsl/common/ui-d2textonly.xsl
+++ b/src/main/plugins/org.dita.base/xsl/common/ui-d2textonly.xsl
@@ -6,7 +6,7 @@ Copyright 2010 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
   exclude-result-prefixes="dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/common/uri-utils.xsl b/src/main/plugins/org.dita.base/xsl/common/uri-utils.xsl
index d8632e79b8..e9d2cf20f7 100644
--- a/src/main/plugins/org.dita.base/xsl/common/uri-utils.xsl
+++ b/src/main/plugins/org.dita.base/xsl/common/uri-utils.xsl
@@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot">              
 
   <xsl:function name="dita-ot:normalize" as="xs:anyURI">
diff --git a/src/main/plugins/org.dita.base/xsl/job-helper.xsl b/src/main/plugins/org.dita.base/xsl/job-helper.xsl
index 52d38cf2c7..097676b253 100644
--- a/src/main/plugins/org.dita.base/xsl/job-helper.xsl
+++ b/src/main/plugins/org.dita.base/xsl/job-helper.xsl
@@ -7,7 +7,7 @@ Copyright 2013 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   
   <xsl:output method="text"/>
   
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/clean-map.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/clean-map.xsl
index 5147eafb18..017472f0a6 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/clean-map.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/clean-map.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs">
   
   <xsl:import href="plugin:org.dita.base:xsl/common/dita-utilities.xsl"/>
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/conrefImpl.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/conrefImpl.xsl
index e788c1145e..1cc459fd4f 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/conrefImpl.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/conrefImpl.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:conref="http://dita-ot.sourceforge.net/ns/200704/conref"
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:conref="http://dita-ot.sourceforge.net/ns/200704/conref"
   xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/conref_template.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/conref_template.xsl
index dc29c4c75b..a2533b4d90 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/conref_template.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/conref_template.xsl
@@ -6,7 +6,7 @@ Copyright 2006 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
   <xsl:import href="plugin:org.dita.base:xsl/preprocess/conrefImpl.xsl"/>
   <dita:extension id="dita.xsl.conref" behavior="org.dita.dost.platform.ImportXSLAction" xmlns:dita="http://dita-ot.sourceforge.net"/>
   <xsl:output method="xml" encoding="utf-8" indent="no" />
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/map-conref_template.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/map-conref_template.xsl
index 782cec0822..8113de523d 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/map-conref_template.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/map-conref_template.xsl
@@ -6,7 +6,7 @@ Copyright 2017 Jarno Elovirta
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
   <xsl:import href="plugin:org.dita.base:xsl/preprocess/conrefImpl.xsl"/>
   <dita:extension id="dita.xsl.conref" behavior="org.dita.dost.platform.ImportXSLAction" xmlns:dita="http://dita-ot.sourceforge.net"/>
   <xsl:output method="xml" encoding="utf-8" indent="no" />
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/maplinkImpl.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/maplinkImpl.xsl
index 3db4821040..caf6eb34a8 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/maplinkImpl.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/maplinkImpl.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2006 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/maplink_template.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/maplink_template.xsl
index 80cc4ae65b..d000c6c4f5 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/maplink_template.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/maplink_template.xsl
@@ -7,7 +7,7 @@ Copyright 2006 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
   <xsl:import href="plugin:org.dita.base:xsl/preprocess/maplinkImpl.xsl"/>
   <dita:extension id="dita.xsl.maplink" behavior="org.dita.dost.platform.ImportXSLAction" xmlns:dita="http://dita-ot.sourceforge.net"/>
   <xsl:output method="xml" encoding="utf-8" indent="no" />
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/mappullImpl.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/mappullImpl.xsl
index 212973dec7..460aeb6ba1 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/mappullImpl.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/mappullImpl.xsl
@@ -32,7 +32,7 @@ Other modes can be found within the code, and may or may not prove useful for ov
 <!-- 20090903 RDA: added <?ditaot gentext?> and <?ditaot linktext?> PIs for RFE 1367897.
                    Allows downstream processes to identify original text vs. generated link text. -->
 
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/mappull_template.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/mappull_template.xsl
index 7c3fea4f99..795c49acd3 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/mappull_template.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/mappull_template.xsl
@@ -7,7 +7,7 @@ Copyright 2006 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
   <xsl:import href="plugin:org.dita.base:xsl/preprocess/mappullImpl.xsl"/>
   <dita:extension id="dita.xsl.mappull" behavior="org.dita.dost.platform.ImportXSLAction" xmlns:dita="http://dita-ot.sourceforge.net"/>
   <xsl:output method="xml" encoding="utf-8" indent="no" />
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/maprefImpl.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/maprefImpl.xsl
index 524f578af5..d7bc88ae45 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/maprefImpl.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/maprefImpl.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                version="2.0"
+                version="3.0"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:mappull="http://dita-ot.sourceforge.net/ns/200704/mappull"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/mapref_template.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/mapref_template.xsl
index 223ffb760e..cf3a98ab79 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/mapref_template.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/mapref_template.xsl
@@ -6,7 +6,7 @@ Copyright 2006 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-    <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+    <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
         <xsl:import href="plugin:org.dita.base:xsl/preprocess/maprefImpl.xsl"/>
         <dita:extension id="dita.xsl.mapref" behavior="org.dita.dost.platform.ImportXSLAction" xmlns:dita="http://dita-ot.sourceforge.net"/>
         <xsl:output method="xml" encoding="utf-8" indent="no" />
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/topicpull-pr-d.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/topicpull-pr-d.xsl
index feb2f1220e..90da6054dd 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/topicpull-pr-d.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/topicpull-pr-d.xsl
@@ -6,7 +6,7 @@ Copyright 2007 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:topicpull="http://dita-ot.sourceforge.net/ns/200704/topicpull"
   xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/topicpull-task.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/topicpull-task.xsl
index ac92219690..1c0d948fb2 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/topicpull-task.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/topicpull-task.xsl
@@ -7,7 +7,7 @@ Copyright 2010 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 <!-- This file added for SourceForge bug report #2962813 --> 
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:topicpull="http://dita-ot.sourceforge.net/ns/200704/topicpull"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl
index b96eaefc8a..acb26a3319 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/topicpullImpl.xsl
@@ -46,7 +46,7 @@ mode="topicpull:figure-linktext" and mode="topicpull:table-linktext"
 <!-- 20090903 RDA: added <?ditaot gentext?> and <?ditaot linktext?> PIs for RFE 1367897.
                    Allows downstream processes to identify original text vs. generated link text. -->
           
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:topicpull="http://dita-ot.sourceforge.net/ns/200704/topicpull"
diff --git a/src/main/plugins/org.dita.base/xsl/preprocess/topicpull_template.xsl b/src/main/plugins/org.dita.base/xsl/preprocess/topicpull_template.xsl
index 6591e7781b..baf3c40480 100644
--- a/src/main/plugins/org.dita.base/xsl/preprocess/topicpull_template.xsl
+++ b/src/main/plugins/org.dita.base/xsl/preprocess/topicpull_template.xsl
@@ -6,7 +6,7 @@ Copyright 2006 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
   <xsl:import href="plugin:org.dita.base:xsl/preprocess/topicpullImpl.xsl"/>
   <xsl:import href="plugin:org.dita.base:xsl/preprocess/topicpull-task.xsl"/>
   <xsl:import href="plugin:org.dita.base:xsl/preprocess/topicpull-pr-d.xsl"/>
diff --git a/src/main/plugins/org.dita.html5/xsl/abbrev-d.xsl b/src/main/plugins/org.dita.html5/xsl/abbrev-d.xsl
index 49e3b7e887..3484c9dca6 100644
--- a/src/main/plugins/org.dita.html5/xsl/abbrev-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/abbrev-d.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
      xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.html5/xsl/choicetable.xsl b/src/main/plugins/org.dita.html5/xsl/choicetable.xsl
index 78db2f1433..847cad17f4 100644
--- a/src/main/plugins/org.dita.html5/xsl/choicetable.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/choicetable.xsl
@@ -11,7 +11,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:table="http://dita-ot.sourceforge.net/ns/201007/dita-ot/table"
                 xmlns:simpletable="http://dita-ot.sourceforge.net/ns/201007/dita-ot/simpletable"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot table simpletable">
 
   <xsl:template mode="generate-table-header" match="
diff --git a/src/main/plugins/org.dita.html5/xsl/concept.xsl b/src/main/plugins/org.dita.html5/xsl/concept.xsl
index 18b4be2f7a..4d7708706b 100644
--- a/src/main/plugins/org.dita.html5/xsl/concept.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/concept.xsl
@@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="related-links xs">
 
   <!-- Concepts have their own group. -->
diff --git a/src/main/plugins/org.dita.html5/xsl/cover.xsl b/src/main/plugins/org.dita.html5/xsl/cover.xsl
index c93e84d7a6..a68305fd02 100644
--- a/src/main/plugins/org.dita.html5/xsl/cover.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/cover.xsl
@@ -10,7 +10,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot ditamsg">
 
   <!-- optional @class attribute for TOC <body> element
diff --git a/src/main/plugins/org.dita.html5/xsl/css-class.xsl b/src/main/plugins/org.dita.html5/xsl/css-class.xsl
index 8751c4f6c7..831a12998a 100644
--- a/src/main/plugins/org.dita.html5/xsl/css-class.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/css-class.xsl
@@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot">
 
   <xsl:function name="dita-ot:css-class" as="xs:string">
diff --git a/src/main/plugins/org.dita.html5/xsl/dita2html5.xsl b/src/main/plugins/org.dita.html5/xsl/dita2html5.xsl
index baf0e67d71..43421c933f 100644
--- a/src/main/plugins/org.dita.html5/xsl/dita2html5.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/dita2html5.xsl
@@ -7,7 +7,7 @@ Copyright 2012 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   
   <xsl:import href="plugin:org.dita.html5:xsl/dita2html5Impl.xsl"/>
   
diff --git a/src/main/plugins/org.dita.html5/xsl/dita2html5Impl_template.xsl b/src/main/plugins/org.dita.html5/xsl/dita2html5Impl_template.xsl
index 6508c38514..40ddb12db1 100644
--- a/src/main/plugins/org.dita.html5/xsl/dita2html5Impl_template.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/dita2html5Impl_template.xsl
@@ -7,7 +7,7 @@ Copyright 2016 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:import href="plugin:org.dita.base:xsl/common/output-message.xsl"/>
   <xsl:import href="plugin:org.dita.base:xsl/common/dita-utilities.xsl"/>
diff --git a/src/main/plugins/org.dita.html5/xsl/functions.xsl b/src/main/plugins/org.dita.html5/xsl/functions.xsl
index 9a593e6990..3c962c3ac4 100644
--- a/src/main/plugins/org.dita.html5/xsl/functions.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/functions.xsl
@@ -11,7 +11,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:table="http://dita-ot.sourceforge.net/ns/201007/dita-ot/table"
                 xmlns:simpletable="http://dita-ot.sourceforge.net/ns/201007/dita-ot/simpletable"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot table">
 
   <xsl:variable name="HTML_ID_SEPARATOR" select="'__'"/>
diff --git a/src/main/plugins/org.dita.html5/xsl/get-meta.xsl b/src/main/plugins/org.dita.html5/xsl/get-meta.xsl
index 75fc0a775b..721de95e6e 100644
--- a/src/main/plugins/org.dita.html5/xsl/get-meta.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/get-meta.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <!-- Get each value in each <keywords>. Nested indexterms should have unique entries. Other
diff --git a/src/main/plugins/org.dita.html5/xsl/glossdisplay.xsl b/src/main/plugins/org.dita.html5/xsl/glossdisplay.xsl
index 54d6d98ac6..d53eb66090 100644
--- a/src/main/plugins/org.dita.html5/xsl/glossdisplay.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/glossdisplay.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="related-links">
 
   <!-- Glossary entries belong in the group with concepts. -->
diff --git a/src/main/plugins/org.dita.html5/xsl/hazard-d.xsl b/src/main/plugins/org.dita.html5/xsl/hazard-d.xsl
index 6b3bb653d8..ea2d6c6a21 100644
--- a/src/main/plugins/org.dita.html5/xsl/hazard-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/hazard-d.xsl
@@ -3,7 +3,7 @@
 This file is part of the DITA Open Toolkit project. 
 See the accompanying license.txt file for applicable licenses.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
      xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.html5/xsl/hi-d.xsl b/src/main/plugins/org.dita.html5/xsl/hi-d.xsl
index 7131f0ca8d..589a090efb 100644
--- a/src/main/plugins/org.dita.html5/xsl/hi-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/hi-d.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
   <xsl:template match="*[contains(@class,' hi-d/b ')]" name="topic.hi-d.b">
diff --git a/src/main/plugins/org.dita.html5/xsl/htmlflag.xsl b/src/main/plugins/org.dita.html5/xsl/htmlflag.xsl
index a1617a8cf5..14c1f1d1ba 100644
--- a/src/main/plugins/org.dita.html5/xsl/htmlflag.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/htmlflag.xsl
@@ -14,7 +14,7 @@ See the accompanying LICENSE file for applicable license.
      must be explicitly requested by the HTML code by processing with the "process-exception" mode.
               -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-                version="2.0">
+                version="3.0">
 
   <xsl:template match="*[contains(@class,' ditaot-d/ditaval-startprop ')]/@style" mode="add-ditaval-style">
     <!-- Add the pre-calculated CSS style for this element -->
diff --git a/src/main/plugins/org.dita.html5/xsl/map2html5-cover.xsl b/src/main/plugins/org.dita.html5/xsl/map2html5-cover.xsl
index 472f08a2fd..d98489a1a6 100644
--- a/src/main/plugins/org.dita.html5/xsl/map2html5-cover.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/map2html5-cover.xsl
@@ -7,7 +7,7 @@ Copyright 2012 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:import href="plugin:org.dita.html5:xsl/map2html5-coverImpl.xsl"/>
 
diff --git a/src/main/plugins/org.dita.html5/xsl/map2html5-coverImpl_template.xsl b/src/main/plugins/org.dita.html5/xsl/map2html5-coverImpl_template.xsl
index b2e3c0b77d..db425f838a 100644
--- a/src/main/plugins/org.dita.html5/xsl/map2html5-coverImpl_template.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/map2html5-coverImpl_template.xsl
@@ -10,7 +10,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot ditamsg">
 
   <xsl:import href="plugin:org.dita.html5:xsl/dita2html5Impl.xsl"/>
diff --git a/src/main/plugins/org.dita.html5/xsl/map2html5Impl.xsl b/src/main/plugins/org.dita.html5/xsl/map2html5Impl.xsl
index 69569b0818..cc2b4c1443 100644
--- a/src/main/plugins/org.dita.html5/xsl/map2html5Impl.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/map2html5Impl.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-                xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg" version="2.0"
+                xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg" version="3.0"
                 exclude-result-prefixes="dita-ot ditamsg">
 
   <xsl:param name="OUTEXT" select="'.html'"/>
diff --git a/src/main/plugins/org.dita.html5/xsl/mapwalker.xsl b/src/main/plugins/org.dita.html5/xsl/mapwalker.xsl
index 21613be11d..0a70a0eae8 100644
--- a/src/main/plugins/org.dita.html5/xsl/mapwalker.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/mapwalker.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <!-- write technique adapted from Norman Walsh's DocBook XSLT
      first instance technique adapted from Jeni Tennison and Steve Muench -->
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
   <xsl:key name="topicref"
diff --git a/src/main/plugins/org.dita.html5/xsl/markup-d.xsl b/src/main/plugins/org.dita.html5/xsl/markup-d.xsl
index e12500ba37..4034d4ac3d 100644
--- a/src/main/plugins/org.dita.html5/xsl/markup-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/markup-d.xsl
@@ -7,7 +7,7 @@ Copyright 2014 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:template match="*[contains(@class, ' markup-d/markupname ')]">
     <code>
diff --git a/src/main/plugins/org.dita.html5/xsl/nav.xsl b/src/main/plugins/org.dita.html5/xsl/nav.xsl
index 39617310fc..d98462c224 100644
--- a/src/main/plugins/org.dita.html5/xsl/nav.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/nav.xsl
@@ -10,7 +10,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot ditamsg">
   
   <xsl:import href="plugin:org.dita.html5:xsl/map2html5Impl.xsl"/>
diff --git a/src/main/plugins/org.dita.html5/xsl/pr-d.xsl b/src/main/plugins/org.dita.html5/xsl/pr-d.xsl
index cf7cd55fab..747edbfecd 100644
--- a/src/main/plugins/org.dita.html5/xsl/pr-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/pr-d.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
   <xsl:import href="plugin:org.dita.html5:xsl/syntax-braces.xsl"/>
diff --git a/src/main/plugins/org.dita.html5/xsl/properties.xsl b/src/main/plugins/org.dita.html5/xsl/properties.xsl
index e3bf41f94b..768d1583da 100644
--- a/src/main/plugins/org.dita.html5/xsl/properties.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/properties.xsl
@@ -11,7 +11,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:table="http://dita-ot.sourceforge.net/ns/201007/dita-ot/table"
                 xmlns:simpletable="http://dita-ot.sourceforge.net/ns/201007/dita-ot/simpletable"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot table simpletable">
 
   <xsl:variable name="empty-property" as="element(property)">
diff --git a/src/main/plugins/org.dita.html5/xsl/reference.xsl b/src/main/plugins/org.dita.html5/xsl/reference.xsl
index 5a18142815..c5a89b6c73 100644
--- a/src/main/plugins/org.dita.html5/xsl/reference.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/reference.xsl
@@ -11,7 +11,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:dita2html="http://dita-ot.sourceforge.net/ns/200801/dita2html"
                 xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot dita2html related-links">
   
   <xsl:template match="*[contains(@class, ' reference/properties ')]
diff --git a/src/main/plugins/org.dita.html5/xsl/rel-links.xsl b/src/main/plugins/org.dita.html5/xsl/rel-links.xsl
index 4d69df2fc9..27743fb6f2 100644
--- a/src/main/plugins/org.dita.html5/xsl/rel-links.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/rel-links.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
diff --git a/src/main/plugins/org.dita.html5/xsl/simpletable.xsl b/src/main/plugins/org.dita.html5/xsl/simpletable.xsl
index 42d737f941..945b9dba52 100644
--- a/src/main/plugins/org.dita.html5/xsl/simpletable.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/simpletable.xsl
@@ -13,7 +13,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:table="http://dita-ot.sourceforge.net/ns/201007/dita-ot/table"
                 xmlns:simpletable="http://dita-ot.sourceforge.net/ns/201007/dita-ot/simpletable"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita2html ditamsg dita-ot table simpletable">
 
   <xsl:template match="*[contains(@class, ' topic/simpletable ')]" mode="generate-table-summary-attribute">
diff --git a/src/main/plugins/org.dita.html5/xsl/svg-d.xsl b/src/main/plugins/org.dita.html5/xsl/svg-d.xsl
index c921941055..11fe3ae7d6 100644
--- a/src/main/plugins/org.dita.html5/xsl/svg-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/svg-d.xsl
@@ -6,7 +6,7 @@ Copyright 2018 Jarno Elovirta
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:svg="http://www.w3.org/2000/svg"
diff --git a/src/main/plugins/org.dita.html5/xsl/sw-d.xsl b/src/main/plugins/org.dita.html5/xsl/sw-d.xsl
index 0430383a50..2c26591c74 100644
--- a/src/main/plugins/org.dita.html5/xsl/sw-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/sw-d.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
   <xsl:template match="*[contains(@class,' sw-d/filepath ')]" name="topic.sw-d.filepath">
diff --git a/src/main/plugins/org.dita.html5/xsl/syntax-braces.xsl b/src/main/plugins/org.dita.html5/xsl/syntax-braces.xsl
index e37b27e572..c9687938ff 100644
--- a/src/main/plugins/org.dita.html5/xsl/syntax-braces.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/syntax-braces.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
   <!-- Logical containers -->
diff --git a/src/main/plugins/org.dita.html5/xsl/syntax-svg.xsl b/src/main/plugins/org.dita.html5/xsl/syntax-svg.xsl
index 2a38338f06..58918e3fa6 100644
--- a/src/main/plugins/org.dita.html5/xsl/syntax-svg.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/syntax-svg.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:svg="http://www.w3.org/2000/svg">
   
diff --git a/src/main/plugins/org.dita.html5/xsl/tables.xsl b/src/main/plugins/org.dita.html5/xsl/tables.xsl
index 49ee179a58..5f9a7f3fbd 100644
--- a/src/main/plugins/org.dita.html5/xsl/tables.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/tables.xsl
@@ -12,7 +12,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:dita2html="http://dita-ot.sourceforge.net/ns/200801/dita2html"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
                 xmlns:table="http://dita-ot.sourceforge.net/ns/201007/dita-ot/table"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot dita2html ditamsg table">
 
   <!-- XML Exchange Table Model Document Type Definition default is all -->
diff --git a/src/main/plugins/org.dita.html5/xsl/task.xsl b/src/main/plugins/org.dita.html5/xsl/task.xsl
index 2ec99f7fd7..8df03b8cf3 100644
--- a/src/main/plugins/org.dita.html5/xsl/task.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/task.xsl
@@ -12,7 +12,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
                 xmlns:dita2html="http://dita-ot.sourceforge.net/ns/200801/dita2html"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot related-links dita2html ditamsg ">
   
   <!-- Determines whether to generate titles for task sections. Values are YES and NO. -->
diff --git a/src/main/plugins/org.dita.html5/xsl/topic.xsl b/src/main/plugins/org.dita.html5/xsl/topic.xsl
index 15197bfaa6..acc3b3d7d2 100644
--- a/src/main/plugins/org.dita.html5/xsl/topic.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/topic.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:dita2html="http://dita-ot.sourceforge.net/ns/200801/dita2html"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot dita2html ditamsg">
   
   <xsl:include href="plugin:org.dita.html5:xsl/get-meta.xsl"/>
diff --git a/src/main/plugins/org.dita.html5/xsl/ui-d.xsl b/src/main/plugins/org.dita.html5/xsl/ui-d.xsl
index d6bdc5794d..483828b53e 100644
--- a/src/main/plugins/org.dita.html5/xsl/ui-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/ui-d.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:template match="*[contains(@class,' ui-d/screen ')]" name="topic.ui-d.screen">
diff --git a/src/main/plugins/org.dita.html5/xsl/ut-d.xsl b/src/main/plugins/org.dita.html5/xsl/ut-d.xsl
index 800b15487d..7d77041cfd 100644
--- a/src/main/plugins/org.dita.html5/xsl/ut-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/ut-d.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
diff --git a/src/main/plugins/org.dita.html5/xsl/xml-d.xsl b/src/main/plugins/org.dita.html5/xsl/xml-d.xsl
index a701231f9b..808c1308ce 100644
--- a/src/main/plugins/org.dita.html5/xsl/xml-d.xsl
+++ b/src/main/plugins/org.dita.html5/xsl/xml-d.xsl
@@ -7,7 +7,7 @@ Copyright 2014 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:template match="*[contains(@class, ' xml-d/xmlelement ')]">
     <code>
diff --git a/src/main/plugins/org.dita.htmlhelp/xsl/map2hhc_template.xsl b/src/main/plugins/org.dita.htmlhelp/xsl/map2hhc_template.xsl
index ae5d23edb4..8395b216b7 100644
--- a/src/main/plugins/org.dita.htmlhelp/xsl/map2hhc_template.xsl
+++ b/src/main/plugins/org.dita.htmlhelp/xsl/map2hhc_template.xsl
@@ -7,7 +7,7 @@ Copyright 2010 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- Import the main ditamap to HTML Help Contents conversion -->
diff --git a/src/main/plugins/org.dita.htmlhelp/xsl/map2hhp_template.xsl b/src/main/plugins/org.dita.htmlhelp/xsl/map2hhp_template.xsl
index d0014ca197..f3170d0f49 100644
--- a/src/main/plugins/org.dita.htmlhelp/xsl/map2hhp_template.xsl
+++ b/src/main/plugins/org.dita.htmlhelp/xsl/map2hhp_template.xsl
@@ -7,7 +7,7 @@ Copyright 2010 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <xsl:import href="plugin:org.dita.base:xsl/common/dita-utilities.xsl"/>
diff --git a/src/main/plugins/org.dita.htmlhelp/xsl/map2htmlhelp/map2hhcImpl.xsl b/src/main/plugins/org.dita.htmlhelp/xsl/map2htmlhelp/map2hhcImpl.xsl
index 0884c0a25d..4f66030722 100644
--- a/src/main/plugins/org.dita.htmlhelp/xsl/map2htmlhelp/map2hhcImpl.xsl
+++ b/src/main/plugins/org.dita.htmlhelp/xsl/map2htmlhelp/map2hhcImpl.xsl
@@ -21,7 +21,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
+                version="3.0"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 exclude-result-prefixes="dita-ot"
   >
diff --git a/src/main/plugins/org.dita.htmlhelp/xsl/map2htmlhelp/map2hhpImpl.xsl b/src/main/plugins/org.dita.htmlhelp/xsl/map2htmlhelp/map2hhpImpl.xsl
index 2be4e14213..7d0b091c62 100644
--- a/src/main/plugins/org.dita.htmlhelp/xsl/map2htmlhelp/map2hhpImpl.xsl
+++ b/src/main/plugins/org.dita.htmlhelp/xsl/map2htmlhelp/map2hhpImpl.xsl
@@ -27,7 +27,7 @@ See the accompanying LICENSE file for applicable license.
 
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
 <!-- Include error message template -->
 <xsl:include href="plugin:org.dita.base:xsl/common/output-message.xsl"/>
diff --git a/src/main/plugins/org.dita.pdf2.fop/cfg/fo/attrs/commons-attr_fop.xsl b/src/main/plugins/org.dita.pdf2.fop/cfg/fo/attrs/commons-attr_fop.xsl
index fd9abf3c9a..d6318854b2 100644
--- a/src/main/plugins/org.dita.pdf2.fop/cfg/fo/attrs/commons-attr_fop.xsl
+++ b/src/main/plugins/org.dita.pdf2.fop/cfg/fo/attrs/commons-attr_fop.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="2.0">
+                version="3.0">
 
   <xsl:attribute-set name="__toc__mini__table">
     <xsl:attribute name="table-layout">fixed</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2.fop/cfg/fo/attrs/tables-attr_fop.xsl b/src/main/plugins/org.dita.pdf2.fop/cfg/fo/attrs/tables-attr_fop.xsl
index 455ad4c0f9..6ddc1e74bf 100644
--- a/src/main/plugins/org.dita.pdf2.fop/cfg/fo/attrs/tables-attr_fop.xsl
+++ b/src/main/plugins/org.dita.pdf2.fop/cfg/fo/attrs/tables-attr_fop.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="2.0">
+                version="3.0">
 
   <xsl:attribute-set name="simpletable">
     <xsl:attribute name="table-layout">fixed</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/index_fop.xsl b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/index_fop.xsl
index f98c724ab0..6b620636d0 100644
--- a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/index_fop.xsl
+++ b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/index_fop.xsl
@@ -11,7 +11,7 @@ See the accompanying LICENSE file for applicable license.
   xmlns:opentopic-index="http://www.idiominc.com/opentopic/index"
   xmlns:opentopic-func="http://www.idiominc.com/opentopic/exsl/function"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  version="2.0"
+  version="3.0"
   exclude-result-prefixes="opentopic-index opentopic-func xs">
 
   <xsl:variable name="index.continued-enabled" select="false()"/>
diff --git a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/root-processing_fop.xsl b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/root-processing_fop.xsl
index 072f91f7c8..11680f72e4 100644
--- a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/root-processing_fop.xsl
+++ b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/root-processing_fop.xsl
@@ -15,7 +15,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:xmp="http://ns.adobe.com/xap/1.0/"
                 xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-                version="2.0" exclude-result-prefixes="dita-ot xs">
+                version="3.0" exclude-result-prefixes="dita-ot xs">
     
   <xsl:template match="/" name="rootTemplate">
     <xsl:call-template name="validateTopicRefs"/>
diff --git a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/tables_fop.xsl b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/tables_fop.xsl
index d786fa3a65..061fc0c402 100644
--- a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/tables_fop.xsl
+++ b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/tables_fop.xsl
@@ -10,7 +10,7 @@ See the accompanying LICENSE file for applicable license.
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-  version="2.0"
+  version="3.0"
   exclude-result-prefixes="xs dita-ot">
 
     <xsl:template match="*[contains(@class, ' topic/dt ')]">
diff --git a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/topic2fo_shell_fop_template.xsl b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/topic2fo_shell_fop_template.xsl
index d0e48e91c8..5ff3519d66 100644
--- a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/topic2fo_shell_fop_template.xsl
+++ b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/topic2fo_shell_fop_template.xsl
@@ -7,7 +7,7 @@ Copyright 2011 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   
   <xsl:import href="plugin:org.dita.pdf2:xsl/fo/topic2fo.xsl"/>
 
diff --git a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/topic_fop.xsl b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/topic_fop.xsl
index 70766bfc5a..1076dfa9a1 100644
--- a/src/main/plugins/org.dita.pdf2.fop/xsl/fo/topic_fop.xsl
+++ b/src/main/plugins/org.dita.pdf2.fop/xsl/fo/topic_fop.xsl
@@ -12,7 +12,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:fox="http://xmlgraphics.apache.org/fop/extensions"
     xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
     exclude-result-prefixes="dita-ot xs"
-    version="2.0">
+    version="3.0">
 
     <xsl:template match="*|@alt" mode="graphicAlternateText">
         <xsl:attribute name="fox:alt-text"><xsl:apply-templates select="." mode="text-only"/></xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/basic-settings.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/basic-settings.xsl
index cb95c88095..2898c72663 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/basic-settings.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/basic-settings.xsl
@@ -6,7 +6,7 @@ See the accompanying LICENSE file for applicable license.
 <!-- (c) Copyright Suite Solutions -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs">
 
   <xsl:param name="locale"/>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/commons-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/commons-attr.xsl
index 472a836b0b..c1cea29fd7 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/commons-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/commons-attr.xsl
@@ -34,7 +34,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:rx="http://www.renderx.com/XSL/Extensions"
-    version="2.0">
+    version="3.0">
 
   <!-- common attribute sets -->
 
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/concept-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/concept-attr.xsl
index 457d3023e6..cadf510bcc 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/concept-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/concept-attr.xsl
@@ -34,7 +34,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:rx="http://www.renderx.com/XSL/Extensions"
-    version="2.0">
+    version="3.0">
 
     <xsl:attribute-set name="concept">
     </xsl:attribute-set>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/custom.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/custom.xsl
index eb74306eb9..c08d06a823 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/custom.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/custom.xsl
@@ -33,6 +33,6 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/front-matter-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/front-matter-attr.xsl
index f12e9079c2..64dbe253d6 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/front-matter-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/front-matter-attr.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <xsl:attribute-set name="__frontmatter">
         <xsl:attribute name="text-align">center</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/glossary-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/glossary-attr.xsl
index 54e5646ba2..ce558ad43d 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/glossary-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/glossary-attr.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="3.0">
     <xsl:attribute-set name="__glossary__label">
         <xsl:attribute name="space-before">20pt</xsl:attribute>
         <xsl:attribute name="space-after">20pt</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/hazard-d-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/hazard-d-attr.xsl
index 3c4ce69832..f97c6875e0 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/hazard-d-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/hazard-d-attr.xsl
@@ -4,7 +4,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying license.txt file for applicable licenses.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <!-- Source: https://www.nema.org/Standards/ComplimentaryDocuments/ANSI%20Z535_1-2017%20CONTENTS%20AND%20SCOPE.pdf -->
   <xsl:variable name="hazard.ansi.red" select="'#C8102E'"/>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/hi-domain-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/hi-domain-attr.xsl
index c692c40823..70ce96f640 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/hi-domain-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/hi-domain-attr.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
 
     <xsl:attribute-set name="b">
         <xsl:attribute name="font-weight">bold</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/index-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/index-attr.xsl
index 6725ff8141..1f5d88c3b0 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/index-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/index-attr.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:opentopic-index="http://www.idiominc.com/opentopic/index" xmlns:fo="http://www.w3.org/1999/XSL/Format"
-  exclude-result-prefixes="opentopic-index" version="2.0">
+  exclude-result-prefixes="opentopic-index" version="3.0">
 
     <xsl:attribute-set name="__index__label">
         <xsl:attribute name="space-before">20pt</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/layout-masters-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/layout-masters-attr.xsl
index d0cb8bac26..4be3c2c960 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/layout-masters-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/layout-masters-attr.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="2.0">
+                version="3.0">
     
   <xsl:attribute-set name="simple-page-master">
     <xsl:attribute name="page-width" select="$page-width"/>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/learning-elements-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/learning-elements-attr.xsl
index 6ba8e0de80..b278ff5890 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/learning-elements-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/learning-elements-attr.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <xsl:attribute-set name="time">
     </xsl:attribute-set>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/links-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/links-attr.xsl
index 5448526100..ef2d4b71fc 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/links-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/links-attr.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="3.0">
 
     <xsl:attribute-set name="linklist">
     </xsl:attribute-set>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/lists-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/lists-attr.xsl
index d78fb76e45..db316207c1 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/lists-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/lists-attr.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <!--Common-->
     <xsl:attribute-set name="li.itemgroup">
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/lot-lof-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/lot-lof-attr.xsl
index 6350791d74..482823b86b 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/lot-lof-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/lot-lof-attr.xsl
@@ -10,7 +10,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:rx="http://www.renderx.com/XSL/Extensions"
-    version="2.0">
+    version="3.0">
 
   <xsl:attribute-set name ="__lotf__heading" use-attribute-sets="__toc__header">
   </xsl:attribute-set>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/map-elements-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/map-elements-attr.xsl
index 72f0172699..0488b6d5a7 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/map-elements-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/map-elements-attr.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
-  version="2.0">
+  version="3.0">
 
   <xsl:attribute-set name="reltable">
   </xsl:attribute-set>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/markup-domain-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/markup-domain-attr.xsl
index 79dc0e4035..1f684ca6b0 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/markup-domain-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/markup-domain-attr.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="2.0">
+                version="3.0">
   
   <xsl:attribute-set name="markupname">
     <xsl:attribute name="font-family">monospace</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/pr-domain-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/pr-domain-attr.xsl
index 840c1e59a9..c9015bc16b 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/pr-domain-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/pr-domain-attr.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
 
     <xsl:attribute-set name="codeph">
         <xsl:attribute name="font-family">monospace</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/reference-elements-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/reference-elements-attr.xsl
index 48e529f04f..d2147ed571 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/reference-elements-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/reference-elements-attr.xsl
@@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
   xmlns:rx="http://www.renderx.com/XSL/Extensions"
-  version="2.0">
+  version="3.0">
 
   <xsl:attribute-set name="properties" use-attribute-sets="base-font">
     <xsl:attribute name="width">100%</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/static-content-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/static-content-attr.xsl
index 47f2b8445e..1cf46b923e 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/static-content-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/static-content-attr.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
   <xsl:attribute-set name="odd__header">
     <xsl:attribute name="text-align">end</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/svg-domain-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/svg-domain-attr.xsl
index 9f513c4a0f..76ac10a573 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/svg-domain-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/svg-domain-attr.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="2.0">
+                version="3.0">
   
   <xsl:attribute-set name="svgref">
   </xsl:attribute-set>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/sw-domain-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/sw-domain-attr.xsl
index 7c1affde5b..7589f29c91 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/sw-domain-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/sw-domain-attr.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
 
     <xsl:attribute-set name="msgph">
         <xsl:attribute name="font-family">monospace</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/tables-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/tables-attr.xsl
index 9346ee692b..4b812436b8 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/tables-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/tables-attr.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="3.0">
 
   <!-- contents of table entries or similer structures -->
   <xsl:attribute-set name="common.table.body.entry">
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/task-elements-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/task-elements-attr.xsl
index 25c03cbfa6..fb6d5f9ae1 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/task-elements-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/task-elements-attr.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <xsl:attribute-set name="task">
     </xsl:attribute-set>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/toc-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/toc-attr.xsl
index 13ef4038bf..04ed03d2e9 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/toc-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/toc-attr.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <xsl:variable name="toc.text-indent" select="'14pt'"/>
     <xsl:variable name="toc.toc-indent" select="'30pt'"/>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/topic-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/topic-attr.xsl
index bf9bc1485e..b3f552a16a 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/topic-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/topic-attr.xsl
@@ -34,7 +34,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:rx="http://www.renderx.com/XSL/Extensions"
-    version="2.0">
+    version="3.0">
 
     <xsl:attribute-set name="tm">
         <xsl:attribute name="border-start-width">0pt</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/ui-domain-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/ui-domain-attr.xsl
index c7e6626069..2ecd3a7bbf 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/ui-domain-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/ui-domain-attr.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
 
     <xsl:attribute-set name="uicontrol">
         <xsl:attribute name="font-weight">bold</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/xml-domain-attr.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/xml-domain-attr.xsl
index a517d845c6..b61b25572c 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/xml-domain-attr.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/attrs/xml-domain-attr.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="2.0">
+                version="3.0">
   
   <xsl:attribute-set name="xmlelement">
     <xsl:attribute name="font-family">monospace</xsl:attribute>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/layout-masters.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/layout-masters.xsl
index f010573b60..8d8225af9e 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/layout-masters.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/layout-masters.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
     
     <xsl:template name="createLayoutMasters">
       <xsl:call-template name="createDefaultLayoutMasters"/>
diff --git a/src/main/plugins/org.dita.pdf2/cfg/fo/xsl/custom.xsl b/src/main/plugins/org.dita.pdf2/cfg/fo/xsl/custom.xsl
index eb74306eb9..c08d06a823 100644
--- a/src/main/plugins/org.dita.pdf2/cfg/fo/xsl/custom.xsl
+++ b/src/main/plugins/org.dita.pdf2/cfg/fo/xsl/custom.xsl
@@ -33,6 +33,6 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/plugins/org.dita.pdf2/xsl/common/topicmergeImpl.xsl b/src/main/plugins/org.dita.pdf2/xsl/common/topicmergeImpl.xsl
index 5cc843b57d..47fa8fe1fb 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/common/topicmergeImpl.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/common/topicmergeImpl.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <!-- An adaptation of the Toolkit topicmerge.xsl for FO plugin use. -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:ot-placeholder="http://suite-sol.com/namespaces/ot-placeholder"
diff --git a/src/main/plugins/org.dita.pdf2/xsl/common/topicmerge_template.xsl b/src/main/plugins/org.dita.pdf2/xsl/common/topicmerge_template.xsl
index f89b869ef0..46e1db4c9c 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/common/topicmerge_template.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/common/topicmerge_template.xsl
@@ -7,7 +7,7 @@ Copyright 2011 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:import href="plugin:org.dita.pdf2:xsl/common/topicmergeImpl.xsl"/>
   <dita:extension id="org.dita.pdf2.xsl.topicmerge" behavior="org.dita.dost.platform.ImportXSLAction" xmlns:dita="http://dita-ot.sourceforge.net"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/common/vars.xsl b/src/main/plugins/org.dita.pdf2/xsl/common/vars.xsl
index 77a61a3b43..c7a711e58f 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/common/vars.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/common/vars.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:opentopic-vars="http://www.idiominc.com/opentopic/vars"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   exclude-result-prefixes="opentopic-vars xs">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/abbrev-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/abbrev-domain.xsl
index d728096b38..39af760d6b 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/abbrev-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/abbrev-domain.xsl
@@ -12,7 +12,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:opentopic="http://www.idiominc.com/opentopic"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs opentopic dita-ot ditamsg">
   
   <xsl:param name="first-use-scope" select="'document'"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/bookmarks.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/bookmarks.xsl
index 7807e249f7..581588724d 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/bookmarks.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/bookmarks.xsl
@@ -39,7 +39,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:opentopic-func="http://www.idiominc.com/opentopic/exsl/function"
                 xmlns:ot-placeholder="http://suite-sol.com/namespaces/ot-placeholder"
                 exclude-result-prefixes="xs opentopic-index opentopic opentopic-func ot-placeholder"
-                version="2.0">
+                version="3.0">
 
     <!-- Determines whether letter headings in an index generate bookmarks.
          0 = no bookmarks.
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/commons.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/commons.xsl
index 7eed3276f4..774d5ebe39 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/commons.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/commons.xsl
@@ -41,7 +41,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
     xmlns:ot-placeholder="http://suite-sol.com/namespaces/ot-placeholder"
     exclude-result-prefixes="dita-ot ot-placeholder opentopic opentopic-index opentopic-func dita2xslfo xs"
-    version="2.0">
+    version="3.0">
 
     <!-- FIXME these imports should be moved to shell -->
     <xsl:import href="plugin:org.dita.pdf2:xsl/fo/topic.xsl"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/concept.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/concept.xsl
index e67592bd13..a439fb8879 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/concept.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/concept.xsl
@@ -40,7 +40,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
     xmlns:ot-placeholder="http://suite-sol.com/namespaces/ot-placeholder"
     exclude-result-prefixes="dita-ot ot-placeholder opentopic opentopic-index opentopic-func dita2xslfo xs"
-    version="2.0">
+    version="3.0">
 
   <xsl:template match="*[contains(@class, ' concept/concept ')]" mode="processTopic"
                 name="processConcept">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/flag-rules.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/flag-rules.xsl
index 879af2e35c..d1b3a5ff24 100755
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/flag-rules.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/flag-rules.xsl
@@ -7,7 +7,7 @@ Copyright 2007 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  exclude-result-prefixes="xs" version="2.0">
+  exclude-result-prefixes="xs" version="3.0">
 
  <!-- ========== Flagging with flags & revisions ========== -->
  
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/flagging-from-preprocess.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/flagging-from-preprocess.xsl
index 6c419d7e8a..ab965b9a46 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/flagging-from-preprocess.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/flagging-from-preprocess.xsl
@@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    version="2.0"
+    version="3.0"
     exclude-result-prefixes="xs dita-ot">
 
   <!-- For reference, flagging info as it appears in the topics: -->
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/flagging.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/flagging.xsl
index 5030e54bf0..f15ad16b28 100755
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/flagging.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/flagging.xsl
@@ -29,7 +29,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:opentopic-func="http://www.idiominc.com/opentopic/exsl/function"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:dita2xslfo="http://dita-ot.sourceforge.net/ns/200910/dita2xslfo"
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/front-matter.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/front-matter.xsl
index efa4715442..966fdbb554 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/front-matter.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/front-matter.xsl
@@ -35,7 +35,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:opentopic="http://www.idiominc.com/opentopic"
     exclude-result-prefixes="opentopic"
-    version="2.0">
+    version="3.0">
 
     <xsl:template match="*[contains(@class, ' map/topicmeta ')]">
         <fo:block-container xsl:use-attribute-sets="__frontmatter__owner__container">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/glossary.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/glossary.xsl
index 636e7072e4..227da26cbf 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/glossary.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/glossary.xsl
@@ -10,7 +10,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 xmlns:ot-placeholder="http://suite-sol.com/namespaces/ot-placeholder"
                 exclude-result-prefixes="ot-placeholder"
-                version="2.0">
+                version="3.0">
 
   <xsl:template match="ot-placeholder:glossarylist" name="createGlossary">
     <fo:page-sequence master-reference="glossary-sequence" xsl:use-attribute-sets="page-sequence.glossary">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/hazard-d.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/hazard-d.xsl
index 67e5b5e381..a58fb4b903 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/hazard-d.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/hazard-d.xsl
@@ -7,7 +7,7 @@ See the accompanying license.txt file for applicable licenses.
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot">
 
   <xsl:template match="*[contains(@class, ' hazard-d/hazardstatement ')]">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/hi-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/hi-domain.xsl
index 6cab758dd1..4316ebdcc1 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/hi-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/hi-domain.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <xsl:template match="*[contains(@class,' hi-d/b ')]">
         <fo:inline xsl:use-attribute-sets="b">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/i18n-postprocessImpl.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/i18n-postprocessImpl.xsl
index 6a4f375012..d7c094536b 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/i18n-postprocessImpl.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/i18n-postprocessImpl.xsl
@@ -34,7 +34,7 @@ See the accompanying LICENSE file for applicable license.
 <!-- UPDATES: 20100524: SF Bug 2385466, disallow font-family="inherit" due to 
                         lack of support in renderers. -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:opentopic-i18n="http://www.idiominc.com/opentopic/i18n"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess_template.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess_template.xsl
index 1b8883f654..ba6722f89c 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess_template.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/i18n-postprocess_template.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:opentopic-i18n="http://www.idiominc.com/opentopic/i18n"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/index.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/index.xsl
index 35171e140c..0875065ce7 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/index.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/index.xsl
@@ -31,7 +31,7 @@ This file is part of the DITA Open Toolkit project.
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:opentopic-func="http://www.idiominc.com/opentopic/exsl/function"
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/learning-elements.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/learning-elements.xsl
index 3b15b6b130..f592e50e8a 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/learning-elements.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/learning-elements.xsl
@@ -37,7 +37,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:opentopic="http://www.idiominc.com/opentopic"
     xmlns:opentopic-index="http://www.idiominc.com/opentopic/index"
     exclude-result-prefixes="opentopic opentopic-index dita2xslfo"
-    version="2.0">
+    version="3.0">
 
 
     <xsl:template match="*[contains(@class, ' learningBase/lcTime ')]">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/links.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/links.xsl
index 4780966b58..cb6ce76529 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/links.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/links.xsl
@@ -39,7 +39,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     exclude-result-prefixes="dita-ot opentopic-mapmerge opentopic-func related-links xs"
-    version="2.0">
+    version="3.0">
   
   <xsl:import href="plugin:org.dita.base:xsl/common/output-message.xsl"/>
 
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/lists.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/lists.xsl
index ec54715283..934da3cf3f 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/lists.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/lists.xsl
@@ -36,7 +36,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <!--Lists-->
     <xsl:template match="*[contains(@class, ' topic/ul ')]">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/lot-lof.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/lot-lof.xsl
index 1ed790f043..d39baf4778 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/lot-lof.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/lot-lof.xsl
@@ -17,7 +17,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:opentopic-index="http://www.idiominc.com/opentopic/index"
     xmlns:ot-placeholder="http://suite-sol.com/namespaces/ot-placeholder"
     exclude-result-prefixes="dita-ot opentopic opentopic-index dita2xslfo ot-placeholder"
-    version="2.0">
+    version="3.0">
   
   <xsl:variable name="tableset">
     <xsl:for-each select="//*[contains (@class, ' topic/table ')][*[contains(@class, ' topic/title ' )]]">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/map-elements.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/map-elements.xsl
index 7e4afe36de..627fe09612 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/map-elements.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/map-elements.xsl
@@ -10,7 +10,7 @@ See the accompanying LICENSE file for applicable license.
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
   exclude-result-prefixes="dita-ot"
-  version="2.0">
+  version="3.0">
 
   <xsl:template match="*[contains(@class,' map/topicmeta ')]/*[@class][dita-ot:matches-searchtitle-class(@class)]" priority="10"/>
 
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/markup-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/markup-domain.xsl
index da8fcc5a96..6a96422b76 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/markup-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/markup-domain.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="2.0">
+                version="3.0">
   
   <xsl:template match="*[contains(@class, ' markup-d/markupname ')]">
     <fo:inline xsl:use-attribute-sets="markupname">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/pr-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/pr-domain.xsl
index 7b3bd3cd4a..4b4b179e92 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/pr-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/pr-domain.xsl
@@ -34,7 +34,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    version="2.0"
+    version="3.0"
     exclude-result-prefixes="xs">
 
     <xsl:template match="*[contains(@class,' pr-d/codeph ')]">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/preface.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/preface.xsl
index f4695c7961..f268a7e826 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/preface.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/preface.xsl
@@ -36,7 +36,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:opentopic="http://www.idiominc.com/opentopic"
     exclude-result-prefixes="opentopic xs"
-    version="2.0">
+    version="3.0">
 
      <xsl:template name="processTopicPreface">
          <xsl:variable name="expectedPrefaceContext" as="xs:boolean" 
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/reference-elements.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/reference-elements.xsl
index 034ce03209..a10d844bc9 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/reference-elements.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/reference-elements.xsl
@@ -11,7 +11,7 @@ See the accompanying LICENSE file for applicable license.
   xmlns:fo="http://www.w3.org/1999/XSL/Format"
   xmlns:dita2xslfo="http://dita-ot.sourceforge.net/ns/200910/dita2xslfo"
   exclude-result-prefixes="xs dita2xslfo"
-  version="2.0">
+  version="3.0">
 
   <xsl:template match="*[contains(@class, ' reference/reference ')]" mode="processTopic"
                 name="processReference">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/root-processing.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/root-processing.xsl
index 3e7646d0df..eae6c38c08 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/root-processing.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/root-processing.xsl
@@ -41,7 +41,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:ot-placeholder="http://suite-sol.com/namespaces/ot-placeholder"
     xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
     exclude-result-prefixes="opentopic-index opentopic opentopic-i18n opentopic-func dita-ot xs ot-placeholder"
-    version="2.0">
+    version="3.0">
     
     <xsl:param name="bookmap-order" select="'discard'" as="xs:string"/>
   
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/static-content.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/static-content.xsl
index bf65f8eb39..6cbba937d1 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/static-content.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/static-content.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <xsl:template name="insertBodyStaticContents">
         <xsl:call-template name="insertBodyFootnoteSeparator"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/svg-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/svg-domain.xsl
index a70b9f09a3..e7afeb395a 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/svg-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/svg-domain.xsl
@@ -13,7 +13,7 @@ See the accompanying LICENSE file for applicable license.
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
                 xmlns:svg="http://www.w3.org/2000/svg"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs opentopic dita-ot ditamsg">
 
   <xsl:template match="*[contains(@class,' svg-d/svgref ')]">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/sw-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/sw-domain.xsl
index 959c44d3a2..60c9eea06f 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/sw-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/sw-domain.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <xsl:template match="*[contains(@class,' sw-d/msgph ')]">
       <fo:inline xsl:use-attribute-sets="msgph">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/tables.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/tables.xsl
index 9b80fc530b..865817d19d 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/tables.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/tables.xsl
@@ -13,7 +13,7 @@ See the accompanying LICENSE file for applicable license.
   xmlns:dita2xslfo="http://dita-ot.sourceforge.net/ns/200910/dita2xslfo"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
   exclude-result-prefixes="opentopic-func xs dita2xslfo dita-ot"
-  version="2.0">
+  version="3.0">
 
     <xsl:variable name="tableAttrs" select="'../../cfg/fo/attrs/tables-attr.xsl'"/>
 
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/task-elements.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/task-elements.xsl
index a71ecba0f4..c8197fb7e9 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/task-elements.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/task-elements.xsl
@@ -37,7 +37,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:opentopic="http://www.idiominc.com/opentopic"
     xmlns:opentopic-index="http://www.idiominc.com/opentopic/index"
     exclude-result-prefixes="opentopic opentopic-index dita2xslfo"
-    version="2.0">
+    version="3.0">
 
     <!-- Determines whether to generate titles for task sections. Values are YES and NO. -->
     <xsl:param name="GENERATE-TASK-LABELS">
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/toc.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/toc.xsl
index 6c40823016..9b74dd749e 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/toc.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/toc.xsl
@@ -41,7 +41,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:opentopic-index="http://www.idiominc.com/opentopic/index"
     xmlns:ot-placeholder="http://suite-sol.com/namespaces/ot-placeholder"
     exclude-result-prefixes="xs dita-ot opentopic opentopic-func ot-placeholder opentopic-index"
-    version="2.0">
+    version="3.0">
   
     <xsl:variable name="map" select="//opentopic:map"/>
 
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/topic.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/topic.xsl
index e33623d568..71c6e0e8ff 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/topic.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/topic.xsl
@@ -40,7 +40,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
     xmlns:ot-placeholder="http://suite-sol.com/namespaces/ot-placeholder"
     exclude-result-prefixes="dita-ot ot-placeholder opentopic opentopic-index opentopic-func dita2xslfo xs"
-    version="2.0">
+    version="3.0">
 
     <xsl:template match="*[contains(@class, ' topic/topic ')]">
       <xsl:apply-templates select="." mode="processTopic"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo.xsl
index 7b1f80c904..aa9094a51e 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo.xsl
@@ -39,7 +39,7 @@ See the accompanying LICENSE file for applicable license.
     xmlns:opentopic-func="http://www.idiominc.com/opentopic/exsl/function"
     xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/"
     exclude-result-prefixes="opentopic-index opentopic opentopic-i18n opentopic-func"
-    version="2.0">
+    version="3.0">
 
     <xsl:import href="plugin:org.dita.base:xsl/common/dita-utilities.xsl"/>
     <xsl:import href="plugin:org.dita.base:xsl/common/dita-textonly.xsl"/>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo_shell_template.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo_shell_template.xsl
index 5309e8bf42..b4bb08a6b7 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo_shell_template.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/topic2fo_shell_template.xsl
@@ -32,7 +32,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
     <xsl:import href="plugin:org.dita.pdf2:xsl/fo/topic2fo.xsl"/>
     
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/ui-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/ui-domain.xsl
index 85951bb690..76758301e7 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/ui-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/ui-domain.xsl
@@ -33,7 +33,7 @@ See the accompanying LICENSE file for applicable license.
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <xsl:template match="*[contains(@class,' ui-d/uicontrol ')]">
         <!-- insert an arrow before all but the first uicontrol in a menucascade -->
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/ut-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/ut-domain.xsl
index a513cfd903..10e90530b7 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/ut-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/ut-domain.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
-    version="2.0">
+    version="3.0">
 
     <xsl:template match="*[contains(@class,' ut-d/imagemap ')]">
         <xsl:variable name="attributes" as="attribute()*"><xsl:call-template name="commonattributes"/></xsl:variable>
diff --git a/src/main/plugins/org.dita.pdf2/xsl/fo/xml-domain.xsl b/src/main/plugins/org.dita.pdf2/xsl/fo/xml-domain.xsl
index 546694727f..2f4fcd1212 100644
--- a/src/main/plugins/org.dita.pdf2/xsl/fo/xml-domain.xsl
+++ b/src/main/plugins/org.dita.pdf2/xsl/fo/xml-domain.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="2.0">
+                version="3.0">
   
   <xsl:template match="*[contains(@class, ' xml-d/xmlelement ')]">
     <fo:inline xsl:use-attribute-sets="xmlelement">
diff --git a/src/main/plugins/org.dita.xhtml/xsl/dita2html-base_template.xsl b/src/main/plugins/org.dita.xhtml/xsl/dita2html-base_template.xsl
index 802b8364b7..a510bc96a2 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/dita2html-base_template.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/dita2html-base_template.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
                 >
 
diff --git a/src/main/plugins/org.dita.xhtml/xsl/dita2html.xsl b/src/main/plugins/org.dita.xhtml/xsl/dita2html.xsl
index 605b87e709..49f1394257 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/dita2html.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/dita2html.xsl
@@ -13,7 +13,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
 <!-- stylesheet imports -->
 <!-- the main dita to xhtml converter -->
diff --git a/src/main/plugins/org.dita.xhtml/xsl/dita2xhtml-util.xsl b/src/main/plugins/org.dita.xhtml/xsl/dita2xhtml-util.xsl
index 12c4fe1b76..32a36c9456 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/dita2xhtml-util.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/dita2xhtml-util.xsl
@@ -11,7 +11,7 @@ Copyright 2013 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:template match="/">
     <xsl:variable name="content" as="node()*">
diff --git a/src/main/plugins/org.dita.xhtml/xsl/dita2xhtml.xsl b/src/main/plugins/org.dita.xhtml/xsl/dita2xhtml.xsl
index e02aea8b6a..87f3f67f05 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/dita2xhtml.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/dita2xhtml.xsl
@@ -7,7 +7,7 @@ Copyright 2011 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:import href="plugin:org.dita.xhtml:xsl/dita2html-base.xsl"/>
   
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2html-cover.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2html-cover.xsl
index 7c148827f8..2f0c651724 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2html-cover.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2html-cover.xsl
@@ -7,7 +7,7 @@ Copyright 2014 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:import href="plugin:org.dita.xhtml:xsl/dita2html.xsl"/>
   <xsl:import href="plugin:org.dita.xhtml:xsl/map2html-coverImpl.xsl"/>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2html-coverImpl_template.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2html-coverImpl_template.xsl
index 85bc3d76ce..c76d0909a1 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2html-coverImpl_template.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2html-coverImpl_template.xsl
@@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot">
 
   <xsl:import href="plugin:org.dita.xhtml:xsl/map2htmtoc/map2htmlImpl.xsl"/>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2htmltoc_template.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2htmltoc_template.xsl
index d6e3cabfb7..054fe86d3c 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2htmltoc_template.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2htmltoc_template.xsl
@@ -7,7 +7,7 @@ Copyright 2010 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- Import the main ditamap to HTML TOC conversion -->
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlImpl.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlImpl.xsl
index 81c651d9e2..183f97d65f 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlImpl.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlImpl.xsl
@@ -8,7 +8,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-                xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg" version="2.0"
+                xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg" version="3.0"
                 exclude-result-prefixes="dita-ot ditamsg">
 
   <xsl:param name="OUTEXT" select="'.html'"/>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlcoverImpl.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlcoverImpl.xsl
index df15249923..acabb3f439 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlcoverImpl.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmlcoverImpl.xsl
@@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot">
 
   <!-- optional @class attribute for TOC <body> element
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmtocImpl.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmtocImpl.xsl
index 06278e30ce..ed8a267663 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmtocImpl.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2htmtoc/map2htmtocImpl.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2xhtml-cover.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2xhtml-cover.xsl
index 60fd7256cc..d42a76143b 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2xhtml-cover.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2xhtml-cover.xsl
@@ -7,7 +7,7 @@ Copyright 2014 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:import href="plugin:org.dita.xhtml:xsl/dita2xhtml.xsl"/>
   <xsl:import href="plugin:org.dita.xhtml:xsl/map2html-coverImpl.xsl"/>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/map2xhtmltoc.xsl b/src/main/plugins/org.dita.xhtml/xsl/map2xhtmltoc.xsl
index 4af72a5b38..8d71301561 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/map2xhtmltoc.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/map2xhtmltoc.xsl
@@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license.
 -->
 
 <!-- Map to XHTML -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/abbrev-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/abbrev-d.xsl
index 28eae2d309..4bbd4a48da 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/abbrev-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/abbrev-d.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
      xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/conceptdisplay.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/conceptdisplay.xsl
index e6e173e955..bdd5bb05d2 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/conceptdisplay.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/conceptdisplay.xsl
@@ -6,7 +6,7 @@ Copyright 2010 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0"
     xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     exclude-result-prefixes="related-links xs">
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/dita2htmlImpl.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/dita2htmlImpl.xsl
index 413b7ba5eb..479dbb41cc 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/dita2htmlImpl.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/dita2htmlImpl.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/get-meta.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/get-meta.xsl
index 77b331f930..272cbffc96 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/get-meta.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/get-meta.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- Get each value in each <keywords>. Nested indexterms should have unique entries. Other
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/glossdisplay.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/glossdisplay.xsl
index 5586eacf1f..ebdcfa65eb 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/glossdisplay.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/glossdisplay.xsl
@@ -6,7 +6,7 @@ Copyright 2010 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0"
     xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
     exclude-result-prefixes="related-links">
 
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/hazard-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/hazard-d.xsl
index abc9c2ed99..23830dbba2 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/hazard-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/hazard-d.xsl
@@ -3,7 +3,7 @@
 This file is part of the DITA Open Toolkit project. 
 See the accompanying license.txt file for applicable licenses.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
      xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/hi-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/hi-d.xsl
index 4c0fbd3ba6..5a65e2d078 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/hi-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/hi-d.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- hi-d.ent Phrase domain: b | i | u | tt | sup | sub -->
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/htmlflag.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/htmlflag.xsl
index 55579d9cdb..b959f2dd75 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/htmlflag.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/htmlflag.xsl
@@ -14,7 +14,7 @@ See the accompanying LICENSE file for applicable license.
      must be explicitly requested by the HTML code by processing with the "process-exception" mode.
               -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  version="2.0">
+  version="3.0">
 
   <xsl:template match="*[contains(@class,' ditaot-d/ditaval-startprop ')]/@style" mode="add-ditaval-style">
     <!-- Add the pre-calculated CSS style for this element -->
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/map2TOC.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/map2TOC.xsl
index 2d7987fe2d..236e15acd6 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/map2TOC.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/map2TOC.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:html="http://www.w3.org/1999/xhtml"
         exclude-result-prefixes="html">
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/mapwalker.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/mapwalker.xsl
index 87f5426ef0..132d18bf71 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/mapwalker.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/mapwalker.xsl
@@ -10,7 +10,7 @@ See the accompanying LICENSE file for applicable license.
 <!-- write technique adapted from Norman Walsh's DocBook XSLT
      first instance technique adapted from Jeni Tennison and Steve Muench -->
 
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- stylesheet imports -->
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/markup-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/markup-d.xsl
index e12500ba37..4034d4ac3d 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/markup-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/markup-d.xsl
@@ -7,7 +7,7 @@ Copyright 2014 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:template match="*[contains(@class, ' markup-d/markupname ')]">
     <code>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/pr-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/pr-d.xsl
index 57054bfe16..d01a128c64 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/pr-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/pr-d.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <xsl:import href="plugin:org.dita.xhtml:xsl/xslhtml/syntax-braces.xsl"/>
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/refdisplay.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/refdisplay.xsl
index 62060de245..47b39d0583 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/refdisplay.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/refdisplay.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
      xmlns:dita2html="http://dita-ot.sourceforge.net/ns/200801/dita2html"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/rel-links.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/rel-links.xsl
index 34444274a3..fac0c6b983 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/rel-links.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/rel-links.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/svg-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/svg-d.xsl
index c921941055..11fe3ae7d6 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/svg-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/svg-d.xsl
@@ -6,7 +6,7 @@ Copyright 2018 Jarno Elovirta
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:svg="http://www.w3.org/2000/svg"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/sw-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/sw-d.xsl
index 7c70485771..d222a9b059 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/sw-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/sw-d.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- software-domain.ent domain: filepath | msgph | userinput | systemoutput | cmdname | msgnum | varname -->
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/syntax-braces.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/syntax-braces.xsl
index 4c6d088df7..b601fa371c 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/syntax-braces.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/syntax-braces.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- syntax diagram -->
 
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/syntax-svg.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/syntax-svg.xsl
index d2aa31b828..7d96160781 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/syntax-svg.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/syntax-svg.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet version="3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                               xmlns:svg="http://www.w3.org/2000/svg">
 
 <!-- syntax diagram -->
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/tablefunctions.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/tablefunctions.xsl
index 425b2f98e6..a3af6f593d 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/tablefunctions.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/tablefunctions.xsl
@@ -13,7 +13,7 @@ Copied from HTML5 plugin to make table and simpletable functions available to XH
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:table="http://dita-ot.sourceforge.net/ns/201007/dita-ot/table"
                 xmlns:simpletable="http://dita-ot.sourceforge.net/ns/201007/dita-ot/simpletable"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot table">
 
   <xsl:function name="table:is-tbody-entry" as="xs:boolean">
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/tables.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/tables.xsl
index 0036e91b6b..79b0ca183c 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/tables.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/tables.xsl
@@ -6,7 +6,7 @@ Copyright 2004, 2005 IBM Corporation
 
 See the accompanying LICENSE file for applicable license.
 -->
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/taskdisplay.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/taskdisplay.xsl
index 8e77300955..e551389b62 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/taskdisplay.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/taskdisplay.xsl
@@ -9,7 +9,7 @@ See the accompanying LICENSE file for applicable license.
 <!-- 20090904 RDA: Add support for stepsection; combine duplicated logic
                    for main steps and steps-unordered templates. -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
      xmlns:dita2html="http://dita-ot.sourceforge.net/ns/200801/dita2html"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ui-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ui-d.xsl
index b35aa89ff1..fcb7c2fc65 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ui-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ui-d.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <!-- Screen -->
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ut-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ut-d.xsl
index af3308b730..b10d3fdf17 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ut-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/ut-d.xsl
@@ -7,7 +7,7 @@ Copyright 2004, 2005 IBM Corporation
 See the accompanying LICENSE file for applicable license.
 -->
 
-<xsl:stylesheet version="2.0"
+<xsl:stylesheet version="3.0"
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      xmlns:ditamsg="http://dita-ot.sourceforge.net/ns/200704/ditamsg"
      xmlns:xs="http://www.w3.org/2001/XMLSchema"
diff --git a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/xml-d.xsl b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/xml-d.xsl
index a701231f9b..808c1308ce 100644
--- a/src/main/plugins/org.dita.xhtml/xsl/xslhtml/xml-d.xsl
+++ b/src/main/plugins/org.dita.xhtml/xsl/xslhtml/xml-d.xsl
@@ -7,7 +7,7 @@ Copyright 2014 Jarno Elovirta
 See the accompanying LICENSE file for applicable license.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
 
   <xsl:template match="*[contains(@class, ' xml-d/xmlelement ')]">
     <code>
diff --git a/src/test/resources/BranchFilterModuleTest/src/input.xsl b/src/test/resources/BranchFilterModuleTest/src/input.xsl
index 03131d19ee..f39815e78f 100644
--- a/src/test/resources/BranchFilterModuleTest/src/input.xsl
+++ b/src/test/resources/BranchFilterModuleTest/src/input.xsl
@@ -3,7 +3,7 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:x="x"
   exclude-result-prefixes="xs x"
-  version="2.0">
+  version="3.0">
   
   <xsl:output indent="yes"/>
   
diff --git a/src/test/resources/IntegratorTest/exp/plugins/dummy/xsl/shell.xsl b/src/test/resources/IntegratorTest/exp/plugins/dummy/xsl/shell.xsl
index 02d690cc91..5a010f3f0e 100644
--- a/src/test/resources/IntegratorTest/exp/plugins/dummy/xsl/shell.xsl
+++ b/src/test/resources/IntegratorTest/exp/plugins/dummy/xsl/shell.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   
   <xsl:import href="../../../xsl/foo.xsl"/>
   
diff --git a/src/test/resources/IntegratorTest/exp/xsl/shell.xsl b/src/test/resources/IntegratorTest/exp/xsl/shell.xsl
index d214bebfae..92308d4d1c 100644
--- a/src/test/resources/IntegratorTest/exp/xsl/shell.xsl
+++ b/src/test/resources/IntegratorTest/exp/xsl/shell.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0">
+                version="3.0">
   
   <xsl:import href="plugin:dummy:foo.xsl"/>
   
diff --git a/src/test/resources/IntegratorTest/src/plugins/dummy/xsl/shell_template.xsl b/src/test/resources/IntegratorTest/src/plugins/dummy/xsl/shell_template.xsl
index a634e220eb..e0fac1c15e 100644
--- a/src/test/resources/IntegratorTest/src/plugins/dummy/xsl/shell_template.xsl
+++ b/src/test/resources/IntegratorTest/src/plugins/dummy/xsl/shell_template.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dita="http://dita-ot.sourceforge.net"  
-                version="2.0">
+                version="3.0">
   
   <dita:extension id="ImportXSLAction.plugin"
                   behavior="org.dita.dost.platform.ImportXSLAction"/>  
diff --git a/src/test/resources/IntegratorTest/src/xsl/shell_template.xsl b/src/test/resources/IntegratorTest/src/xsl/shell_template.xsl
index bf3b1b96e0..d0013c1bbf 100644
--- a/src/test/resources/IntegratorTest/src/xsl/shell_template.xsl
+++ b/src/test/resources/IntegratorTest/src/xsl/shell_template.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dita="http://dita-ot.sourceforge.net"  
-                version="2.0">
+                version="3.0">
   
   <dita:extension id="ImportXSLAction"
                   behavior="org.dita.dost.platform.ImportXSLAction"/>  
diff --git a/src/test/resources/XSpec/generate-common-tests.xsl b/src/test/resources/XSpec/generate-common-tests.xsl
index 9b95cf8442..e0fbd36485 100644
--- a/src/test/resources/XSpec/generate-common-tests.xsl
+++ b/src/test/resources/XSpec/generate-common-tests.xsl
@@ -14,7 +14,7 @@
                 xmlns:x="http://www.jenitennison.com/xslt/xspec"
                 xmlns:pkg="http://expath.org/ns/pkg"
                 exclude-result-prefixes="xs test x pkg"
-                version="2.0">
+                version="3.0">
 
    <pkg:import-uri>http://www.jenitennison.com/xslt/xspec/generate-common-tests.xsl</pkg:import-uri>
 
diff --git a/src/test/resources/XSpec/generate-tests-helper.xsl b/src/test/resources/XSpec/generate-tests-helper.xsl
index c8ad159c39..bd9b44560c 100644
--- a/src/test/resources/XSpec/generate-tests-helper.xsl
+++ b/src/test/resources/XSpec/generate-tests-helper.xsl
@@ -8,7 +8,7 @@
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:xhtml="http://www.w3.org/1999/xhtml"
diff --git a/src/test/resources/XSpec/generate-tests-utils.xsl b/src/test/resources/XSpec/generate-tests-utils.xsl
index b8ca92a8cc..7d20626431 100644
--- a/src/test/resources/XSpec/generate-tests-utils.xsl
+++ b/src/test/resources/XSpec/generate-tests-utils.xsl
@@ -8,7 +8,7 @@
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:msxsl="urn:schemas-microsoft-com:xslt"
diff --git a/src/test/resources/XSpec/generate-xspec-tests.xsl b/src/test/resources/XSpec/generate-xspec-tests.xsl
index b518bad317..af0ccdb913 100644
--- a/src/test/resources/XSpec/generate-xspec-tests.xsl
+++ b/src/test/resources/XSpec/generate-xspec-tests.xsl
@@ -8,7 +8,7 @@
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
 
-<xsl:stylesheet version="2.0" 
+<xsl:stylesheet version="3.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns="http://www.w3.org/1999/XSL/TransformAlias"
@@ -46,7 +46,7 @@
   
 <xsl:template match="x:description" mode="x:generate-tests">
   <!-- The compiled stylesheet element. -->
-  <stylesheet version="2.0">
+  <stylesheet version="3.0">
     <xsl:apply-templates select="." mode="x:copy-namespaces" />
   	<import href="{$stylesheet-uri}" />
     <!-- DITA-OT change starts: Saxon 9.8 handles this differently than 9.1 -->
diff --git a/src/test/xsl/common/dita-utilities.xsl b/src/test/xsl/common/dita-utilities.xsl
index f0511d25ce..0119561381 100644
--- a/src/test/xsl/common/dita-utilities.xsl
+++ b/src/test/xsl/common/dita-utilities.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 exclude-result-prefixes="xs"
-                version="2.0">
+                version="3.0">
   
   <xsl:import href="../../../main/plugins/org.dita.base/xsl/common/dita-utilities.xsl"/>
   <xsl:import href="../../../main/plugins/org.dita.base/xsl/common/output-message.xsl"/>
diff --git a/src/test/xsl/plugins/org.dita.base/xsl/preprocess/maplinkImpl.xsl b/src/test/xsl/plugins/org.dita.base/xsl/preprocess/maplinkImpl.xsl
index 33e887708a..92014999e7 100644
--- a/src/test/xsl/plugins/org.dita.base/xsl/preprocess/maplinkImpl.xsl
+++ b/src/test/xsl/plugins/org.dita.base/xsl/preprocess/maplinkImpl.xsl
@@ -4,7 +4,7 @@
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:table="http://dita-ot.sourceforge.net/ns/201007/dita-ot/table"
                 xmlns:simpletable="http://dita-ot.sourceforge.net/ns/201007/dita-ot/simpletable"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot table simpletable">
   
   <xsl:import href="../../../../../../main/plugins/org.dita.base/xsl/preprocess/maplinkImpl.xsl"/>
diff --git a/src/test/xsl/plugins/org.dita.html5/xsl/simpletable.xsl b/src/test/xsl/plugins/org.dita.html5/xsl/simpletable.xsl
index 4d89f55354..b0fb59d37e 100644
--- a/src/test/xsl/plugins/org.dita.html5/xsl/simpletable.xsl
+++ b/src/test/xsl/plugins/org.dita.html5/xsl/simpletable.xsl
@@ -4,7 +4,7 @@
                 xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
                 xmlns:table="http://dita-ot.sourceforge.net/ns/201007/dita-ot/table"
                 xmlns:simpletable="http://dita-ot.sourceforge.net/ns/201007/dita-ot/simpletable"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot table simpletable">
   
   <xsl:import href="../../../../../main/plugins/org.dita.html5/xsl/functions.xsl"/>
diff --git a/src/test/xsl/plugins/org.dita.html5/xsl/topic.xsl b/src/test/xsl/plugins/org.dita.html5/xsl/topic.xsl
index 3cef87b436..b898071636 100644
--- a/src/test/xsl/plugins/org.dita.html5/xsl/topic.xsl
+++ b/src/test/xsl/plugins/org.dita.html5/xsl/topic.xsl
@@ -5,7 +5,7 @@
                 xmlns:table="http://dita-ot.sourceforge.net/ns/201007/dita-ot/table"
                 xmlns:simpletable="http://dita-ot.sourceforge.net/ns/201007/dita-ot/simpletable"
                 xmlns:related-links="http://dita-ot.sourceforge.net/ns/200709/related-links"
-                version="2.0"
+                version="3.0"
                 exclude-result-prefixes="xs dita-ot table simpletable">
   
   <xsl:import href="../../../../../main/plugins/org.dita.base/xsl/common/output-message.xsl"/>
diff --git a/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/mocks.xsl b/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/mocks.xsl
index 20f62973e2..3db3022cb8 100644
--- a/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/mocks.xsl
+++ b/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/mocks.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" exclude-result-prefixes="xs dita-ot" version="2.0">
+  xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" exclude-result-prefixes="xs dita-ot" version="3.0">
 
   <xsl:variable name="writing-mode" select="'lr'"/>
   <xsl:variable name="locale" select="'en'"/>
diff --git a/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/simpletable.xsl b/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/simpletable.xsl
index 59ec967a69..cf53460b6b 100644
--- a/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/simpletable.xsl
+++ b/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/simpletable.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="2.0">
+  version="3.0">
   
   <xsl:import href="mocks.xsl"/>  
   <xsl:import href="../../../../../../main/plugins/org.dita.pdf2/xsl/fo/tables.xsl"/>
diff --git a/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/tables.xsl b/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/tables.xsl
index c998e7218f..2338c2f52b 100644
--- a/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/tables.xsl
+++ b/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/tables.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="2.0">
+  version="3.0">
   
   <xsl:import href="mocks.xsl"/>
   <xsl:import href="../../../../../../main/plugins/org.dita.pdf2/xsl/fo/tables.xsl"/>
diff --git a/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/topic.xsl b/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/topic.xsl
index 2d4ba74ec6..e0155004b4 100644
--- a/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/topic.xsl
+++ b/src/test/xsl/plugins/org.dita.pdf2/xsl/fo/topic.xsl
@@ -3,7 +3,7 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot"
   exclude-result-prefixes="xs dita-ot"
-  version="2.0">
+  version="3.0">
   
   <xsl:import href="../../../../../../main/plugins/org.dita.pdf2/cfg/fo/attrs/basic-settings.xsl"/>
   <xsl:import href="../../../../../../main/plugins/org.dita.pdf2/xsl/fo/topic.xsl"/>