diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties
index 4604afe0b2..e6a71751dc 100644
--- a/mir-module/src/main/resources/config/mir/mycore.properties
+++ b/mir-module/src/main/resources/config/mir/mycore.properties
@@ -122,9 +122,7 @@ MCR.RestApi.Draft.MCRAccessKey2=true
 # Configure DFGViewer                                                        #
 ##############################################################################
 MIR.DFGViewer.enable=false
-MCR.ContentTransformer.mets-dfg.Class=org.mycore.common.content.transformer.MCRXSLTransformer
-MCR.ContentTransformer.mets-dfg.TransformerFactoryClass=%XALAN%
-MCR.ContentTransformer.mets-dfg.Stylesheet=xsl/mets/mets-dfg.xsl
+MCR.ContentTransformer.mets-dfg.Stylesheet=xslt/mets/mets-dfg.xsl
 
 # add if DFGViewer is enabled (MIR.DFGViewer.enable=true)
 # MIR.DFGViewer.DV.Owner=
diff --git a/mir-module/src/main/resources/xsl/mets/mets-dfg.xsl b/mir-module/src/main/resources/xsl/mets/mets-dfg.xsl
deleted file mode 100644
index 7113ed5b54..0000000000
--- a/mir-module/src/main/resources/xsl/mets/mets-dfg.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:param name="ServletsBaseURL" />
-  <xsl:param name="ThumbnailBaseURL" select="concat($ServletsBaseURL,'MCRDFGThumbnail/')" />
-  <xsl:param name="ImageBaseURL" select="concat($ServletsBaseURL,'MCRDFGServlet/')"/>
-  <xsl:param name="copyFileGrp" select="emptyNodeList" />
-  <xsl:include href="resource:xsl/mets/mets-dfgProfile.xsl" />
-</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/mets/mets-amd.xsl b/mir-module/src/main/resources/xslt/mets/mets-amd.xsl
similarity index 68%
rename from mir-module/src/main/resources/xsl/mets/mets-amd.xsl
rename to mir-module/src/main/resources/xslt/mets/mets-amd.xsl
index a2e00dcf60..6c681aff72 100644
--- a/mir-module/src/main/resources/xsl/mets/mets-amd.xsl
+++ b/mir-module/src/main/resources/xslt/mets/mets-amd.xsl
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-  xmlns:mcrxml="xalan://org.mycore.common.xml.MCRXMLFunctions"
+<xsl:stylesheet version="3.0"
+  xmlns:mcrclassification="http://www.mycore.de/xslt/classification"
   xmlns:mets="http://www.loc.gov/METS/"
   xmlns:mods="http://www.loc.gov/mods/v3"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:xalan="http://xml.apache.org/xalan"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="mcrxml xalan">
+  exclude-result-prefixes="#all">
 
-  <xsl:param name="WebApplicationBaseURL" />
-  <xsl:param name="objectID" />
   <xsl:param name="license" select="'CC-BY-NC-SA'" />
   <xsl:param name="MIR.DFGViewer.DV.Owner" select="''" />
   <xsl:param name="MIR.DFGViewer.DV.OwnerLogo" select="''" />
@@ -33,12 +31,11 @@
 
     <xsl:variable name="derivateOwnerId">
       <xsl:choose>
-        <!-- it is derivate -->
         <xsl:when test="$derobject">
-          <xsl:value-of select="mcrxml:getMCRObjectID($derobject)" />
+          <xsl:value-of
+            select="(document(concat('mcrobject:', $derobject))/mycorederivate/derivate/linkmetas/linkmeta/@xlink:href, $objectID)[1]" />
         </xsl:when>
         <xsl:otherwise>
-          <!--it is a regular mcrobj -->
           <xsl:value-of select="$mcrobject" />
         </xsl:otherwise>
       </xsl:choose>
@@ -53,17 +50,17 @@
         <mets:mdWrap MIMETYPE="text/xml" MDTYPE="OTHER" OTHERMDTYPE="DVRIGHTS">
           <mets:xmlData>
             <dv:rights xmlns:dv="http://dfg-viewer.de/">
-              <!-- owner name -->
               <dv:owner><xsl:value-of select="$MIR.DFGViewer.DV.Owner" /></dv:owner>
               <dv:ownerLogo><xsl:value-of select="$MIR.DFGViewer.DV.OwnerLogo" /></dv:ownerLogo>
               <dv:ownerSiteURL><xsl:value-of select="$MIR.DFGViewer.DV.OwnerSiteURL" /></dv:ownerSiteURL>
-              <dv:ownerContact/>
+              <dv:ownerContact />
               <dv:license>
                 <xsl:choose>
                   <xsl:when test="$entity/mycoreobject/metadata/def.modsContainer/modsContainer/mods:mods/mods:accessCondition[@type='use and reproduction']">
-                    <xsl:variable name="licenseClass" select="'mir_licenses'" />
-                    <xsl:variable name="licenseId" select="substring-after($entity/mycoreobject/metadata/def.modsContainer/modsContainer/mods:mods/mods:accessCondition[@type='use and reproduction']/@xlink-href, '#')" />
-                    <xsl:value-of select="mcrxml:getDisplayName($licenseClass, $licenseId)" />
+                    <xsl:variable name="licenseId"
+                      select="substring-after($entity/mycoreobject/metadata/def.modsContainer/modsContainer/mods:mods/mods:accessCondition[@type='use and reproduction']/@xlink:href, '#')" />
+                    <xsl:value-of
+                      select="mcrclassification:current-label-text(mcrclassification:category('mir_licenses', $licenseId))" />
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:value-of select="$license" />
@@ -74,31 +71,28 @@
           </mets:xmlData>
         </mets:mdWrap>
       </mets:rightsMD>
-      <mets:digiprovMD>
-        <xsl:attribute name="ID">
-            <xsl:value-of select="concat('digiprovMD',$sectionID)" />
-          </xsl:attribute>
+      <mets:digiprovMD ID="{concat('digiprovMD', $sectionID)}">
         <mets:mdWrap MIMETYPE="text/xml" MDTYPE="OTHER" OTHERMDTYPE="DVLINKS">
           <mets:xmlData>
             <dv:links xmlns:dv="http://dfg-viewer.de/">
               <xsl:variable name="ppn"
-                            select="substring-after($entity/mycoreobject/metadata/def.modsContainer/modsContainer/mods:mods/mods:identifier[@type='uri'], ':ppn:')" />
+                select="substring-after($entity/mycoreobject/metadata/def.modsContainer/modsContainer/mods:mods/mods:identifier[@type='uri'], ':ppn:')" />
               <xsl:if test="$ppn">
                 <dv:reference>
                   <xsl:variable name="catalogURL"
-                                select="concat(substring-before($MIR.DFGViewer.DV.OPAC.CATALOG.URL, '{PPN}'), $ppn , substring-after($MIR.DFGViewer.DV.OPAC.CATALOG.URL, '{PPN}'))" />
+                    select="concat(substring-before($MIR.DFGViewer.DV.OPAC.CATALOG.URL, '{PPN}'), $ppn, substring-after($MIR.DFGViewer.DV.OPAC.CATALOG.URL, '{PPN}'))" />
                   <xsl:variable name="uriResolved"
-                                select="document(concat($catalogURL,'?format=xml'))//rdf:Description[@rdf:about=normalize-space($catalogURL)]/*[local-name() = 'page']/@rdf:resource" />
+                    select="document(concat($catalogURL, '?format=xml'))//rdf:Description[@rdf:about=normalize-space($catalogURL)]/*[local-name()='page']/@rdf:resource" />
                   <xsl:value-of select="$uriResolved" />
                 </dv:reference>
               </xsl:if>
               <dv:presentation>
                 <xsl:choose>
                   <xsl:when test="$mcrobject">
-                    <xsl:value-of select="concat($WebApplicationBaseURL,'receive/',$mcrobject)" />
+                    <xsl:value-of select="concat($WebApplicationBaseURL, 'receive/', $mcrobject)" />
                   </xsl:when>
                   <xsl:when test="$derobject">
-                    <xsl:value-of select="concat($WebApplicationBaseURL,'receive/',mcrxml:getMCRObjectID($derobject))" />
+                    <xsl:value-of select="concat($WebApplicationBaseURL, 'receive/', $derivateOwnerId)" />
                   </xsl:when>
                 </xsl:choose>
               </dv:presentation>
diff --git a/mir-module/src/main/resources/xslt/mets/mets-dfg.xsl b/mir-module/src/main/resources/xslt/mets/mets-dfg.xsl
new file mode 100644
index 0000000000..a7c90726c3
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/mets/mets-dfg.xsl
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:mets="http://www.loc.gov/METS/"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:output method="xml" encoding="utf-8" />
+
+  <xsl:include href="resource:xslt/default-parameters.xsl" />
+  <xsl:include href="xslInclude:functions" />
+
+  <xsl:param name="MCR.Module-iview2.SupportedContentTypes" />
+  <xsl:param name="objectID" />
+  <xsl:param name="derivateID" select="substring-after(/mets:mets/mets:dmdSec/@ID, '_')" />
+  <xsl:param name="MCR.Viewer.PDFCreatorURI" />
+
+  <xsl:param name="ThumbnailBaseURL" select="concat($ServletsBaseURL, 'MCRDFGThumbnail/')" />
+  <xsl:param name="ImageBaseURL" select="concat($ServletsBaseURL, 'MCRDFGServlet/')" />
+  <xsl:param name="WebApplicationServletsURL" select="concat($WebApplicationBaseURL, 'servlets/')" />
+  <xsl:param name="copyFileGrp" select="()" />
+
+  <xsl:include href="resource:xslt/mets/mets-dfgProfile.xsl" />
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/mets/mets-dfgProfile.xsl b/mir-module/src/main/resources/xslt/mets/mets-dfgProfile.xsl
similarity index 57%
rename from mir-module/src/main/resources/xsl/mets/mets-dfgProfile.xsl
rename to mir-module/src/main/resources/xslt/mets/mets-dfgProfile.xsl
index 9cfc727c16..45ed989642 100644
--- a/mir-module/src/main/resources/xsl/mets/mets-dfgProfile.xsl
+++ b/mir-module/src/main/resources/xslt/mets/mets-dfgProfile.xsl
@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
+<xsl:stylesheet version="3.0"
   xmlns:mets="http://www.loc.gov/METS/"
-  xmlns:xalan="http://xml.apache.org/xalan"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="">
+  exclude-result-prefixes="#all">
 
-  <xsl:include href="resource:xsl/mets/mets-iview.xsl" />
-  <xsl:include href="resource:xsl/mets/mets-amd.xsl" />
-  <xsl:include href="resource:xsl/mods-enhancer.xsl" />
+  <xsl:include href="resource:xslt/mets/mets-iview.xsl" />
+  <xsl:include href="resource:xslt/mets/mets-amd.xsl" />
+  <xsl:include href="resource:xslt/utils/mods-enhancer.xsl" />
 
-  <xsl:output method="xml" encoding="utf-8" />
-  <xsl:param name="MCR.Module-iview2.SupportedContentTypes" />
-  <xsl:param name="ServletsBaseURL" />
-  <xsl:param name="WebApplicationBaseURL" />
-  <xsl:param name="derivateID" />
-  <xsl:param name="objectID" />
-
-  <xsl:variable name="sourcedoc" select="document(concat('mcrobject:',$objectID))" />
+  <xsl:variable name="sourcedoc" select="document(concat('mcrobject:', $objectID))" />
 
   <xsl:template match="/mycoreobject" priority="0" mode="metsmeta" xmlns:mods="http://www.loc.gov/mods/v3">
-        <xsl:apply-templates mode="mods2mods" />
+    <xsl:apply-templates mode="mods2mods" />
   </xsl:template>
 
   <xsl:template match="mycoreobject" priority="0" mode="fallBackEntity">
@@ -57,15 +49,15 @@
     <mets:mets>
       <xsl:if test="not(mets:dmdSec)">
         <xsl:variable name="emptyDMDSec">
-          <mets:dmdSec ID="dmd_{$derivateID}"/>
+          <mets:dmdSec ID="dmd_{$derivateID}" />
         </xsl:variable>
-        <xsl:apply-templates select="xalan:nodeset($emptyDMDSec)" />
+        <xsl:apply-templates select="$emptyDMDSec/mets:dmdSec" />
       </xsl:if>
       <xsl:if test="not(mets:amdSec)">
-        <xsl:variable name="emptryAMDSec">
+        <xsl:variable name="emptyAMDSec">
           <mets:amdSec />
         </xsl:variable>
-        <xsl:apply-templates select="xalan:nodeset($emptryAMDSec)" />
+        <xsl:apply-templates select="$emptyAMDSec/mets:amdSec" />
       </xsl:if>
       <xsl:apply-templates />
     </mets:mets>
@@ -75,20 +67,20 @@
     <mets:dmdSec ID="dmd_{$derivateID}">
       <mets:mdWrap MDTYPE="MODS">
         <mets:xmlData>
-            <xsl:apply-templates mode="metsmeta" select="$sourcedoc/mycoreobject" />
-            <!-- TODO: add configurable template
-            <mods:extension>
-              <mir:entities xmlns:mir="http://www.mycore.de/mir/ns/mods-entities">
-                <mir:entity type="operator" xlink:type="extended"
-                              xlink:title="xxx">
-                  <mir:site xlink:type="locator" xlink:href="#" />
-                  <mir:logo xlink:type="resource" xlink:href="{$logoBaseUrl}xxx.svg" />
-                  <mir:full-logo xlink:type="resource" xlink:href="{$logoBaseUrl}xxx.svg" />
-                </mir:entity>
-                <xsl:apply-templates mode="entities" select="$sourcedoc/mycoreobject" />
-              </mir:entities>
-            </mods:extension>
-            -->
+          <xsl:apply-templates mode="metsmeta" select="$sourcedoc/mycoreobject" />
+          <!-- TODO: add configurable template
+          <mods:extension>
+            <mir:entities xmlns:mir="http://www.mycore.de/mir/ns/mods-entities">
+              <mir:entity type="operator" xlink:type="extended"
+                            xlink:title="xxx">
+                <mir:site xlink:type="locator" xlink:href="#" />
+                <mir:logo xlink:type="resource" xlink:href="{$logoBaseUrl}xxx.svg" />
+                <mir:full-logo xlink:type="resource" xlink:href="{$logoBaseUrl}xxx.svg" />
+              </mir:entity>
+              <xsl:apply-templates mode="entities" select="$sourcedoc/mycoreobject" />
+            </mir:entities>
+          </mods:extension>
+          -->
         </mets:xmlData>
       </mets:mdWrap>
     </mets:dmdSec>
diff --git a/mir-module/src/main/resources/xsl/mets/mets-iview.xsl b/mir-module/src/main/resources/xslt/mets/mets-iview.xsl
similarity index 60%
rename from mir-module/src/main/resources/xsl/mets/mets-iview.xsl
rename to mir-module/src/main/resources/xslt/mets/mets-iview.xsl
index e817c61d0f..cab5823740 100644
--- a/mir-module/src/main/resources/xsl/mets/mets-iview.xsl
+++ b/mir-module/src/main/resources/xslt/mets/mets-iview.xsl
@@ -1,40 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-  xmlns:encoder="xalan://java.net.URLEncoder"
+<xsl:stylesheet version="3.0"
   xmlns:mets="http://www.loc.gov/METS/"
-  xmlns:xalan="http://xml.apache.org/xalan"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="encoder">
-
-  <xsl:output method="xml" encoding="utf-8" />
-  <xsl:param name="MCR.Module-iview2.SupportedContentTypes" />
-  <xsl:param name="WebApplicationBaseURL" />
-  <xsl:param name="WebApplicationServletsURL" select="concat($WebApplicationBaseURL, 'servlets/')" />
-  <xsl:param name="derivateID" select="substring-after(/mets:mets/mets:dmdSec/@ID,'_')" />
-  <xsl:param name="MCR.Viewer.PDFCreatorURI" />
+  exclude-result-prefixes="#all">
 
   <xsl:key name="logDiv" match="mets:div" use="@ID" />
 
-  <xsl:param name="objectID" />
-  <!-- this is where the master file group is located (files that are referenced by a relative URL) -->
   <xsl:variable name="masterFileGrp"
     select="/mets:mets/mets:fileSec/mets:fileGrp[
       @USE='MASTER' and
       mets:file/mets:FLocat/@LOCTYPE='URL' and
-      not(
-        contains(mets:file/mets:FLocat/@xlink:href , '://')
-      )
+      not(mets:file/mets:FLocat[contains(@xlink:href, '://')])
     ]" />
 
-  <!-- - - - - - - - - Identity Transformation - - - - - - - - - -->
-  <xsl:template match='@*|node()'>
+  <xsl:template match="@* | node()">
     <xsl:copy>
-      <xsl:apply-templates select='@*|node()' />
+      <xsl:apply-templates select="@* | node()" />
     </xsl:copy>
   </xsl:template>
 
-
   <xsl:template match="mets:fileSec">
     <xsl:copy>
       <xsl:copy-of select="@*" />
@@ -51,7 +36,6 @@
       <xsl:call-template name="generateIViewURLS">
         <xsl:with-param name="use" select="'IDENTIFIERS'" />
       </xsl:call-template>
-      <!-- only use download when pdf creator is set -->
       <xsl:if test="$MCR.Viewer.PDFCreatorURI">
         <xsl:call-template name="generateIViewURLS">
           <xsl:with-param name="use" select="'DOWNLOAD'" />
@@ -59,26 +43,23 @@
       </xsl:if>
       <xsl:apply-templates mode="replaceURL" select="$copyFileGrp" />
     </xsl:copy>
-
   </xsl:template>
 
-  <!-- Copy the Groups, but replace URL with absolute -->
-  <xsl:template match="@*|node()" mode="replaceURL">
+  <xsl:template match="@* | node()" mode="replaceURL">
     <xsl:copy>
-      <xsl:apply-templates select="@*|node()" mode="replaceURL" />
+      <xsl:apply-templates select="@* | node()" mode="replaceURL" />
     </xsl:copy>
   </xsl:template>
 
   <xsl:template match="mets:FLocat[@LOCTYPE='URL']" mode="replaceURL">
-    <xsl:variable name="absoluteLocation">
-      <xsl:value-of select="concat($WebApplicationServletsURL, 'MCRDerivateContentTransformerServlet/', $derivateID, '/', @xlink:href)" />
-    </xsl:variable>
+    <xsl:variable name="absoluteLocation"
+      select="concat($WebApplicationServletsURL, 'MCRDerivateContentTransformerServlet/', $derivateID, '/', @xlink:href)" />
     <mets:FLocat LOCTYPE="URL" xlink:href="{$absoluteLocation}" />
   </xsl:template>
 
   <xsl:template match="mets:smLink">
     <xsl:copy>
-      <xsl:apply-templates select="@*|node()" />
+      <xsl:apply-templates select="@* | node()" />
     </xsl:copy>
     <xsl:call-template name="traverseSmLink">
       <xsl:with-param name="from" select="@xlink:from" />
@@ -99,19 +80,18 @@
     </xsl:if>
   </xsl:template>
 
-
   <xsl:template name="generateIViewURLS">
     <xsl:param name="use" />
     <xsl:param name="zoom" select="''" />
     <xsl:comment>
-      <xsl:value-of select="concat('Start - generateIViewURLS - USE=',$use)" />
+      <xsl:value-of select="concat('Start - generateIViewURLS - USE=', $use)" />
     </xsl:comment>
     <mets:fileGrp USE="{$use}">
       <xsl:for-each select="$masterFileGrp/mets:file">
         <xsl:variable name="ncName">
           <xsl:choose>
-            <xsl:when test="contains(@ID,'_')">
-              <xsl:value-of select="substring-after(@ID,'_')" />
+            <xsl:when test="contains(@ID, '_')">
+              <xsl:value-of select="substring-after(@ID, '_')" />
             </xsl:when>
             <xsl:otherwise>
               <xsl:value-of select="@ID" />
@@ -119,51 +99,50 @@
           </xsl:choose>
         </xsl:variable>
         <xsl:choose>
-          <xsl:when test="$use='THUMBS'">
-            <mets:file ID="{concat($use,'_',$ncName)}" MIMETYPE="image/png">
-              <mets:FLocat LOCTYPE="URL" xlink:href="{concat($ThumbnailBaseURL,$derivateID,'/',mets:FLocat/@xlink:href)}" />
+          <xsl:when test="$use = 'THUMBS'">
+            <mets:file ID="{concat($use, '_', $ncName)}" MIMETYPE="image/png">
+              <mets:FLocat LOCTYPE="URL" xlink:href="{concat($ThumbnailBaseURL, $derivateID, '/', mets:FLocat/@xlink:href)}" />
             </mets:file>
           </xsl:when>
-          <xsl:when test="$use='VIEWER'">
-            <mets:file ID="{concat($use,'_',$ncName)}" MIMETYPE="text/html">
+          <xsl:when test="$use = 'VIEWER'">
+            <mets:file ID="{concat($use, '_', $ncName)}" MIMETYPE="text/html">
               <mets:FLocat LOCTYPE="URL" xlink:href="{concat($WebApplicationBaseURL, 'rsc/viewer/', $derivateID, '/', mets:FLocat/@xlink:href)}" />
             </mets:file>
           </xsl:when>
-          <xsl:when test="$use='IDENTIFIERS'">
-            <mets:file ID="{concat($use,'_',$ncName)}" MIMETYPE="text/html">
+          <xsl:when test="$use = 'IDENTIFIERS'">
+            <mets:file ID="{concat($use, '_', $ncName)}" MIMETYPE="text/html">
               <mets:FLocat LOCTYPE="OTHER" xlink:href="{concat($derivateID, '/', mets:FLocat/@xlink:href)}" />
             </mets:file>
           </xsl:when>
-          <xsl:when test="$use='DOWNLOAD' and $MCR.Viewer.PDFCreatorURI">
-            <mets:file ID="{concat($use,'_',$ncName)}" MIMETYPE="application/pdf">
+          <xsl:when test="$use = 'DOWNLOAD' and $MCR.Viewer.PDFCreatorURI">
+            <mets:file ID="{concat($use, '_', $ncName)}" MIMETYPE="application/pdf">
               <mets:FLocat LOCTYPE="URL"
-                xlink:href="{concat($MCR.Viewer.PDFCreatorURI, '?mets=', encoder:encode(concat($WebApplicationServletsURL, 'MCRMETSServlet', '/',$derivateID, '/mets.xml?XSL.Style=pdf'), 'UTF-8'), '&amp;pages=', position())}" />
+                xlink:href="{concat($MCR.Viewer.PDFCreatorURI, '?mets=', encode-for-uri(concat($WebApplicationServletsURL, 'MCRMETSServlet/', $derivateID, '/mets.xml?XSL.Style=pdf')), '&amp;pages=', position())}" />
             </mets:file>
           </xsl:when>
           <xsl:otherwise>
-            <mets:file ID="{concat($use,'_',$ncName)}" MIMETYPE="image/jpeg">
-              <mets:FLocat LOCTYPE="URL" xlink:href="{concat($ImageBaseURL,$zoom,'/',$derivateID,'/',mets:FLocat/@xlink:href)}" />
+            <mets:file ID="{concat($use, '_', $ncName)}" MIMETYPE="image/jpeg">
+              <mets:FLocat LOCTYPE="URL" xlink:href="{concat($ImageBaseURL, $zoom, '/', $derivateID, '/', mets:FLocat/@xlink:href)}" />
             </mets:file>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:for-each>
     </mets:fileGrp>
     <xsl:comment>
-      <xsl:value-of select="concat('End - generateIViewURLS - USE=',$use)" />
+      <xsl:value-of select="concat('End - generateIViewURLS - USE=', $use)" />
     </xsl:comment>
   </xsl:template>
 
-  <xsl:template match="mets:div[$masterFileGrp/mets:file/@ID=mets:fptr/@FILEID]">
+  <xsl:template match="mets:div[$masterFileGrp/mets:file/@ID = mets:fptr/@FILEID]">
     <xsl:copy>
       <xsl:copy-of select="@*" />
       <xsl:attribute name="ORDER">
-        <xsl:value-of select="count(preceding-sibling::mets:div)+1" />
+        <xsl:value-of select="count(preceding-sibling::mets:div) + 1" />
       </xsl:attribute>
 
-      <xsl:variable name="fileID" select="mets:fptr[$masterFileGrp/mets:file/@ID=@FILEID]/@FILEID" />
-      <xsl:variable name="file" select="$masterFileGrp/mets:file[@ID=$fileID]/mets:FLocat/@xlink:href" />
+      <xsl:variable name="fileID" select="mets:fptr[$masterFileGrp/mets:file/@ID = @FILEID]/@FILEID" />
+      <xsl:variable name="file" select="$masterFileGrp/mets:file[@ID = $fileID]/mets:FLocat/@xlink:href" />
       <xsl:variable name="filePath">
-        <!-- remove leading "./" from relative URL if present -->
         <xsl:choose>
           <xsl:when test="substring($file, 1, 2) = './'">
             <xsl:value-of select="substring($file, 3)" />
@@ -175,27 +154,25 @@
       </xsl:variable>
       <xsl:variable name="ncName">
         <xsl:choose>
-          <xsl:when test="contains($fileID,'_')">
-            <xsl:value-of select="substring-after($fileID,'_')" />
+          <xsl:when test="contains($fileID, '_')">
+            <xsl:value-of select="substring-after($fileID, '_')" />
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="$fileID" />
           </xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
-      <mets:fptr FILEID="{concat('DEFAULT_',$ncName)}" />
-      <mets:fptr FILEID="{concat('THUMBS_',$ncName)}" />
-
-      <mets:fptr FILEID="{concat('VIEWER_',$ncName)}" />
-      <mets:fptr FILEID="{concat('IDENTIFIERS_',$ncName)}" />
+      <mets:fptr FILEID="{concat('DEFAULT_', $ncName)}" />
+      <mets:fptr FILEID="{concat('THUMBS_', $ncName)}" />
+      <mets:fptr FILEID="{concat('VIEWER_', $ncName)}" />
+      <mets:fptr FILEID="{concat('IDENTIFIERS_', $ncName)}" />
 
       <xsl:if test="$MCR.Viewer.PDFCreatorURI">
-        <mets:fptr FILEID="{concat('DOWNLOAD_',$ncName)}" />
+        <mets:fptr FILEID="{concat('DOWNLOAD_', $ncName)}" />
       </xsl:if>
 
-      <xsl:if test="mets:fptr[$copyFileGrp/mets:file/@ID=@FILEID]">
-        <!-- Copy fptr that have match in copyFileGrp -->
-        <xsl:copy-of select="mets:fptr[$copyFileGrp/mets:file/@ID=@FILEID]" />
+      <xsl:if test="mets:fptr[$copyFileGrp/mets:file/@ID = @FILEID]">
+        <xsl:copy-of select="mets:fptr[$copyFileGrp/mets:file/@ID = @FILEID]" />
       </xsl:if>
     </xsl:copy>
   </xsl:template>
@@ -203,12 +180,12 @@
   <xsl:template match="mets:structMap[@TYPE='LOGICAL']/mets:div">
     <xsl:copy>
       <xsl:attribute name="DMDID">
-        <xsl:value-of select="concat('dmd_', $derivateID)"/>
+        <xsl:value-of select="concat('dmd_', $derivateID)" />
       </xsl:attribute>
       <xsl:attribute name="ADMID">
-        <xsl:value-of select="concat('amd_', $derivateID)"/>
+        <xsl:value-of select="concat('amd_', $derivateID)" />
       </xsl:attribute>
-      <xsl:apply-templates select="@*|node()" />
+      <xsl:apply-templates select="@* | node()" />
     </xsl:copy>
   </xsl:template>