diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java
index ec06f665972..f5a9f0281b3 100644
--- a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java
+++ b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/ogcwxs/Harvester.java
@@ -351,6 +351,7 @@ private List<String> addMetadata(Element capa) throws Exception {
             // and add the metadata
             XPath xp = XPath.newInstance("//Layer[count(./*[name(.)='Layer'])=0] | " +
                 "//wms:Layer[count(./*[name(.)='Layer'])=0] | " +
+                "//wmts:Layer[count(./*[local-name(.)='Layer'])=0] | " +
                 "//wfs:FeatureType | " +
                 "//wcs:CoverageOfferingBrief | " +
                 "//sos:ObservationOffering | " +
@@ -358,6 +359,7 @@ private List<String> addMetadata(Element capa) throws Exception {
             xp.addNamespace("wfs", "http://www.opengis.net/wfs");
             xp.addNamespace("wcs", "http://www.opengis.net/wcs");
             xp.addNamespace("wms", "http://www.opengis.net/wms");
+            xp.addNamespace("wmts", "http://www.opengis.net/wmts/1.0");
             xp.addNamespace("wps", "http://www.opengis.net/wps/2.0");
             xp.addNamespace("sos", "http://www.opengis.net/sos/1.0");
 
@@ -618,6 +620,9 @@ private WxSLayerRegistry addLayerMetadata(Element layer, Element capa) throws JD
         } else if (params.ogctype.substring(0, 3).equals("SOS")) {
             Namespace gml = Namespace.getNamespace("http://www.opengis.net/gml");
             reg.name = layer.getChild("name", gml).getValue();
+        } else if (params.ogctype.substring(0, 4).equals("WMTS")) {
+            Namespace ows = Namespace.getNamespace("http://www.opengis.net/ows/1.1");
+            reg.name = layer.getChild("Identifier", ows).getValue();
         }
 
         //--- md5 the full capabilities URL + the layer, coverage or feature name
@@ -627,9 +632,9 @@ private WxSLayerRegistry addLayerMetadata(Element layer, Element capa) throws JD
 
         if (params.useLayerMd && (
             params.ogctype.substring(0, 3).equals("WMS") ||
-                params.ogctype.substring(0, 3).equals("WFS") ||
-                params.ogctype.substring(0, 3).equals("WPS") ||
-                params.ogctype.substring(0, 3).equals("WCS"))) {
+            params.ogctype.substring(0, 3).equals("WFS") ||
+            params.ogctype.substring(0, 3).equals("WPS") ||
+            params.ogctype.substring(0, 3).equals("WCS"))) {
 
             log.info("  - Searching for metadataUrl for layer " + reg.name);
 
diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMTGetCapabilities-to-ISO19119_ISO19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMTGetCapabilities-to-ISO19119_ISO19139.xsl
new file mode 100644
index 00000000000..4710f5ae726
--- /dev/null
+++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMTGetCapabilities-to-ISO19119_ISO19139.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
+  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
+  ~ and United Nations Environment Programme (UNEP)
+  ~
+  ~ This program is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2 of the License, or (at
+  ~ your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  ~
+  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+  ~ Rome - Italy. email: geonetwork@osgeo.org
+  -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+  <xsl:include href="OGCWxSGetCapabilities-to-19119.xsl"/>
+  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMTGetCapabilitiesLayer-to-19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMTGetCapabilitiesLayer-to-19139.xsl
new file mode 100644
index 00000000000..03bdbfe0a25
--- /dev/null
+++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWMTGetCapabilitiesLayer-to-19139.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2001-2016 Food and Agriculture Organization of the
+  ~ United Nations (FAO-UN), United Nations World Food Programme (WFP)
+  ~ and United Nations Environment Programme (UNEP)
+  ~
+  ~ This program is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2 of the License, or (at
+  ~ your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  ~
+  ~ Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+  ~ Rome - Italy. email: geonetwork@osgeo.org
+  -->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="2.0">
+  <xsl:include href="OGCWxSGetCapabilitiesLayer-to-19139.xsl"/>
+  <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
+  <xsl:template match="/">
+    <xsl:apply-templates/>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl
index 93cf0455137..b443825ba19 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilities-to-19119.xsl
@@ -27,6 +27,7 @@ Mapping between :
 - WMS 1.0.0
 - WMS 1.1.1
 - WMS 1.3.0
+- WMTS 1.0.0
 - WCS 1.0.0
 - WFS 1.0.0
 - WFS 1.1.0
@@ -41,6 +42,7 @@ Mapping between :
                 xmlns:wfs="http://www.opengis.net/wfs"
                 xmlns:wcs="http://www.opengis.net/wcs"
                 xmlns:wms="http://www.opengis.net/wms"
+                xmlns:wmts="http://www.opengis.net/wmts/1.0"
                 xmlns:ows="http://www.opengis.net/ows"
                 xmlns:owsg="http://www.opengeospatial.net/ows"
                 xmlns:ows11="http://www.opengis.net/ows/1.1"
@@ -52,59 +54,52 @@ Mapping between :
                 xmlns:inspire_vs="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0"
                 version="2.0"
                 xmlns="http://www.isotc211.org/2005/gmd"
-                extension-element-prefixes="wcs ows wfs ows11 wps wps1 wps2 owsg">
-
-  <!-- ============================================================================= -->
+                exclude-result-prefixes="#all">
 
   <xsl:param name="uuid">uuid</xsl:param>
   <xsl:param name="lang">eng</xsl:param>
   <xsl:param name="topic"></xsl:param>
 
-  <!-- ============================================================================= -->
 
   <xsl:include href="resp-party.xsl"/>
   <xsl:include href="ref-system.xsl"/>
   <xsl:include href="identification.xsl"/>
 
-  <!-- ============================================================================= -->
 
   <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
 
-  <!-- ============================================================================= -->
+
 
   <xsl:template match="/">
     <xsl:apply-templates/>
   </xsl:template>
 
-  <!-- ============================================================================= -->
 
-  <xsl:template match="WMT_MS_Capabilities|wfs:WFS_Capabilities|wcs:WCS_Capabilities|
-         wps:Capabilities|wps1:Capabilities|wps2:Capabilities|wms:WMS_Capabilities">
+  <xsl:template match="WMT_MS_Capabilities|wfs:WFS_Capabilities|
+                       wcs:WCS_Capabilities|
+                       wps:Capabilities|wps1:Capabilities|wps2:Capabilities|
+                       wms:WMS_Capabilities|wmts:Capabilities">
 
     <xsl:variable name="ows">
       <xsl:choose>
         <xsl:when test="(local-name(.)='WFS_Capabilities' and namespace-uri(.)='http://www.opengis.net/wfs' and @version='1.1.0')
           or (local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengeospatial.net/wps')
           or (local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wps/1.0.0')
-          or (local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wps/2.0')">true</xsl:when>
+          or (local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wps/2.0')
+          or (local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wmts/1.0')">true</xsl:when>
         <xsl:otherwise>false</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
 
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-    <MD_Metadata>
 
-      <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
+    <MD_Metadata>
       <fileIdentifier>
         <gco:CharacterString>
           <xsl:value-of select="$uuid"/>
         </gco:CharacterString>
       </fileIdentifier>
 
-      <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
       <language>
         <xsl:choose>
           <xsl:when
@@ -121,39 +116,30 @@ Mapping between :
         </xsl:choose>
       </language>
 
-      <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
       <characterSet>
         <MD_CharacterSetCode codeList="./resources/codeList.xml#MD_CharacterSetCode"
                              codeListValue="utf8"/>
       </characterSet>
 
       <!-- parentIdentifier : service have no parent -->
-      <!-- mdHrLv -->
+
       <hierarchyLevel>
         <MD_ScopeCode
           codeList="./resources/codeList.xml#MD_ScopeCode"
           codeListValue="service"/>
       </hierarchyLevel>
 
-      <!-- mdHrLvName -->
-
-      <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-      <xsl:choose>
-        <xsl:when test="Service/ContactInformation|
-          wfs:Service/wfs:ContactInformation|
-          wms:Service/wms:ContactInformation|
-                    ows:ServiceProvider|
-          owsg:ServiceProvider|
-          ows11:ServiceProvider|
-          ows2:ServiceProvider">
-          <xsl:for-each select="Service/ContactInformation|
-            wfs:Service/wfs:ContactInformation|
-            wms:Service/wms:ContactInformation|
+      <xsl:variable name="serviceProviderList"
+                    select="Service/ContactInformation|
+                        wfs:Service/wfs:ContactInformation|
+                        wms:Service/wms:ContactInformation|
                         ows:ServiceProvider|
-            owsg:ServiceProvider|
-            ows11:ServiceProvider|
-            ows2:ServiceProvider">
+                        owsg:ServiceProvider|
+                        ows11:ServiceProvider|
+                        ows2:ServiceProvider"/>
+      <xsl:choose>
+        <xsl:when test="$serviceProviderList">
+          <xsl:for-each select="$serviceProviderList">
             <contact>
               <CI_ResponsibleParty>
                 <xsl:apply-templates select="." mode="RespParty"/>
@@ -166,9 +152,8 @@ Mapping between :
         </xsl:otherwise>
       </xsl:choose>
 
-
-      <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
       <xsl:variable name="df">[Y0001]-[M01]-[D01]T[H01]:[m01]:[s01]</xsl:variable>
+
       <dateStamp>
         <xsl:choose>
           <xsl:when test="//inspire_vs:ExtendedCapabilities/inspire_common:MetadataDate">
@@ -184,8 +169,6 @@ Mapping between :
         </xsl:choose>
       </dateStamp>
 
-      <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
       <metadataStandardName>
         <gco:CharacterString>ISO 19119/2005</gco:CharacterString>
       </metadataStandardName>
@@ -194,10 +177,6 @@ Mapping between :
         <gco:CharacterString>1.0</gco:CharacterString>
       </metadataStandardVersion>
 
-
-      <!--mdExtInfo-->
-      <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
       <identificationInfo>
         <srv:SV_ServiceIdentification>
           <xsl:apply-templates select="." mode="SrvDataIdentification">
@@ -211,8 +190,6 @@ Mapping between :
         </srv:SV_ServiceIdentification>
       </identificationInfo>
 
-      <!--contInfo-->
-      <!--distInfo -->
       <distributionInfo>
         <MD_Distribution>
           <distributionFormat>
@@ -232,6 +209,9 @@ Mapping between :
                   <linkage>
                     <URL>
                       <xsl:choose>
+                        <xsl:when test="//wmts:Capabilities/wmts:ServiceMetadataURL">
+                          <xsl:value-of select="//wmts:Capabilities/wmts:ServiceMetadataURL/@xlink:href"/>
+                        </xsl:when>
                         <xsl:when test="$ows='true'">
                           <xsl:value-of select="//ows:Operation[@name='GetCapabilities']/ows:DCP/ows:HTTP/ows:Get/@xlink:href|
                                                   //ows11:Operation[@name='GetCapabilities']/ows11:DCP/ows11:HTTP/ows11:Get/@xlink:href|
@@ -267,6 +247,7 @@ Mapping between :
                           test="local-name(.)='WFS_MS_Capabilities' or local-name(.)='WFS_Capabilities'">
                           application/vnd.ogc.wfs_xml
                         </xsl:when>
+                        <xsl:when test="local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wmts/1.0'">OGC:WMTS</xsl:when>
                         <xsl:otherwise>WWW:LINK-1.0-http--link</xsl:otherwise>
                       </xsl:choose>
                     </gco:CharacterString>
@@ -396,14 +377,7 @@ Mapping between :
             </LI_Lineage>
           </lineage>
         </DQ_DataQuality>
-
       </dataQualityInfo>
-      <!--mdConst -->
-      <!--mdMaint-->
-
     </MD_Metadata>
   </xsl:template>
-
-  <!-- ============================================================================= -->
-
 </xsl:stylesheet>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilitiesLayer-to-19139.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilitiesLayer-to-19139.xsl
index 36a02e0f089..e0f265e1d71 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilitiesLayer-to-19139.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/OGCWxSGetCapabilitiesLayer-to-19139.xsl
@@ -28,15 +28,14 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:wfs="http://www.opengis.net/wfs"
                 xmlns:wms="http://www.opengis.net/wms"
+                xmlns:wmts="http://www.opengis.net/wmts/1.0"
                 xmlns:ows="http://www.opengis.net/ows"
+                xmlns:ows11="http://www.opengis.net/ows/1.1"
                 xmlns:wcs="http://www.opengis.net/wcs"
-                xmlns:xlink="http://www.w3.org/1999/xlink" version="2.0"
+                xmlns:xlink="http://www.w3.org/1999/xlink"
+                version="2.0"
                 xmlns="http://www.isotc211.org/2005/gmd"
-                extension-element-prefixes="wcs ows wfs srv">
-
-  <!--
-        =============================================================================
-    -->
+                exclude-result-prefixes="#all">
 
   <xsl:param name="uuid"/>
   <xsl:param name="Name"/>
@@ -49,89 +48,59 @@
     OGC server list all epsg database. -->
   <xsl:variable name="maxCRS">21</xsl:variable>
 
-  <!--
-        =============================================================================
-    -->
 
   <xsl:include href="resp-party.xsl"/>
   <xsl:include href="ref-system.xsl"/>
   <xsl:include href="identification.xsl"/>
 
-  <!--
-        =============================================================================
-    -->
 
   <xsl:output method="xml" version="1.0" encoding="UTF-8"
               indent="yes"/>
 
-  <!--
-        =============================================================================
-    -->
 
   <xsl:template match="/">
     <xsl:apply-templates/>
   </xsl:template>
 
-  <!--
-        =============================================================================
-    -->
-  <xsl:template
-    match="WMT_MS_Capabilities[//Layer/Name=$Name]|wms:WMS_Capabilities[//wms:Layer/wms:Name=$Name]|wfs:WFS_Capabilities[//wfs:FeatureType/wfs:Name=$Name]|wcs:WCS_Capabilities[//wcs:CoverageOfferingBrief/wcs:name=$Name]">
+
+  <xsl:template match="WMT_MS_Capabilities[//Layer/Name=$Name]|
+                       wms:WMS_Capabilities[//wms:Layer/wms:Name=$Name]|
+                       wmts:Capabilities[//wmts:Layer/ows11:Identifier=$Name]|
+                       wfs:WFS_Capabilities[//wfs:FeatureType/wfs:Name=$Name]|
+                       wcs:WCS_Capabilities[//wcs:CoverageOfferingBrief/wcs:name=$Name]">
 
     <xsl:variable name="ows">
       <xsl:choose>
         <xsl:when
-          test="local-name(.)='WFS_Capabilities' and namespace-uri(.)='http://www.opengis.net/wfs' and @version='1.1.0'">
-          true
-        </xsl:when>
+          test="(local-name(.)='WFS_Capabilities' and namespace-uri(.)='http://www.opengis.net/wfs' and @version='1.1.0') or
+                (local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wmts/1.0')">true</xsl:when>
         <xsl:otherwise>false</xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
 
 
     <MD_Metadata>
-
-      <!--
-                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            -->
-
       <fileIdentifier>
         <gco:CharacterString>
           <xsl:value-of select="$uuid"/>
         </gco:CharacterString>
       </fileIdentifier>
 
-      <!--
-                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            -->
-
       <language>
         <LanguageCode codeList="http://www.loc.gov/standards/iso639-2/"
                       codeListValue="{$lang}"/>
       </language>
 
-      <!--
-                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            -->
-
       <characterSet>
         <MD_CharacterSetCode codeList="./resources/codeList.xml#MD_CharacterSetCode"
                              codeListValue="utf8"/>
       </characterSet>
 
-      <!-- parentIdentifier -->
-      <!-- mdHrLv -->
       <hierarchyLevel>
         <MD_ScopeCode codeList="./resources/codeList.xml#MD_ScopeCode"
                       codeListValue="dataset"/>
       </hierarchyLevel>
 
-      <!-- mdHrLvName -->
-
-      <!--
-                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            -->
-
       <xsl:for-each select="//ContactInformation|//wms:ContactInformation|//wcs:responsibleParty">
         <contact>
           <CI_ResponsibleParty>
@@ -139,7 +108,7 @@
           </CI_ResponsibleParty>
         </contact>
       </xsl:for-each>
-      <xsl:for-each select="//ows:ServiceProvider">
+      <xsl:for-each select="//ows:ServiceProvider|//ows11:ServiceProvider">
         <contact>
           <CI_ResponsibleParty>
             <xsl:apply-templates select="." mode="RespParty"/>
@@ -147,10 +116,6 @@
         </contact>
       </xsl:for-each>
 
-
-      <!--
-                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            -->
       <xsl:variable name="df">[Y0001]-[M01]-[D01]T[H01]:[m01]:[s01]</xsl:variable>
       <dateStamp>
         <gco:DateTime>
@@ -158,9 +123,6 @@
         </gco:DateTime>
       </dateStamp>
 
-      <!--
-                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            -->
       <metadataStandardName>
         <gco:CharacterString>ISO 19115:2003/19139</gco:CharacterString>
       </metadataStandardName>
@@ -169,7 +131,6 @@
         <gco:CharacterString>1.0</gco:CharacterString>
       </metadataStandardVersion>
 
-      <!-- spatRepInfo-->
       <xsl:choose>
         <!-- WMS 1.1.0 is space separated -->
         <xsl:when test="@version='1.1.0' or @version='1.0.0'">
@@ -197,10 +158,6 @@
         </xsl:otherwise>
       </xsl:choose>
 
-      <!--mdExtInfo-->
-      <!--
-                - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-            -->
       <identificationInfo>
         <MD_DataIdentification>
           <xsl:apply-templates select="."
@@ -218,8 +175,6 @@
         </MD_DataIdentification>
       </identificationInfo>
 
-      <!--contInfo-->
-      <!--distInfo -->
       <distributionInfo>
         <MD_Distribution>
           <distributionFormat>
@@ -239,6 +194,11 @@
                   <linkage>
                     <URL>
                       <xsl:choose>
+                        <xsl:when test="local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wmts/1.0'">
+                          <xsl:value-of select="if (//ows11:Operation[@name='GetTile']/ows11:DCP/ows11:HTTP/ows11:Get/@xlink:href)
+                          then //ows11:Operation[@name='GetTile']/ows11:DCP/ows11:HTTP/ows11:Get/@xlink:href
+                          else wmts:ServiceMetadataURL/@xlink:href"/>
+                        </xsl:when>
                         <xsl:when test="$ows='true'">
                           <xsl:value-of
                             select="//ows:Operation[@name='GetFeature']/ows:DCP/ows:HTTP/ows:Get/@xlink:href"/>
@@ -263,28 +223,31 @@
                     </URL>
                   </linkage>
                   <protocol>
-                    <xsl:choose>
-                      <xsl:when test="name(.)='WMT_MS_Capabilities'">
-                        <gco:CharacterString>OGC:WMS-1.1.1-http-get-map
-                        </gco:CharacterString>
-                      </xsl:when>
-                      <xsl:when test="name(.)='WMS_Capabilities'">
-                        <gco:CharacterString>OGC:WMS-1.3.0-http-get-map
-                        </gco:CharacterString>
-                      </xsl:when>
-                      <xsl:when test="$ows='true'">
-                        <gco:CharacterString>OGC:WFS-1.1.0-http-get-feature
-                        </gco:CharacterString>
-                      </xsl:when>
-                      <xsl:when test="name(.)='WFS_Capabilities'">
-                        <gco:CharacterString>OGC:WFS-1.0.0-http-get-feature
-                        </gco:CharacterString>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <gco:CharacterString>OGC:WCS-1.0.0-http-get-coverage
-                        </gco:CharacterString>
-                      </xsl:otherwise>
-                    </xsl:choose>
+                    <gco:CharacterString>
+                      <xsl:choose>
+                        <xsl:when test="name(.)='WMT_MS_Capabilities'">
+                          <gco:CharacterString>OGC:WMS-1.1.1-http-get-map
+                          </gco:CharacterString>
+                        </xsl:when>
+                        <xsl:when test="name(.)='WMS_Capabilities'">
+                          <gco:CharacterString>OGC:WMS-1.3.0-http-get-map
+                          </gco:CharacterString>
+                        </xsl:when>
+                        <xsl:when test="local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wmts/1.0'">OGC:WMTS</xsl:when>
+                        <xsl:when test="$ows='true'">
+                          <gco:CharacterString>OGC:WFS-1.1.0-http-get-feature
+                          </gco:CharacterString>
+                        </xsl:when>
+                        <xsl:when test="name(.)='WFS_Capabilities'">
+                          <gco:CharacterString>OGC:WFS-1.0.0-http-get-feature
+                          </gco:CharacterString>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <gco:CharacterString>OGC:WCS-1.0.0-http-get-coverage
+                          </gco:CharacterString>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </gco:CharacterString>
                   </protocol>
                   <name>
                     <gco:CharacterString>
@@ -318,7 +281,6 @@
         </MD_Distribution>
       </distributionInfo>
 
-      <!--dqInfo-->
       <dataQualityInfo>
         <DQ_DataQuality>
           <scope>
@@ -338,9 +300,6 @@
           </lineage>
         </DQ_DataQuality>
       </dataQualityInfo>
-      <!--mdConst -->
-      <!--mdMaint-->
-
     </MD_Metadata>
   </xsl:template>
 
@@ -410,11 +369,11 @@
   </xsl:template>
 
 
-  <!-- Metadata URL
-    -->
-  <xsl:template mode="onlineResource" match="
-    //wms:Layer[wms:Name=$Name]/wms:MetadataURL|
-    //Layer[Name=$Name]/MetadataURL" priority="2">
+  <!-- Metadata URL -->
+  <xsl:template mode="onlineResource"
+                match="//wms:Layer[wms:Name=$Name]/wms:MetadataURL|
+                       //Layer[Name=$Name]/MetadataURL"
+                priority="2">
 
     <xsl:call-template name="onlineResource">
       <xsl:with-param name="name" select="concat($Name, ' (', name(.) ,')')"/>
@@ -422,12 +381,13 @@
                       select="wms:OnlineResource/@xlink:href|OnlineResource/@xlink:href"/>
       <xsl:with-param name="protocol" select="wms:Format|Format"/>
     </xsl:call-template>
-
   </xsl:template>
 
-  <xsl:template mode="onlineResource" match="
-    //wms:Layer[wms:Name=$Name]/wms:Style/wms:LegendURL|
-    //Layer[Name=$Name]/Style/LegendURL" priority="2">
+
+  <xsl:template mode="onlineResource"
+                match="//wms:Layer[wms:Name=$Name]/wms:Style/wms:LegendURL|
+                       //Layer[Name=$Name]/Style/LegendURL"
+                priority="2">
 
     <xsl:call-template name="onlineResource">
       <xsl:with-param name="name" select="concat(../Title|../wms:Title, ' (', name(.) ,')')"/>
@@ -435,13 +395,14 @@
                       select="wms:OnlineResource/@xlink:href|OnlineResource/@xlink:href"/>
       <xsl:with-param name="protocol" select="wms:Format|Format"/>
     </xsl:call-template>
-
   </xsl:template>
 
+
   <xsl:template mode="onlineResource" match="*">
     <xsl:apply-templates mode="onlineResource" select="*"/>
   </xsl:template>
 
+
   <xsl:template name="onlineResource">
     <xsl:param name="name"/>
     <xsl:param name="url"/>
@@ -473,9 +434,4 @@
       </CI_OnlineResource>
     </onLine>
   </xsl:template>
-
-  <!--
-        =============================================================================
-    -->
-
 </xsl:stylesheet>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/identification.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/identification.xsl
index 78ed5f3b5dc..d0447b58a25 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/identification.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/identification.xsl
@@ -33,6 +33,7 @@
                 xmlns:ows2="http://www.opengis.net/ows/2.0"
                 xmlns:wcs="http://www.opengis.net/wcs"
                 xmlns:wms="http://www.opengis.net/wms"
+                xmlns:wmts="http://www.opengis.net/wmts/1.0"
                 xmlns:wps="http://www.opengeospatial.net/wps"
                 xmlns:wps1="http://www.opengis.net/wps/1.0.0"
                 xmlns:wps2="http://www.opengis.net/wps/2.0"
@@ -42,9 +43,8 @@
                 xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0"
                 version="2.0"
                 xmlns="http://www.isotc211.org/2005/gmd"
-                extension-element-prefixes="math exslt wcs ows wps wps1 wps2 ows11 wfs gml">
-
-  <!-- ============================================================================= -->
+                extension-element-prefixes="math exslt"
+                exclude-result-prefixes="#all">
 
   <xsl:template match="*" mode="SrvDataIdentification">
     <xsl:param name="topic"/>
@@ -107,8 +107,6 @@
       </CI_Citation>
     </citation>
 
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
     <abstract>
       <gco:CharacterString>
         <xsl:choose>
@@ -134,15 +132,12 @@
       </gco:CharacterString>
     </abstract>
 
-    <!--idPurp-->
 
     <status>
       <MD_ProgressCode codeList="./resources/codeList.xml#MD_ProgressCode"
                        codeListValue="completed"/>
     </status>
 
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
     <xsl:for-each
       select="//ContactInformation|//wcs:responsibleParty|//wms:responsibleParty|wms:Service/wms:ContactInformation">
       <pointOfContact>
@@ -159,11 +154,9 @@
       </pointOfContact>
     </xsl:for-each>
 
-    <!-- resMaint -->
-    <!-- graphOver -->
-    <!-- dsFormat-->
     <xsl:for-each
-      select="$s/KeywordList|$s/wfs:keywords|$s/wcs:keywords|$s/ows:Keywords|$s/ows11:Keywords|$s/ows2:Keywords">
+      select="$s/KeywordList|$s/wfs:keywords|$s/wcs:keywords|$s/ows:Keywords|
+              $s/ows11:Keywords|$s/ows11:KeywordList|$s/ows2:Keywords">
       <descriptiveKeywords>
         <MD_Keywords>
           <xsl:apply-templates select="." mode="Keywords"/>
@@ -336,6 +329,8 @@
           </xsl:when>
           <xsl:when test="name(.)='WMT_MS_Capabilities' or name(.)='WMS_Capabilities'">OGC:WMS
           </xsl:when>
+          <xsl:when test="local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wmts/1.0'">OGC:WMTS
+          </xsl:when>
           <xsl:when test="name(.)='WCS_Capabilities'">OGC:WCS</xsl:when>
           <xsl:when test="name(.)='wps:Capabilities'">OGC:WPS</xsl:when>
           <xsl:otherwise>OGC:WFS</xsl:otherwise>
@@ -348,8 +343,6 @@
       </gco:CharacterString>
     </srv:serviceTypeVersion>
 
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
     <srv:accessProperties>
       <MD_StandardOrderProcess>
         <fees>
@@ -403,7 +396,8 @@
                   <xsl:variable name="boxes">
                     <xsl:choose>
                       <xsl:when test="$ows='true'">
-                        <xsl:for-each select="//ows:WGS84BoundingBox/ows:LowerCorner">
+                        <xsl:for-each select="//ows:WGS84BoundingBox/ows:LowerCorner|
+                                              //ows11:WGS84BoundingBox/ows11:LowerCorner">
                           <xmin>
                             <xsl:value-of select="substring-before(., ' ')"/>
                           </xmin>
@@ -411,7 +405,8 @@
                             <xsl:value-of select="substring-after(., ' ')"/>
                           </ymin>
                         </xsl:for-each>
-                        <xsl:for-each select="//ows:WGS84BoundingBox/ows:UpperCorner">
+                        <xsl:for-each select="//ows:WGS84BoundingBox/ows:UpperCorner|
+                                              //ows11:WGS84BoundingBox/ows11:UpperCorner">
                           <xmax>
                             <xsl:value-of select="substring-before(., ' ')"/>
                           </xmax>
@@ -678,6 +673,9 @@
         <title>
           <gco:CharacterString>
             <xsl:choose>
+              <xsl:when test="local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wmts/1.0'">
+                <xsl:value-of select="//wmts:Layer[ows11:Identifier=$Name]/ows11:Title"/>
+              </xsl:when>
               <xsl:when
                 test="name(.)='WFS_Capabilities' or name(.)='wfs:WFS_Capabilities' or $ows='true'">
                 <xsl:value-of select="//wfs:FeatureType[wfs:Name=$Name]/wfs:Title"/>
@@ -711,8 +709,6 @@
       </CI_Citation>
     </citation>
 
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
     <abstract>
       <gco:CharacterString>
         <xsl:choose>
@@ -725,6 +721,9 @@
           <xsl:when test="name(.)='WMT_MS_Capabilities'">
             <xsl:value-of select="//Layer[Name=$Name]/Abstract"/>
           </xsl:when>
+          <xsl:when test="local-name(.)='Capabilities' and namespace-uri(.)='http://www.opengis.net/wmts/1.0'">
+            <xsl:value-of select="//wmts:Layer[ows11:Identifier=$Name]/ows11:Abstract"/>
+          </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="//wcs:CoverageOfferingBrief[wcs:name=$Name]/wcs:description"/>
           </xsl:otherwise>
@@ -739,8 +738,6 @@
                        codeListValue="completed"/>
     </status>
 
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
     <xsl:for-each select="Service/ContactInformation|wms:Service/wms:ContactInformation">
       <pointOfContact>
         <CI_ResponsibleParty>
@@ -958,7 +955,8 @@
                   <xsl:choose>
                     <xsl:when test="$ows='true'">
                       <xsl:for-each
-                        select="//wfs:FeatureType[wfs:Name=$Name]/ows:WGS84BoundingBox/ows:LowerCorner">
+                        select="//wfs:FeatureType[wfs:Name=$Name]/ows:WGS84BoundingBox/ows:LowerCorner|
+                                //wmts:Layer[ows11:Identifier=$Name]/ows11:WGS84BoundingBox/ows11:LowerCorner">
                         <xmin>
                           <xsl:value-of select="substring-before(., ' ')"/>
                         </xmin>
@@ -967,7 +965,8 @@
                         </ymin>
                       </xsl:for-each>
                       <xsl:for-each
-                        select="//wfs:FeatureType[wfs:Name=$Name]/ows:WGS84BoundingBox/ows:UpperCorner">
+                        select="//wfs:FeatureType[wfs:Name=$Name]/ows:WGS84BoundingBox/ows:UpperCorner|
+                                //wmts:Layer[ows11:Identifier=$Name]/ows11:WGS84BoundingBox/ows11:UpperCorner">
                         <xmax>
                           <xsl:value-of select="substring-before(., ' ')"/>
                         </xmax>
@@ -1087,12 +1086,8 @@
         </xsl:for-each>
 
           - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
   </xsl:template>
 
-  <!-- ============================================================================= -->
-  <!-- === Keywords === -->
-  <!-- ============================================================================= -->
 
   <xsl:template match="*" mode="Keywords">
     <!-- TODO : tokenize WFS 100 keywords list -->
diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/ref-system.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/ref-system.xsl
index 789a61229b5..4f24aa75f0d 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/ref-system.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/ref-system.xsl
@@ -24,11 +24,9 @@
   -->
 
 <xsl:stylesheet xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"
+                version="2.0"
                 xmlns="http://www.isotc211.org/2005/gmd"
->
-
-  <!-- ============================================================================= -->
+                exclude-result-prefixes="#all">
 
   <xsl:template name="RefSystemTypes">
     <xsl:param name="srs"/>
@@ -43,7 +41,4 @@
     </referenceSystemIdentifier>
   </xsl:template>
 
-
-  <!-- ============================================================================= -->
-
 </xsl:stylesheet>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/resp-party.xsl b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/resp-party.xsl
index 9edd4d2f91a..b2217faf3be 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/resp-party.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/convert/OGCWxSGetCapabilitiesto19119/resp-party.xsl
@@ -37,8 +37,6 @@
                 version="2.0"
                 exclude-result-prefixes="#all">
 
-  <!-- ============================================================================= -->
-
   <xsl:template match="*" mode="RespParty">
 
     <xsl:for-each
diff --git a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/ogcwxs.html b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/ogcwxs.html
index 163f643e22b..3733535937e 100644
--- a/web-ui/src/main/resources/catalog/templates/admin/harvest/type/ogcwxs.html
+++ b/web-ui/src/main/resources/catalog/templates/admin/harvest/type/ogcwxs.html
@@ -22,7 +22,7 @@
       <label id="gn-harvest-settings-ogc-basic-type-label" class="control-label" data-translate="">serviceType</label>
       <select id="gn-harvest-settings-ogc-basic-type-list" class="form-control" data-ng-model="harvesterSelected.site.ogctype">
         <option
-          data-ng-repeat="t in ['WMS1.0.0', 'WMS1.1.1', 'WMS1.3.0', '-', 'WFS1.0.0', 'WFS1.1.0', '-', 'WCS1.0.0', '-', 'CSW2.0.2', '-', 'WPS0.4.0', 'WPS1.0.0', 'WPS2.0.0','-', 'SOS1.0.0'] track by $index"
+          data-ng-repeat="t in ['WMS1.0.0', 'WMS1.1.1', 'WMS1.3.0', '-', 'WMTS1.1.0', '-', 'WFS1.0.0', 'WFS1.1.0', '-', 'WCS1.0.0', '-', 'CSW2.0.2', '-', 'WPS0.4.0', 'WPS1.0.0', 'WPS2.0.0','-', 'SOS1.0.0'] track by $index"
           value="{{t}}"
           data-ng-selected="t == harvesterSelected.site.ogctype">
           {{t | translate}}
@@ -40,7 +40,8 @@
     <div id="gn-harvest-settings-ogc-advanced-remote-row" data-gn-harvester-account="harvesterSelected"/>
 
     <!-- Service metadata record -->
-    <div id="gn-harvest-settings-ogc-advanced-template-row">
+    <div id="gn-harvest-settings-ogc-advanced-template-row"
+         data-ng-show="harvesterSelected.site.ogctype.match('^(WMS|WFS|WCS|CSW|SOS|WPS)') != null">
       <label id="gn-harvest-settings-ogc-advanced-template-label" class="control-label">
         <span data-translate="">ogcwxs-serviceTemplateUuid</span>
       </label>
@@ -61,7 +62,7 @@
       <label class="control-label">
         <input id="gn-harvest-settings-ogc-advanced-record-checkbox"
                type="checkbox"
-               data-ng-disabled="harvesterSelected.site.ogctype.match('^(WMS|WFS|WCS|SOS|WPS2)') == null"
+               data-ng-disabled="harvesterSelected.site.ogctype.match('^(WMS|WMTS|WFS|WCS|SOS|WPS2)') == null"
                data-ng-model="harvesterSelected.options.useLayer"/>
         <span id="gn-harvest-settings-ogc-advanced-record-label" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}">ogcwxs-createMetadataForEachLayer</span>
       </label>
@@ -72,7 +73,8 @@
     <div id="gn-harvest-settings-ogc-advanced-records-row"
          class="well"
          data-ng-show="harvesterSelected.options.useLayer">
-      <div id="gn-harvest-settings-ogc-advanced-records-imports-row">
+      <div id="gn-harvest-settings-ogc-advanced-records-imports-row"
+           data-ng-hide="harvesterSelected.site.ogctype.indexOf('WMTS') === 0">
         <label class="control-label">
           <input id="gn-harvest-settings-ogc-advanced-records-imports-checkbox" type="checkbox" data-ng-model="harvesterSelected.options.useLayerMd"/>
           <span id="gn-harvest-settings-ogc-advanced-records-imports-label" data-translate="" translate-values="{metadataTemplateType: metadataTemplateType}">ogcwxs-createMetadataForEachLayerUsingMetadataURL</span>
@@ -81,12 +83,12 @@
         >ogcwxs-createMetadataForEachLayerUsingMetadataURLHelp</p>
       </div>
 
-      <div id="gn-harvest-settings-ogc-advanced-records-template-row">
+      <div id="gn-harvest-settings-ogc-advanced-records-template-row"
+           data-ng-show="harvesterSelected.site.ogctype.match('^(WMS|WFS|WCS|SOS|WPS)') != null">
         <label id="gn-harvest-settings-ogc-advanced-records-template-label" class="control-label">
           <span data-translate="">ogcwxs-datasetTemplateUuid</span>
         </label>
         <select id="gn-harvest-settings-ogc-advanced-records-template-list"
-                data-ng-show="harvesterSelected.site.ogctype.match('^(WMS|WFS|WCS|SOS|WPS)') != null"
                 class="form-control"
                 data-ng-model="harvesterSelected.options.datasetTemplateUuid"
                 data-ng-options="t['geonet:info'].uuid as t.getTitle() for t in ogcwxsDatasetTemplates">
@@ -103,7 +105,8 @@
         <p class="help-block" data-translate="">ogcwxs-datasetTemplateUuidHelp</p>
       </div>
 
-      <div id="gn-harvest-settings-ogc-advanced-records-thumbnail-row">
+      <div id="gn-harvest-settings-ogc-advanced-records-thumbnail-row"
+           data-ng-hide="harvesterSelected.site.ogctype.indexOf('WMS') !== 0">
         <label class="control-label">
           <input id="gn-harvest-settings-ogc-advanced-records-thumbnail-checkbox"
                  type="checkbox"