diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties
index 0bb0a7d48d..8867630b17 100644
--- a/mir-module/src/main/resources/config/mir/mycore.properties
+++ b/mir-module/src/main/resources/config/mir/mycore.properties
@@ -282,7 +282,7 @@ MCR.URIResolver.xslImports.solr-document=%MCR.URIResolver.xslImports.solr-docume
 MCR.URIResolver.xslIncludes.mods=%MCR.URIResolver.xslIncludes.mods%,resource:xsl/mods2mods-classmapping.xsl
 MCR.URIResolver.xslIncludes.mycoreobjectXML=%MCR.URIResolver.xslIncludes.mycoreobjectXML%,resource:xsl/embargofilter.xsl
 MCR.URIResolver.xslIncludes.RDF-mods-journal=%MCR.URIResolver.xslIncludes.RDF-mods-journal%,resource:xsl/RDF-mods-journal-mir.xsl
-MCR.URIResolver.xslIncludes.solrResponse=%MCR.URIResolver.xslIncludes.solrResponse%,resource:xsl/response-mir.xsl
+MCR.URIResolver.xslIncludes.solrResponse=%MCR.URIResolver.xslIncludes.solrResponse%,resource:xslt/response-mir.xsl
 MCR.URIResolver.xslIncludes.xeditorTemplates=%MCR.URIResolver.xslIncludes.xeditorTemplates%,resource:xslt/xeditor-mir-templates.xsl
 MCR.URIResolver.xslIncludes.functions=%MCR.URIResolver.xslIncludes.functions%,functions/mirdateconverter.xsl,functions/mireditorutils.xsl,functions/mirmapper.xsl,functions/mirstrutils.xsl,functions/mirvalidationhelper.xsl
 MIR.AVPlayer.Stylesheet=metadata/mir-video.js.xsl
@@ -295,12 +295,8 @@ MCR.ContentTransformer.mycoreobject-rights.TransformerFactoryClass=%XALAN%
 MCR.ContentTransformer.mycoreobject-rights.Stylesheet=xsl/metadata/mir-rights.xsl
 MCR.ContentTransformer.mycoreobject-modsmeta.TransformerFactoryClass=%XALAN%
 MCR.ContentTransformer.mycoreobject-modsmeta.Stylesheet=%MCR.ContentTransformer.mycoreobject-rights.Stylesheet%,xsl/metadata/mods-metadata.xsl
-MCR.ContentTransformer.response.Class=org.mycore.common.content.transformer.MCRTransformerPipe
-MCR.ContentTransformer.response.Steps=response-prepared,tmp_response,tmp_xsl_mir_flatmir_layout
-MCR.ContentTransformer.tmp_response.Stylesheet=xsl/response.xsl
-MCR.ContentTransformer.tmp_response.TransformerFactoryClass=%XALAN%
-MCR.ContentTransformer.response-mycoreobject.TransformerFactoryClass=%XALAN%
-MCR.ContentTransformer.response-mycoreobject.Stylesheet=xsl/response2mycoreobject.xsl
+MCR.ContentTransformer.response.Stylesheet=%MCR.ContentTransformer.response.Stylesheet%,%MCR.LayoutTransformerFactory.Default.Stylesheets%
+MCR.ContentTransformer.response-mycoreobject.Stylesheet=xslt/response2mycoreobject.xsl
 MCR.ContentTransformer.response-browse.Class=org.mycore.common.content.transformer.MCRTransformerPipe
 MCR.ContentTransformer.response-browse.Steps=response-mycoreobject,mycoreobject
 MCR.ContentTransformer.mods2xeditor.Stylesheet=xslt/editor/mods2xeditor.xsl
@@ -316,10 +312,8 @@ MCR.ContentTransformer.oai-oai_datacite.Stylesheet=xslt/mods2datacite.xsl
 MCR.URIResolver.xslIncludes.datacite=resource:xslt/mycoreobject-datacite-mir.xsl
 MCR.ContentTransformer.oai-oai_openaire.Stylesheet=xslt/mycoreobject-openaire.xsl
 
-MCR.ContentTransformer.response-subselect.TransformerFactoryClass=%XALAN%
-MCR.ContentTransformer.response-subselect.Stylesheet=%MCR.ContentTransformer.response-prepared.Stylesheet%,xsl/response.xsl,xsl/relatedItem-subselect.xsl,%MCR.LayoutTransformerFactory.Default.Stylesheets%
-MCR.ContentTransformer.response-resultlist.TransformerFactoryClass=%XALAN%
-MCR.ContentTransformer.response-resultlist.Stylesheet=%MCR.ContentTransformer.response-prepared.Stylesheet%,xsl/response-resultlist.xsl
+MCR.ContentTransformer.response-subselect.Stylesheet=%MCR.ContentTransformer.response-prepared.Stylesheet%,xslt/solr/response/response.xsl,xslt/relatedItem-subselect.xsl,%MCR.LayoutTransformerFactory.Default.Stylesheets%
+MCR.ContentTransformer.response-resultlist.Stylesheet=%MCR.ContentTransformer.response-prepared.Stylesheet%,xslt/response-resultlist.xsl
 
 MCR.Viewer.metadata.transformer = mycoreobject-viewer
 MCR.ContentTransformer.mycoreobject-viewer.TransformerFactoryClass=%XALAN%
@@ -799,5 +793,4 @@ MCR.ContentTransformer.svg-download.Stylesheet = xslt/generate-svg-by-type.xsl
 MCR.Startup.Class = %MCR.Startup.Class%,org.mycore.mir.migration.MIRMigrateStaticHistoryContent
 
 #Properties for XSLT 3 migration
-MCR.URIResolver.xslIncludes.solrResponse=resource:xsl/iview2-solrresponse.xsl,resource:xsl/response-mir.xsl
 MCR.URIResolver.xslIncludes.objectTypes=
diff --git a/mir-module/src/main/resources/xsl/relatedItem-subselect.xsl b/mir-module/src/main/resources/xsl/relatedItem-subselect.xsl
deleted file mode 100644
index 3881a362d6..0000000000
--- a/mir-module/src/main/resources/xsl/relatedItem-subselect.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-  xmlns:encoder="xalan://java.net.URLEncoder"
-  xmlns:xalan="http://xml.apache.org/xalan"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="encoder xalan xsl">
-
-  <xsl:include href="resource:xsl/coreFunctions.xsl" />
-  <xsl:include href="resource:xsl/copynodes.xsl" />
-  <xsl:param name="RequestURL" />
-
-  <!-- ========== XED Subselect detection ========== -->
-  <xsl:variable name="xedSession">
-    <xsl:call-template name="UrlGetParam">
-      <xsl:with-param name="url" select="$RequestURL" />
-      <xsl:with-param name="par" select="'_xed_subselect_session'" />
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:template match="li[a/@class='hit_option hit_edit']">
-    <xsl:variable name="objectID" select="substring-after(a/@href, 'id=')" />
-    <xsl:copy>
-      <xsl:apply-templates select='@*|node()' />
-    </xsl:copy>
-    <li>
-      <a title="" class="hit_option hit_to_basket dropdown-item">
-        <xsl:attribute name="href">
-          <xsl:value-of select="concat($ServletsBaseURL,'XEditor?_xed_submit_return= ')" />
-          <xsl:value-of select="concat('&amp;_xed_session=',encoder:encode($xedSession,'UTF-8'))" />
-          <xsl:value-of select="concat('&amp;@xlink:href=',encoder:encode($objectID,'UTF-8'))" />
-        </xsl:attribute>
-        <span class="fas fa-share-alt"/>übernehmen
-      </a>
-    </li>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-resultlist.xsl b/mir-module/src/main/resources/xsl/response-resultlist.xsl
deleted file mode 100644
index 0db89c647f..0000000000
--- a/mir-module/src/main/resources/xsl/response-resultlist.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="xsl">
-
-  <xsl:output method="html" encoding="UTF-8" omit-xml-declaration="yes" />
-  <xsl:param name="WebApplicationBaseURL" />
-  <xsl:param name="ServletsBaseURL" />
-  <xsl:include href="resource:xsl/response-utils.xsl" />
-  <xsl:include href="resource:xsl/response-mir.xsl" />
-  <xsl:include href="resource:xsl/layout-utils.xsl" />
-  <xsl:variable name="PageTitle">
-    <xsl:value-of select="''" />
-  </xsl:variable>
-
-  <xsl:key name="derivate" match="response/response[@subresult='derivate']/result/doc" use="str[@name='returnId']" />
-
-  <xsl:template match="/">
-    <xsl:for-each select="//response[@subresult='groupOwner']/result/doc">
-      <xsl:apply-templates select="." mode="resultList">
-        <xsl:with-param name="hitNumberOnPage" select="position()" />
-      </xsl:apply-templates>
-    </xsl:for-each>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/badges/mir-badges-base.xsl b/mir-module/src/main/resources/xslt/badges/mir-badges-base.xsl
new file mode 100644
index 0000000000..2c00b843c3
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/badges/mir-badges-base.xsl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:import href="xslImport:badges:badges/mir-badges-base.xsl"/>
+
+  <xsl:template match="doc" mode="badge"/>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/badges/mir-badges-date.xsl b/mir-module/src/main/resources/xslt/badges/mir-badges-date.xsl
new file mode 100644
index 0000000000..d0c8a36636
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/badges/mir-badges-date.xsl
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:mirdateconverter="http://www.mycore.de/xslt/mirdateconverter"
+  xmlns:mods="http://www.loc.gov/mods/v3"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:import href="xslImport:badges:badges/mir-badges-date.xsl"/>
+  <xsl:include href="resource:xslt/badges/mir-badges-utils.xsl"/>
+
+  <xsl:template match="doc" mode="badge">
+    <xsl:apply-imports/>
+
+    <xsl:choose>
+      <xsl:when test="str[@name='mods.dateIssued'] or str[@name='mods.dateIssued.host']">
+        <xsl:call-template name="output-date-badge">
+          <xsl:with-param name="date" select="str[@name='mods.dateIssued'] | str[@name='mods.dateIssued.host']"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="field[@name='mods.dateIssued'] or field[@name='mods.dateIssued.host']">
+        <xsl:call-template name="output-date-badge">
+          <xsl:with-param name="date" select="field[@name='mods.dateIssued'] | field[@name='mods.dateIssued.host']"/>
+        </xsl:call-template>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="output-date-badge">
+    <xsl:param name="date"/>
+    <xsl:variable name="label">
+      <xsl:call-template name="format-date-label">
+        <xsl:with-param name="date" select="string(($date)[1])"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:call-template name="output-badge">
+      <xsl:with-param name="class" select="'mir-badge-date'"/>
+      <xsl:with-param name="label" select="$label"/>
+      <xsl:with-param name="link" select="concat($ServletsBaseURL, 'solr/find?condQuery=*&amp;fq=mods.dateIssued:%22', string(($date)[1]), '%22')"/>
+      <xsl:with-param name="tooltip" select="document('i18n:mir.date.published')/i18n/text()"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="format-date-label">
+    <xsl:param name="date" as="xs:string?"/>
+    <xsl:variable name="normalized" select="mirdateconverter:convert-date($date, 'ISO8601')"/>
+
+    <xsl:choose>
+      <xsl:when test="matches($normalized, '^\d{4}$')">
+        <xsl:value-of select="$normalized"/>
+      </xsl:when>
+      <xsl:when test="matches($normalized, '^\d{4}-\d{2}$')">
+        <xsl:value-of select="$normalized"/>
+      </xsl:when>
+      <xsl:when test="matches($normalized, '^\d{4}-\d{2}-\d{2}$')">
+        <xsl:value-of select="format-date(xs:date($normalized), '[Y0001]-[M01]-[D01]')"/>
+      </xsl:when>
+      <xsl:when test="$normalized castable as xs:dateTime">
+        <xsl:value-of select="format-dateTime(xs:dateTime($normalized), '[Y0001]-[M01]-[D01] [H01]:[m01]')"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$normalized"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/badges/mir-badges-genre.xsl b/mir-module/src/main/resources/xslt/badges/mir-badges-genre.xsl
new file mode 100644
index 0000000000..69127729e8
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/badges/mir-badges-genre.xsl
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:mcrclassification="http://www.mycore.de/xslt/classification"
+  xmlns:mods="http://www.loc.gov/mods/v3"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:import href="xslImport:badges:badges/mir-badges-genre.xsl"/>
+  <xsl:include href="resource:xslt/badges/mir-badges-utils.xsl"/>
+
+  <xsl:template match="doc" mode="badge">
+    <xsl:apply-imports/>
+
+    <xsl:choose>
+      <xsl:when test="arr[@name='mods.genre']">
+        <xsl:for-each select="arr[@name='mods.genre']/str">
+          <xsl:call-template name="output-genre-badge">
+            <xsl:with-param name="genre" select="."/>
+          </xsl:call-template>
+        </xsl:for-each>
+      </xsl:when>
+      <xsl:when test="field[@name='mods.genre']">
+        <xsl:for-each select="field[@name='mods.genre']">
+          <xsl:call-template name="output-genre-badge">
+            <xsl:with-param name="genre" select="."/>
+          </xsl:call-template>
+        </xsl:for-each>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="output-genre-badge">
+          <xsl:with-param name="genre" select="'article'"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="output-genre-badge">
+    <xsl:param name="genre"/>
+    <xsl:call-template name="output-badge">
+      <xsl:with-param name="class" select="concat('mir-badge-genre-', $genre)"/>
+      <xsl:with-param name="label" select="mcrclassification:current-label-text(mcrclassification:category('mir_genres', $genre))"/>
+      <xsl:with-param name="link"  select="concat($ServletsBaseURL, 'solr/find?condQuery=*&amp;fq=category.top:%22mir_genres:', $genre, '%22')"/>
+      <xsl:with-param name="tooltip" select="substring-before(document('i18n:component.mods.genre')/i18n/text(), ':')"/>
+    </xsl:call-template>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/badges/mir-badges-license.xsl b/mir-module/src/main/resources/xslt/badges/mir-badges-license.xsl
new file mode 100644
index 0000000000..2dcde554e2
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/badges/mir-badges-license.xsl
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:mcrclassification="http://www.mycore.de/xslt/classification"
+  xmlns:mods="http://www.loc.gov/mods/v3"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:import href="xslImport:badges:badges/mir-badges-license.xsl"/>
+  <xsl:include href="resource:xslt/badges/mir-badges-utils.xsl"/>
+
+  <xsl:template match="doc" mode="badge">
+    <xsl:apply-imports/>
+
+    <xsl:choose>
+      <xsl:when test="arr[@name='category.top']/str[contains(text(), 'mir_licenses:')]">
+        <xsl:call-template name="output-license-badge">
+          <xsl:with-param name="accessConditionClass" select="arr[@name='category.top']/str[contains(text(), 'mir_licenses:')][last()]"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:when test="field[@name='category.top'][starts-with(., 'mir_licenses:')]">
+        <xsl:call-template name="output-license-badge">
+          <xsl:with-param name="accessConditionClass" select="field[@name='category.top'][starts-with(., 'mir_licenses:')][last()]"/>
+        </xsl:call-template>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="output-license-badge">
+    <xsl:param name="accessConditionClass"/>
+    <xsl:variable name="accessCondition" select="substring-after($accessConditionClass, ':')"/>
+    <xsl:variable name="label">
+      <xsl:choose>
+        <xsl:when test="contains($accessCondition, 'rights_reserved')">
+          <xsl:value-of select="document('i18n:component.mods.metaData.dictionary.rightsReserved')/i18n/text()"/>
+        </xsl:when>
+        <xsl:when test="contains($accessCondition, 'oa_nlz')">
+          <xsl:value-of select="document('i18n:component.mods.metaData.dictionary.oa_nlz.short')/i18n/text()"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="mcrclassification:current-label-text(mcrclassification:category('mir_licenses', $accessCondition))"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:call-template name="output-badge">
+      <xsl:with-param name="class" select="concat('mir-badge-license-', $accessCondition)"/>
+      <xsl:with-param name="label" select="$label"/>
+      <xsl:with-param name="link"  select="concat($ServletsBaseURL, 'solr/find?condQuery=*&amp;fq=category:%22', $accessConditionClass, '%22')"/>
+      <xsl:with-param name="tooltip" select="document('i18n:mir.rights')/i18n/text()"/>
+    </xsl:call-template>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/badges/mir-badges-oa.xsl b/mir-module/src/main/resources/xslt/badges/mir-badges-oa.xsl
new file mode 100644
index 0000000000..a376999ddd
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/badges/mir-badges-oa.xsl
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:import href="xslImport:badges:badges/mir-badges-oa.xsl"/>
+  <xsl:include href="resource:xslt/badges/mir-badges-utils.xsl"/>
+
+  <xsl:template match="doc" mode="badge">
+    <xsl:apply-imports/>
+
+    <xsl:call-template name="output-oa-badge">
+      <xsl:with-param name="isOpenAccess" select="bool[@name='worldReadableComplete']='true' or field[@name='worldReadableComplete']='true'"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="output-oa-badge">
+    <xsl:param name="isOpenAccess"/>
+
+    <xsl:variable name="icon-class">
+      <xsl:choose>
+        <xsl:when test="$isOpenAccess">
+          <xsl:value-of select="'fas fa-unlock-alt'"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="'fas fa-lock'"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:call-template name="output-badge">
+      <xsl:with-param name="class" select="concat('mir-badge-oa-', $isOpenAccess)"/>
+      <xsl:with-param name="tooltip" select="document(concat('i18n:mir.response.openAccess.', $isOpenAccess))/i18n/text()"/>
+      <xsl:with-param name="icon-class" select="$icon-class"/>
+    </xsl:call-template>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/badges/mir-badges-orcid.xsl b/mir-module/src/main/resources/xslt/badges/mir-badges-orcid.xsl
new file mode 100644
index 0000000000..2392eaad4a
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/badges/mir-badges-orcid.xsl
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:import href="xslImport:badges:badges/mir-badges-orcid.xsl"/>
+  <xsl:import href="resource:xslt/orcid/mir-orcid-user.xsl"/>
+  <xsl:include href="resource:xslt/orcid/mir-orcid-work.xsl"/>
+  <xsl:include href="resource:xslt/badges/mir-badges-utils.xsl"/>
+
+  <xsl:template match="doc" mode="badge">
+    <xsl:apply-imports/>
+
+    <xsl:if test="not($isCurrentUserGuest)
+                  and $isOrcidEnabled
+                  and count($userOrcids) &gt; 0
+                  and (
+                    str[@name='state'][. = 'published']
+                    or field[@name='state'][. = 'published']
+                  )">
+      <xsl:variable name="currentUserMatchingTrustedIds">
+        <xsl:call-template name="check-current-user-has-trusted-matching-id">
+          <xsl:with-param name="nameIds" select="arr[@name='mods.nameIdentifier']/str | field[@name='mods.nameIdentifier']"/>
+        </xsl:call-template>
+      </xsl:variable>
+
+      <xsl:if test="normalize-space($currentUserMatchingTrustedIds) = 'true'">
+        <xsl:variable name="objectId" select="string((str[@name='id'] | field[@name='id'])[1])"/>
+        <span class="badge mir-badge-orcid-in-profile" data-object-id="{$objectId}">
+          <i class="fa-brands fa-orcid"></i>
+          <span class="mir-badge-orcid-in-profile-text">
+            <xsl:value-of select="document('i18n:mir.orcid.publication.badge.inProfile.loading')/i18n/text()"/>
+          </span>
+        </span>
+      </xsl:if>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/badges/mir-badges-state.xsl b/mir-module/src/main/resources/xslt/badges/mir-badges-state.xsl
new file mode 100644
index 0000000000..9b8caa18c5
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/badges/mir-badges-state.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:mcrclassification="http://www.mycore.de/xslt/classification"
+  xmlns:mcrstringutils="http://www.mycore.de/xslt/stringutils"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:import href="xslImport:badges:badges/mir-badges-state.xsl"/>
+  <xsl:include href="resource:xslt/badges/mir-badges-utils.xsl"/>
+
+  <xsl:template match="doc" mode="badge">
+    <xsl:apply-imports/>
+
+    <xsl:if test="(str[@name ='state'] | field[@name ='state'])[1]">
+      <xsl:if test="not($isCurrentUserGuest)">
+        <xsl:call-template name="output-state-badge">
+          <xsl:with-param name="stateValue" select="(str[@name ='state'] | field[@name ='state'])[1]"/>
+        </xsl:call-template>
+      </xsl:if>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="output-state-badge">
+    <xsl:param name="stateValue" select="*[@name ='state'][1]"/>
+    <xsl:call-template name="output-badge">
+      <xsl:with-param name="class" select="concat('mir-badge-state-', $stateValue)"/>
+      <xsl:with-param name="label"
+        select="mcrstringutils:capitalize(mcrclassification:current-label-text(mcrclassification:category('state', $stateValue)))"/>
+      <xsl:with-param name="tooltip" select="document('i18n:component.mods.metaData.dictionary.status')/i18n/text()"/>
+    </xsl:call-template>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/badges/mir-badges-utils.xsl b/mir-module/src/main/resources/xslt/badges/mir-badges-utils.xsl
new file mode 100644
index 0000000000..8ada1b4017
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/badges/mir-badges-utils.xsl
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:param name="CurrentLang"/>
+  <xsl:param name="ServletsBaseURL"/>
+  <xsl:param name="WebApplicationBaseURL"/>
+  <xsl:param name="isCurrentUserGuest" select="document('userobjectrights:isCurrentUserGuestUser:')/boolean = 'true'"/>
+
+  <xsl:template name="output-badge">
+    <xsl:param name="class"/>
+    <xsl:param name="label"/>
+    <xsl:param name="link"/>
+    <xsl:param name="tooltip"/>
+    <xsl:param name="icon-class"/>
+    <xsl:choose>
+      <xsl:when test="$link">
+        <a class="badge {$class}" href="{$link}">
+          <xsl:if test="$tooltip">
+            <xsl:attribute name="data-bs-toggle" select="'tooltip'"/>
+            <xsl:attribute name="title" select="$tooltip"/>
+          </xsl:if>
+          <xsl:if test="$icon-class">
+            <i class="{$icon-class}"/>
+          </xsl:if>
+          <xsl:value-of select="$label"/>
+        </a>
+      </xsl:when>
+      <xsl:otherwise>
+        <span class="badge {$class}">
+          <xsl:if test="$tooltip">
+            <xsl:attribute name="data-bs-toggle" select="'tooltip'"/>
+            <xsl:attribute name="title" select="$tooltip"/>
+          </xsl:if>
+          <xsl:if test="$icon-class">
+            <i class="{$icon-class}"/>
+          </xsl:if>
+          <xsl:value-of select="$label"/>
+        </span>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/csl-export-gui.xsl b/mir-module/src/main/resources/xslt/csl-export-gui.xsl
new file mode 100644
index 0000000000..2953975803
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/csl-export-gui.xsl
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:mcri18n="http://www.mycore.de/xslt/i18n"
+  xmlns:csl="http://purl.org/net/xbiblio/csl"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:param name="MCR.Export.Transformers"/>
+  <xsl:param name="MCR.Export.CSL.Styles"/>
+  <xsl:param name="MCR.Export.CSL.Rows"/>
+  <xsl:param name="MCR.Export.Standalone.Rows"/>
+  <xsl:param name="MCR.ContentTransformer.solr2csv.Stylesheet"/>
+
+  <xsl:template name="exportGUI">
+    <xsl:param name="type"/>
+    <xsl:variable name="transformers" select="tokenize($MCR.Export.Transformers, ',') ! normalize-space(.)[. != '']" />
+    <xsl:variable name="standaloneFormats">
+      <xsl:value-of select="string-join($transformers ! substring-before(., ':'), ',')" />
+    </xsl:variable>
+    <script type="text/javascript">
+      window["MCR.Export.StandaloneFormats"] = &quot;<xsl:value-of select="$standaloneFormats"/>&quot;;
+      window["MCR.Export.CSL.Rows"] = &quot;<xsl:value-of select="$MCR.Export.CSL.Rows"/>&quot;;
+      window["MCR.Export.Standalone.Rows"] = &quot;<xsl:value-of select="$MCR.Export.Standalone.Rows"/>&quot;;
+    </script>
+    <script src="{$WebApplicationBaseURL}js/csl-export.js"/>
+    <div class="input-group mb-3 flex-wrap" data-export="{$type}">
+      <select name="format" class="form-control">
+        <option value="">
+          <xsl:value-of select="mcri18n:translate('component.mods.csl.export.format')"/>
+        </option>
+        <option value="pdf">PDF</option>
+        <option value="html">HTML</option>
+        <xsl:if test="$type ='response'">
+          <xsl:if test="string-length($MCR.ContentTransformer.solr2csv.Stylesheet)&gt;0">
+            <option value="solr2csv">CSV</option>
+          </xsl:if>
+        </xsl:if>
+        <xsl:if test="$type = 'basket'">
+          <xsl:for-each select="$transformers">
+            <option value="{substring-before(.,':')}">
+              <xsl:value-of select="substring-after(.,':')"/>
+            </option>
+          </xsl:for-each>
+        </xsl:if>
+      </select>
+      <select name="style">
+        <xsl:attribute name="class">
+          <xsl:text>form-control</xsl:text>
+          <xsl:if test="$type = 'basket'">
+            <xsl:text> d-none</xsl:text>
+          </xsl:if>
+        </xsl:attribute>
+        <option value="">
+          <xsl:value-of select="mcri18n:translate('component.mods.csl.export.style')"/>
+        </option>
+        <xsl:call-template name="styles2Options"/>
+      </select>
+      <div class="input-group-append">
+        <a href="#" class="action btn btn-md btn-csl-export" data-trigger-export="true">
+          <xsl:value-of select="mcri18n:translate('component.mods.csl.export')"/>
+        </a>
+      </div>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="styles2Options">
+    <xsl:for-each select="tokenize($MCR.Export.CSL.Styles, ',') ! normalize-space(.)[. != '']">
+      <option value="{.}">
+        <xsl:variable name="cslDocument" select="document(concat('resource:', ., '.csl'))"/>
+        <xsl:variable name="title" select="$cslDocument/csl:style/csl:info/csl:title"/>
+        <xsl:variable name="short-title" select="$cslDocument/csl:style/csl:info/csl:title-short"/>
+        <xsl:choose>
+          <xsl:when test="string-length($short-title) &gt; 0">
+            <xsl:value-of select="concat($short-title, ' (', $title, ')')"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$title" />
+          </xsl:otherwise>
+        </xsl:choose>
+      </option>
+    </xsl:for-each>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/layout/mir-layout-utils.xsl b/mir-module/src/main/resources/xslt/layout/mir-layout-utils.xsl
index 8ad216872e..d94bba16b9 100644
--- a/mir-module/src/main/resources/xslt/layout/mir-layout-utils.xsl
+++ b/mir-module/src/main/resources/xslt/layout/mir-layout-utils.xsl
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="3.0"
+  xmlns:mcracl="http://www.mycore.de/xslt/acl"
   xmlns:mcri18n="http://www.mycore.de/xslt/i18n"
   xmlns:mirstrutils="http://www.mycore.de/xslt/mirstrutils"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -7,6 +8,55 @@
 
   <xsl:include href="resource:xslt/mir-accesskey-utils.xsl" />
 
+  <xsl:template name="objectLink">
+    <xsl:param name="obj_id" />
+    <xsl:param name="mcrobj" />
+
+    <xsl:choose>
+      <xsl:when test="$mcrobj">
+        <xsl:variable name="resolved_obj_id" select="$mcrobj/@ID" />
+        <xsl:choose>
+          <xsl:when test="mcracl:check-permission($resolved_obj_id,'read')">
+            <a href="{$WebApplicationBaseURL}receive/{$resolved_obj_id}">
+              <xsl:attribute name="title">
+                <xsl:apply-templates select="$mcrobj" mode="fulltitle" />
+              </xsl:attribute>
+              <xsl:apply-templates select="$mcrobj" mode="resulttitle" />
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:variable name="LoginURL"
+              select="concat($ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri(string($RequestURL)))" />
+            <xsl:apply-templates select="$mcrobj" mode="resulttitle" />
+            <xsl:text>&#160;</xsl:text>
+            <a href="{$LoginURL}">
+              <img src="{concat($WebApplicationBaseURL,'images/paper_lock.gif')}" />
+            </a>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+      <xsl:when test="string-length($obj_id)&gt;0">
+        <xsl:variable name="resolved_mcrobj" select="document(concat('mcrobject:',$obj_id))/mycoreobject" />
+        <xsl:choose>
+          <xsl:when test="mcracl:check-permission($obj_id,'read')">
+            <a href="{$WebApplicationBaseURL}receive/{$obj_id}">
+              <xsl:apply-templates select="$resolved_mcrobj" mode="resulttitle" />
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:variable name="LoginURL"
+              select="concat($ServletsBaseURL, 'MCRLoginServlet?url=', encode-for-uri(string($RequestURL)))" />
+            <xsl:apply-templates select="$resolved_mcrobj" mode="resulttitle" />
+            <xsl:text>&#160;</xsl:text>
+            <a href="{$LoginURL}">
+              <img src="{concat($WebApplicationBaseURL,'images/paper_lock.gif')}" />
+            </a>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:template>
+
   <xsl:template name="extractObjectIdFromRequestURL">
     <xsl:choose>
       <xsl:when test="contains($RequestURL, '/receive/')">
diff --git a/mir-module/src/main/resources/xslt/orcid/mir-orcid-export-ui.xsl b/mir-module/src/main/resources/xslt/orcid/mir-orcid-export-ui.xsl
new file mode 100644
index 0000000000..385f87d4e8
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/orcid/mir-orcid-export-ui.xsl
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:template name="render-export-to-orcid-modal">
+    <div id="exportToOrcidModal" class="modal fade" tabindex="-1"
+      aria-labelledby="exportToOrcidModalLabel" aria-hidden="true" role="dialog">
+      <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 id="exportToOrcidModalLabel" class="modal-title">
+              <xsl:value-of select="document('i18n:mir.orcid.publication.export.modal.title')/i18n/text()"/>
+            </h5>
+            <button class="btn-close" type="button" data-bs-dismiss="modal" aria-label="Close"/>
+          </div>
+          <div class="modal-body">
+            <div id="alertDiv" class="alert alert-danger" role="alert">
+              <xsl:value-of select="document('i18n:mir.orcid.publication.export.error.generic')/i18n/text()"/>
+            </div>
+            <div class="form-group">
+              <label for="orcidProfileSelect">
+                <xsl:value-of select="document('i18n:mir.orcid.publication.export.description')/i18n/text()"/>
+              </label>
+              <select class="form-control mt-1" id="orcidProfileSelect">
+                <option value="" selected="selected">
+                  <xsl:value-of select="document('i18n:mir.select')/i18n/text()"/>
+                </option>
+              </select>
+            </div>
+          </div>
+          <div class="modal-footer">
+            <button id="exportToOrcidBtn" class="btn btn-primary" type="button">
+              <xsl:value-of select="document('i18n:mir.orcid.publication.export.action.confirm')/i18n/text()"/>
+            </button>
+            <button class="btn btn-secondary" type="button" data-bs-dismiss="modal">
+              <xsl:value-of select="document('i18n:button.cancel')/i18n/text()"/>
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="render-export-to-orcid-menu-item">
+    <xsl:param name="objectId"/>
+    <xsl:param name="disabled" select="true()"/>
+    <xsl:if test="$objectId">
+      <li id="exportToOrcidMenuItem">
+        <a id="openExportToOrcidModal" class="dropdown-item" role="menuitem" data-object-id="{$objectId}">
+          <xsl:attribute name="class">
+            <xsl:choose>
+              <xsl:when test="$disabled">
+                <xsl:text>dropdown-item open-export-orcid-modal disabled</xsl:text>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>dropdown-item open-export-orcid-modal</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:attribute>
+          <xsl:value-of select="document('i18n:mir.orcid.publication.export.action.trigger')/i18n/text()"/>
+        </a>
+      </li>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/orcid/mir-orcid-user.xsl b/mir-module/src/main/resources/xslt/orcid/mir-orcid-user.xsl
new file mode 100644
index 0000000000..73ac5aa1a8
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/orcid/mir-orcid-user.xsl
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:include href="resource:xslt/orcid/mir-orcid.xsl"/>
+
+  <xsl:param name="MCR.ORCID2.User.TrustedNameIdentifierTypes" select="''"/>
+  <xsl:param name="currentUser" select="document('user:current')/user"/>
+  <xsl:variable name="isGuestUser" select="$currentUser/@name = 'guest'"/>
+
+  <xsl:variable name="userOrcids" as="xs:string*">
+    <xsl:if test="$isOrcidEnabled and not($isGuestUser)">
+      <xsl:for-each select="$currentUser/attributes/attribute[starts-with(@name, 'id_orcid')]">
+        <xsl:sequence select="string(@value)"/>
+      </xsl:for-each>
+    </xsl:if>
+  </xsl:variable>
+
+  <xsl:variable name="userIds" as="xs:string*">
+    <xsl:if test="$isOrcidEnabled and not($isGuestUser)">
+      <xsl:for-each select="$currentUser/attributes/attribute[starts-with(@name, 'id_')]">
+        <xsl:sequence select="concat(substring(@name, 4), ':', @value)"/>
+      </xsl:for-each>
+    </xsl:if>
+  </xsl:variable>
+
+  <xsl:variable name="hasLinkedOrcidCredential"
+    select="$isOrcidEnabled
+            and not($isGuestUser)
+            and count($currentUser/attributes/attribute[starts-with(@name, 'orcid_credential')]) &gt; 0"/>
+
+  <xsl:variable name="trustedIdTypes" select="tokenize($MCR.ORCID2.User.TrustedNameIdentifierTypes, ',') ! normalize-space(.)[. != '']"/>
+
+  <xsl:template name="check-current-user-has-trusted-matching-id">
+    <xsl:param name="nameIds"/>
+    <xsl:variable name="matchingTrustedIds">
+      <xsl:call-template name="get-matching-trusted-ids">
+        <xsl:with-param name="idsA" select="$userIds"/>
+        <xsl:with-param name="idsB" select="$nameIds"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:value-of select="exists($matchingTrustedIds/str)"/>
+  </xsl:template>
+
+  <xsl:template name="get-matching-trusted-ids">
+    <xsl:param name="idsA"/>
+    <xsl:param name="idsB"/>
+    <xsl:if test="count($trustedIdTypes) &gt; 0">
+      <xsl:variable name="trustedIdsA" as="xs:string*">
+        <xsl:for-each select="$idsA[substring-before(., ':') = $trustedIdTypes]">
+          <xsl:sequence select="string(.)"/>
+        </xsl:for-each>
+      </xsl:variable>
+      <xsl:for-each select="$idsB[. = $trustedIdsA]">
+        <str><xsl:value-of select="."/></str>
+      </xsl:for-each>
+    </xsl:if>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/orcid/mir-orcid-work.xsl b/mir-module/src/main/resources/xslt/orcid/mir-orcid-work.xsl
new file mode 100644
index 0000000000..16f7660b33
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/orcid/mir-orcid-work.xsl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:include href="resource:xslt/orcid/mir-orcid.xsl"/>
+
+  <xsl:param name="MCR.ORCID2.Work.PublishStates" select="''"/>
+
+  <xsl:variable name="publishStates" select="tokenize($MCR.ORCID2.Work.PublishStates, ',') ! normalize-space(.)[. != '']"/>
+
+  <xsl:template name="check-state-is-publishable">
+    <xsl:param name="state"/>
+    <xsl:value-of select="boolean($publishStates[. = $state])"/>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/relatedItem-subselect.xsl b/mir-module/src/main/resources/xslt/relatedItem-subselect.xsl
new file mode 100644
index 0000000000..ad0e6c3ca1
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/relatedItem-subselect.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:mcrurl="http://www.mycore.de/xslt/url"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:include href="resource:xslt/default-parameters.xsl" />
+  <xsl:include href="xslInclude:functions" />
+
+  <xsl:mode on-no-match="shallow-copy" />
+
+  <xsl:variable name="xedSession" select="mcrurl:get-param($RequestURL, '_xed_subselect_session')" />
+
+  <xsl:template match="li[a/@class='hit_option hit_edit']">
+    <xsl:variable name="objectID" select="substring-after(a/@href, 'id=')" />
+    <xsl:copy>
+      <xsl:apply-templates select="@* | node()" />
+    </xsl:copy>
+    <li>
+      <a title="" class="hit_option hit_to_basket dropdown-item">
+        <xsl:attribute name="href">
+          <xsl:value-of select="concat($ServletsBaseURL, 'XEditor?_xed_submit_return= ')" />
+          <xsl:value-of select="concat('&amp;_xed_session=', $xedSession)" />
+          <xsl:value-of select="concat('&amp;@xlink:href=', $objectID)" />
+        </xsl:attribute>
+        <span class="fas fa-share-alt" />übernehmen
+      </a>
+    </li>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-facets.xsl b/mir-module/src/main/resources/xslt/response-facets.xsl
similarity index 84%
rename from mir-module/src/main/resources/xsl/response-facets.xsl
rename to mir-module/src/main/resources/xslt/response-facets.xsl
index b06717b1b1..4d159fc47d 100644
--- a/mir-module/src/main/resources/xsl/response-facets.xsl
+++ b/mir-module/src/main/resources/xslt/response-facets.xsl
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-  xmlns:decoder="xalan://java.net.URLDecoder"
-  xmlns:encoder="xalan://java.net.URLEncoder"
-  xmlns:mcri18n="xalan://org.mycore.services.i18n.MCRTranslation"
-  xmlns:mcrxml="xalan://org.mycore.common.xml.MCRXMLFunctions"
-  xmlns:str="http://exslt.org/strings"
-  xmlns:xalan="http://xml.apache.org/xalan"
+<xsl:stylesheet version="3.0"
+  xmlns:mcracl="http://www.mycore.de/xslt/acl"
+  xmlns:mcrclassification="http://www.mycore.de/xslt/classification"
+  xmlns:mcri18n="http://www.mycore.de/xslt/i18n"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="decoder encoder mcri18n mcrxml str xalan xsl">
-
-  <xsl:param name="CurrentLang"/>
-  <xsl:param name="RequestURL"/>
+  exclude-result-prefixes="#all">
 
   <xsl:variable name="facetProperties" select="document(concat('property:','MIR.Response.Facet.*'))"/>
 
@@ -26,7 +20,8 @@
       <xsl:variable name="rolesProperty">
         <xsl:value-of select="$facetProperties/properties/entry[@key=concat('MIR.Response.Facet.', $facet_name, '.Roles')]"/>
       </xsl:variable>
-      <xsl:variable name="hasRole" select="string-length($rolesProperty)=0 or count(str:tokenize($rolesProperty,',')[mcrxml:isCurrentUserInRole(.)])!=0"/>
+      <xsl:variable name="hasRole"
+        select="string-length($rolesProperty)=0 or count(tokenize($rolesProperty, ',')[mcracl:is-current-user-in-role(.)])!=0"/>
 
       <xsl:if test="$isEnabled and $hasRole and self::node()[@name=$facet_name]/int">
 
@@ -72,7 +67,6 @@
           </xsl:choose>
         </xsl:variable>
 
-        <!-- name of facet -->
         <div class="card {$facet_name}">
           <div class="card-header" data-mcr-toggle="collapse-next">
             <h3 class="card-title">
@@ -103,7 +97,6 @@
             </h3>
           </div>
 
-          <!-- facet values -->
           <div class="card-body collapse show">
             <ul class="filter">
               <xsl:apply-templates select="/response/lst[@name='facet_counts']/lst[@name='facet_fields']">
@@ -150,15 +143,15 @@
         </xsl:choose>
       </xsl:variable>
       <xsl:variable name="fqFragment" select="concat('fq=',$fqValue)"/>
-      <xsl:variable name="fqFragmentEncoded" select="concat('fq=',encoder:encode($fqResponseValue, 'UTF-8'))"/>
-      <xsl:variable name="queryWithoutStart" select="mcrxml:regexp($RequestURL, '(&amp;|%26)(start=)[0-9]*', '')"/>
+      <xsl:variable name="fqFragmentEncoded"
+        select="concat('fq=', replace(encode-for-uri($fqResponseValue), '%20', '+'))"/>
+      <xsl:variable name="queryWithoutStart" select="replace($RequestURL, '(&amp;|%26)(start=)[0-9]*', '')"/>
 
       <xsl:variable name="queryURL">
         <xsl:choose>
           <xsl:when test="contains($queryWithoutStart, $fqFragment)">
             <xsl:choose>
               <xsl:when test="not(substring-after($queryWithoutStart, $fqFragment))">
-                <!-- last parameter -->
                 <xsl:value-of
                   select="substring($queryWithoutStart, 1, string-length($queryWithoutStart) - string-length($fqFragment) - 1)"/>
               </xsl:when>
@@ -171,7 +164,6 @@
           <xsl:when test="contains($queryWithoutStart, $fqFragmentEncoded)">
             <xsl:choose>
               <xsl:when test="not(substring-after($queryWithoutStart, $fqFragmentEncoded))">
-                <!-- last parameter -->
                 <xsl:value-of
                   select="substring($queryWithoutStart, 1, string-length($queryWithoutStart) - string-length($fqFragmentEncoded) - 1)"/>
               </xsl:when>
@@ -225,13 +217,8 @@
     <xsl:param name="facet_name"/>
     <xsl:choose>
       <xsl:when test="$parameterValues">
-        <xsl:variable name="encodedParameterValue">
-          <xsl:call-template name="UrlGetParam">
-            <xsl:with-param name="url" select="$RequestURL" />
-            <xsl:with-param name="par" select="concat('facet.label.',@name)" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="parameterValue" select="decoder:decode($encodedParameterValue, 'UTF-8')"/>
+        <xsl:variable name="parameterValue"
+          select="string((/response/lst[@name='responseHeader']/lst[@name='params']/str[@name=concat('facet.label.', @name)])[1])"/>
         <xsl:choose>
           <xsl:when test="string-length($parameterValue)!=0">
             <xsl:value-of select="$parameterValue"/>
@@ -247,16 +234,16 @@
         </xsl:choose>
       </xsl:when>
       <xsl:when
-          test="$categoryClassValues = true() and mcrxml:isCategoryID(substring-before(@name, ':'), substring-after(@name, ':'))">
+          test="$categoryClassValues = true() and mcrclassification:is-category-id(substring-before(@name, ':'), substring-after(@name, ':'))">
         <xsl:value-of
-            select="mcrxml:getDisplayName(substring-before(@name, ':'), substring-after(@name, ':'))"/>
+          select="mcrclassification:current-label-text(mcrclassification:category(substring-before(@name, ':'), substring-after(@name, ':')))"/>
       </xsl:when>
-      <xsl:when test="mcrxml:isCategoryID($classId, @name)">
-        <xsl:value-of select="mcrxml:getDisplayName($classId, @name)"/>
+      <xsl:when test="mcrclassification:is-category-id($classId, @name)">
+        <xsl:value-of select="mcrclassification:current-label-text(mcrclassification:category($classId, @name))"/>
       </xsl:when>
       <xsl:when test="mcri18n:exists(concat('mir.response.facet.' ,$facet_name, '.value.', @name))">
-        <xsl:value-of select="mcri18n:translate(concat('mir.response.facet.' ,$facet_name, '.value.', @name))"
-                      disable-output-escaping="yes"/>
+        <xsl:copy-of
+          select="parse-xml-fragment(mcri18n:translate(concat('mir.response.facet.' ,$facet_name, '.value.', @name)))/node()"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:value-of select="@name"/>
diff --git a/mir-module/src/main/resources/xslt/response-mir-utils.xsl b/mir-module/src/main/resources/xslt/response-mir-utils.xsl
new file mode 100644
index 0000000000..5b859f85dd
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/response-mir-utils.xsl
@@ -0,0 +1,402 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:mcri18n="http://www.mycore.de/xslt/i18n"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:include href="resource:xslt/mir-utils.xsl" />
+
+  <xsl:template name="browse.Pagination">
+    <xsl:param name="id" select="'pagination'" />
+    <xsl:param name="i18nprefix" select="'mir.pagination.hits'" />
+    <xsl:param name="class" select="''" />
+
+    <xsl:param name="href" select="concat($proxyBaseURL,$solrParams)" />
+
+    <xsl:param name="page" />
+    <xsl:param name="pages" />
+
+    <xsl:variable name="label.previousHit"
+      select="mcri18n:translate-with-params(concat($i18nprefix, '.previous'), $page - 1)" />
+    <xsl:variable name="label.nextHit"
+      select="mcri18n:translate-with-params(concat($i18nprefix, '.next'), $page + 1)" />
+
+    <div id="{$id}" class="row {$class}">
+      <xsl:if test="$page &gt; 1">
+        <xsl:variable name="link">
+          <xsl:call-template name="paginateLink">
+            <xsl:with-param name="href" select="$href" />
+            <xsl:with-param name="page" select="$page - 1" />
+            <xsl:with-param name="numPerPage" select="1" />
+          </xsl:call-template>
+        </xsl:variable>
+        <div class="col-12 col-md-5 text-start">
+          <a tabindex="0" class="previous" href="{$link}" data-pagination=".caption:mods.title.main">
+            <span class="fas fa-chevron-left icon" />
+            <span class="caption">
+              <xsl:value-of select="$label.previousHit" />
+            </span>
+          </a>
+        </div>
+      </xsl:if>
+      <div class="col-12 col-md-2 text-center">
+        <xsl:attribute name="class">
+          <xsl:text>col-12 col-md-2 text-center</xsl:text>
+          <xsl:if test="$page = 1">
+            <xsl:text> offset-md-5</xsl:text>
+          </xsl:if>
+        </xsl:attribute>
+        <a title="{mcri18n:translate(concat($i18nprefix, '.back'))}">
+          <xsl:variable name="origRows" select="lst[@name='responseHeader']/lst[@name='params']/str[@name='origrows']" />
+          <xsl:variable name="newStart" select="$start - ($start mod $origRows)" />
+          <xsl:attribute name="href">
+            <xsl:variable name="params">
+              <xsl:variable name="tmp">
+                <xsl:for-each select="lst[@name='responseHeader']/lst[@name='params']/str">
+                  <xsl:if test="not(contains('fl|start|origrows|rows|XSL.Style', @name))">
+                    <xsl:value-of select="concat('&amp;', @name, '=', replace(encode-for-uri(string(.)), '%20', '+'))" />
+                  </xsl:if>
+                </xsl:for-each>
+              </xsl:variable>
+              <xsl:value-of select="concat('?', substring-after($tmp, '&amp;'))" />
+            </xsl:variable>
+            <xsl:value-of select="concat($proxyBaseURL, $params, '&amp;start=', $newStart, '#hit_', $page)" />
+          </xsl:attribute>
+          <span class="fas fa-chevron-up" />
+        </a>
+        <xsl:text>&#160;</xsl:text>
+        <xsl:value-of
+          select="mcri18n:translate-with-params(concat($i18nprefix, '.entriesInfo'), concat($page, ';', $pages))" />
+      </div>
+      <xsl:if test="$page &lt; $pages">
+        <xsl:variable name="link">
+          <xsl:call-template name="paginateLink">
+            <xsl:with-param name="href" select="$href" />
+            <xsl:with-param name="page" select="$page + 1" />
+            <xsl:with-param name="numPerPage" select="1" />
+          </xsl:call-template>
+        </xsl:variable>
+        <div class="col-12 col-md-5 text-end">
+          <a tabindex="0" class="next" href="{$link}" data-pagination=".caption:mods.title.main">
+            <span class="fas fa-chevron-right icon" />
+            <span class="caption">
+              <xsl:value-of select="$label.nextHit" />
+            </span>
+          </a>
+        </div>
+      </xsl:if>
+    </div>
+
+    <script type="text/javascript">
+      <![CDATA[
+        $(document).ready(function() {
+          var replaceUrlParam = function(url, paramName, paramValue) {
+            var pattern = new RegExp('\\b(' + paramName + '=).*?(&|$)')
+            if (url.search(pattern) >= 0) {
+              return url.replace(pattern, '$1' + paramValue + '$2');
+            }
+            return url + (url.indexOf('?') > 0 ? '&' : '?') + paramName + '=' + paramValue
+          }
+
+          $("*[data-pagination]").each(function() {
+            var $this = $(this);
+            var sel = /([^\:]*)\:(.*)/.exec($(this).data("pagination")).slice(1);
+
+            if (sel && sel.length > 1) {
+              var url = replaceUrlParam(replaceUrlParam($(this).attr("href"), "XSL.Style", "xml"), "fl", sel[1]);
+              $.ajax(url).done(function(data) {
+                var $xml = $(data);
+                var title = $xml.find("*[name='" + sel[1] + "']").text();
+                if (title) {
+                  $this.attr("title", title);
+                  $(sel[0], $this).text(title);
+                }
+              });
+            }
+          });
+        });
+      ]]>
+    </script>
+  </xsl:template>
+
+  <xsl:template name="resultList.Pagination">
+    <xsl:param name="id" select="'pagination'" />
+    <xsl:param name="i18nprefix" select="'mir.pagination'" />
+    <xsl:param name="class" select="''" />
+
+    <xsl:param name="href" select="concat($proxyBaseURL,$solrParams)" />
+
+    <xsl:param name="maxEntries" select="7" />
+    <xsl:param name="maxEntries-mobile" select="5" />
+
+    <xsl:param name="numPerPage" />
+    <xsl:param name="page" />
+    <xsl:param name="pages" />
+
+    <xsl:variable name="label.firstPage" select="mcri18n:translate-with-params(concat($i18nprefix, '.first'), 1)" />
+    <xsl:variable name="label.lastPage" select="mcri18n:translate-with-params(concat($i18nprefix, '.last'), $pages)" />
+    <xsl:variable name="label.previousPage"
+      select="mcri18n:translate-with-params(concat($i18nprefix, '.previous'), $page - 1)" />
+    <xsl:variable name="label.nextPage"
+      select="mcri18n:translate-with-params(concat($i18nprefix, '.next'), $page + 1)" />
+
+    <ul id="{$id}-paginate" class="pagination {$class} d-inline-flex">
+      <li class="page-item">
+        <xsl:choose>
+          <xsl:when test="number($page) &gt; 1">
+            <a class="page-link" tabindex="0" id="{$id}-first" title="{$label.firstPage}">
+              <xsl:attribute name="href">
+                <xsl:call-template name="paginateLink">
+                  <xsl:with-param name="href" select="$href" />
+                  <xsl:with-param name="page" select="1" />
+                  <xsl:with-param name="numPerPage" select="$numPerPage" />
+                </xsl:call-template>
+              </xsl:attribute>
+              <xsl:text>«</xsl:text>
+              <span class="sr-only">
+                <xsl:value-of select="$label.firstPage" />
+              </span>
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="class">page-item disabled</xsl:attribute>
+            <a class="page-link"><span>
+              <xsl:text>«</xsl:text>
+              <span class="sr-only">
+                <xsl:value-of select="$label.firstPage" />
+              </span>
+            </span></a>
+          </xsl:otherwise>
+        </xsl:choose>
+      </li>
+      <li class="page-item">
+        <xsl:choose>
+          <xsl:when test="number($page) &gt; 1">
+            <a class="page-link" tabindex="0" id="{$id}-previous" title="{$label.previousPage}">
+              <xsl:attribute name="href">
+                <xsl:call-template name="paginateLink">
+                  <xsl:with-param name="href" select="$href" />
+                  <xsl:with-param name="page" select="$page - 1" />
+                  <xsl:with-param name="numPerPage" select="$numPerPage" />
+                </xsl:call-template>
+              </xsl:attribute>
+              <xsl:text>‹</xsl:text>
+              <span class="sr-only">
+                <xsl:value-of select="$label.previousPage" />
+              </span>
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="class">page-item disabled</xsl:attribute>
+            <a class="page-link"><span>
+              <xsl:text>‹</xsl:text>
+              <span class="sr-only">
+                <xsl:value-of select="$label.previousPage" />
+              </span>
+            </span></a>
+          </xsl:otherwise>
+        </xsl:choose>
+      </li>
+
+      <xsl:variable name="paginateStart">
+        <xsl:call-template name="paginateStart">
+          <xsl:with-param name="maxEntries" select="$maxEntries" />
+          <xsl:with-param name="page" select="$page" />
+          <xsl:with-param name="pages" select="$pages" />
+        </xsl:call-template>
+      </xsl:variable>
+
+      <xsl:variable name="paginateEnd">
+        <xsl:call-template name="paginateEnd">
+          <xsl:with-param name="maxEntries" select="$maxEntries" />
+          <xsl:with-param name="page" select="$page" />
+          <xsl:with-param name="pages" select="$pages" />
+        </xsl:call-template>
+      </xsl:variable>
+
+      <xsl:variable name="paginateStart-mobile">
+        <xsl:call-template name="paginateStart">
+          <xsl:with-param name="maxEntries" select="$maxEntries-mobile" />
+          <xsl:with-param name="page" select="$page" />
+          <xsl:with-param name="pages" select="$pages" />
+        </xsl:call-template>
+      </xsl:variable>
+
+      <xsl:variable name="paginateEnd-mobile">
+        <xsl:call-template name="paginateEnd">
+          <xsl:with-param name="maxEntries" select="$maxEntries-mobile" />
+          <xsl:with-param name="page" select="$page" />
+          <xsl:with-param name="pages" select="$pages" />
+        </xsl:call-template>
+      </xsl:variable>
+
+      <xsl:call-template name="paginateEntries">
+        <xsl:with-param name="href" select="$href" />
+        <xsl:with-param name="numPerPage" select="$numPerPage" />
+        <xsl:with-param name="page" select="$page" />
+        <xsl:with-param name="pages" select="$pages" />
+        <xsl:with-param name="paginateStart" select="$paginateStart" />
+        <xsl:with-param name="paginateEnd" select="$paginateEnd" />
+        <xsl:with-param name="paginateStart-mobile" select="$paginateStart-mobile" />
+        <xsl:with-param name="paginateEnd-mobile" select="$paginateEnd-mobile" />
+      </xsl:call-template>
+
+      <li class="page-item">
+        <xsl:choose>
+          <xsl:when test="number($page) &lt; $pages">
+            <a class="page-link" tabindex="0" id="{$id}-next" title="{$label.nextPage}">
+              <xsl:attribute name="href">
+                <xsl:call-template name="paginateLink">
+                  <xsl:with-param name="href" select="$href" />
+                  <xsl:with-param name="page" select="$page + 1" />
+                  <xsl:with-param name="numPerPage" select="$numPerPage" />
+                </xsl:call-template>
+              </xsl:attribute>
+              <xsl:text>›</xsl:text>
+              <span class="sr-only">
+                <xsl:value-of select="$label.nextPage" />
+              </span>
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="class">page-item disabled</xsl:attribute>
+            <a class="page-link"><span>
+              <xsl:text>›</xsl:text>
+              <span class="sr-only">
+                <xsl:value-of select="$label.nextPage" />
+              </span>
+            </span></a>
+          </xsl:otherwise>
+        </xsl:choose>
+      </li>
+      <li class="page-item">
+        <xsl:choose>
+          <xsl:when test="number($page) &lt; $pages">
+            <a class="page-link" tabindex="0" id="{$id}-last" title="{$label.lastPage}">
+              <xsl:attribute name="href">
+                <xsl:call-template name="paginateLink">
+                  <xsl:with-param name="href" select="$href" />
+                  <xsl:with-param name="page" select="$pages" />
+                  <xsl:with-param name="numPerPage" select="$numPerPage" />
+                </xsl:call-template>
+              </xsl:attribute>
+              <xsl:text>»</xsl:text>
+              <span class="sr-only">
+                <xsl:value-of select="$label.lastPage" />
+              </span>
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="class">page-item disabled</xsl:attribute>
+            <a class="page-link"><span>
+              <xsl:text>»</xsl:text>
+              <span class="sr-only">
+                <xsl:value-of select="$label.lastPage" />
+              </span>
+            </span></a>
+          </xsl:otherwise>
+        </xsl:choose>
+      </li>
+    </ul>
+  </xsl:template>
+
+  <xsl:template name="paginateStart">
+    <xsl:param name="maxEntries" />
+    <xsl:param name="page" />
+    <xsl:param name="pages" />
+
+    <xsl:variable name="paginateBackCount" select="ceiling(($maxEntries - 1) div 2)" />
+    <xsl:variable name="paginatePrevCount" select="$maxEntries - ceiling($maxEntries div 2)" />
+
+    <xsl:choose>
+      <xsl:when test="((number($page) - $paginateBackCount) &lt;= 1) or ($pages &lt; $maxEntries)">
+        <xsl:value-of select="1" />
+      </xsl:when>
+      <xsl:when test="(number($page) + $paginatePrevCount) &gt; $pages">
+        <xsl:value-of select="number($page) - $paginateBackCount - ((number($page) + $paginatePrevCount) - $pages)" />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="number($page) - $paginateBackCount" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="paginateEnd">
+    <xsl:param name="maxEntries" />
+    <xsl:param name="page" />
+    <xsl:param name="pages" />
+
+    <xsl:variable name="paginateBackCount" select="ceiling(($maxEntries - 1) div 2)" />
+    <xsl:variable name="paginatePrevCount" select="$maxEntries - ceiling($maxEntries div 2)" />
+
+    <xsl:choose>
+      <xsl:when test="((number($page) + $paginatePrevCount) &gt;= $pages) or ($pages &lt; $maxEntries)">
+        <xsl:value-of select="$pages" />
+      </xsl:when>
+      <xsl:when test="(number($page) + $paginatePrevCount) &lt; $maxEntries">
+        <xsl:value-of select="$maxEntries" />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="number($page) + $paginatePrevCount" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template name="paginateEntries">
+    <xsl:param name="href" />
+    <xsl:param name="numPerPage" />
+    <xsl:param name="page" />
+    <xsl:param name="pages" />
+    <xsl:param name="paginateStart" />
+    <xsl:param name="paginateEnd" />
+    <xsl:param name="paginateStart-mobile" />
+    <xsl:param name="paginateEnd-mobile" />
+
+    <xsl:if test="$paginateStart = number($page)">
+      <li class="active page-item">
+        <a class="page-link"><span>
+          <xsl:value-of select="$paginateStart" />
+        </span></a>
+      </li>
+    </xsl:if>
+    <xsl:if test="$paginateStart != number($page)">
+      <li class="page-item">
+        <xsl:if test="($paginateStart &lt; $paginateStart-mobile) or ($paginateStart &gt; $paginateEnd-mobile)">
+          <xsl:attribute name="class">d-none d-sm-block</xsl:attribute>
+        </xsl:if>
+        <a class="page-link" tabindex="0">
+          <xsl:attribute name="href">
+            <xsl:call-template name="paginateLink">
+              <xsl:with-param name="href" select="$href" />
+              <xsl:with-param name="page" select="$paginateStart" />
+              <xsl:with-param name="numPerPage" select="$numPerPage" />
+            </xsl:call-template>
+          </xsl:attribute>
+          <xsl:value-of select="$paginateStart" />
+        </a>
+      </li>
+    </xsl:if>
+
+    <xsl:if test="$paginateStart &lt; $paginateEnd">
+      <xsl:call-template name="paginateEntries">
+        <xsl:with-param name="href" select="$href" />
+        <xsl:with-param name="numPerPage" select="$numPerPage" />
+        <xsl:with-param name="page" select="$page" />
+        <xsl:with-param name="pages" select="$pages" />
+        <xsl:with-param name="paginateStart" select="$paginateStart + 1" />
+        <xsl:with-param name="paginateEnd" select="$paginateEnd" />
+        <xsl:with-param name="paginateStart-mobile" select="$paginateStart-mobile" />
+        <xsl:with-param name="paginateEnd-mobile" select="$paginateEnd-mobile" />
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="paginateLink">
+    <xsl:param name="href" />
+    <xsl:param name="page" select="1" />
+    <xsl:param name="numPerPage" />
+
+    <xsl:value-of select="concat($href, '&amp;start=',(($page -1) * $numPerPage), '&amp;rows=', $numPerPage)" />
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xslt/response-mir.xsl
similarity index 93%
rename from mir-module/src/main/resources/xsl/response-mir.xsl
rename to mir-module/src/main/resources/xslt/response-mir.xsl
index c8db2a19bb..1cadeca287 100644
--- a/mir-module/src/main/resources/xsl/response-mir.xsl
+++ b/mir-module/src/main/resources/xslt/response-mir.xsl
@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-  xmlns:decoder="xalan://java.net.URLDecoder"
-  xmlns:encoder="xalan://java.net.URLEncoder"
-  xmlns:exslt="http://exslt.org/common"
-  xmlns:mcracl="xalan://org.mycore.access.MCRAccessManager"
-  xmlns:mcractionmapping="xalan://org.mycore.wfc.actionmapping.MCRURLRetriever"
-  xmlns:mcrbasket="xalan://org.mycore.frontend.basket.MCRBasketManager"
-  xmlns:mcri18n="xalan://org.mycore.services.i18n.MCRTranslation"
-  xmlns:mcrxml="xalan://org.mycore.common.xml.MCRXMLFunctions"
-  xmlns:str="http://exslt.org/strings"
+<xsl:stylesheet version="3.0"
+  xmlns:mcracl="http://www.mycore.de/xslt/acl"
+  xmlns:mcractionmapping="http://www.mycore.de/xslt/actionmapping"
+  xmlns:mcrclassification="http://www.mycore.de/xslt/classification"
+  xmlns:mcri18n="http://www.mycore.de/xslt/i18n"
+  xmlns:mcrlayoututils="http://www.mycore.de/xslt/layoututils"
+  xmlns:mcrurl="http://www.mycore.de/xslt/url"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="decoder encoder exslt mcracl mcractionmapping mcrbasket mcri18n mcrxml str">
+  exclude-result-prefixes="#all">
 
   <xsl:import href="xslImport:badges" />
-  <xsl:import href="resource:xsl/orcid/mir-orcid-user.xsl"/>
-  <xsl:include href="resource:xsl/orcid/mir-orcid-export-ui.xsl"/>
-  <xsl:include href="resource:xsl/orcid/mir-orcid-work.xsl"/>
-  <xsl:include href="resource:xsl/csl-export-gui.xsl" />
-  <xsl:include href="resource:xsl/response-facets.xsl"/>
-  <xsl:include href="resource:xsl/response-mir-utils.xsl" />
-
-  <xsl:param name="UserAgent" />
+  <xsl:import href="resource:xslt/orcid/mir-orcid-user.xsl"/>
+  <xsl:include href="resource:xslt/layout/mir-layout-utils.xsl" />
+  <xsl:include href="resource:xslt/orcid/mir-orcid-export-ui.xsl"/>
+  <xsl:include href="resource:xslt/orcid/mir-orcid-work.xsl"/>
+  <xsl:include href="resource:xslt/csl-export-gui.xsl" />
+  <xsl:include href="resource:xslt/response-facets.xsl"/>
+  <xsl:include href="resource:xslt/response-mir-utils.xsl" />
+
   <xsl:param name="MIR.testEnvironment" />
   <xsl:param name="MIR.Solr.Secondary.Search.RequestHandler.List" select="'find'" />
-  <xsl:param name="RequestURL" />
 
   <xsl:variable name="maxScore" select="//result[@name='response'][1]/@maxScore" />
 
@@ -53,7 +49,7 @@
               <xsl:value-of select="mcri18n:translate('results.oneObject')" />
             </xsl:when>
             <xsl:otherwise>
-              <xsl:value-of select="mcri18n:translate('results.nObjects',$hits)" />
+              <xsl:value-of select="mcri18n:translate-with-params('results.nObjects',$hits)" />
             </xsl:otherwise>
           </xsl:choose>
         </h1>
@@ -67,7 +63,7 @@
         <!-- check which SOLR RequestHandler is used, if the value is from the list of the -->
         <!-- $MIR.Solr.Secondary.Search.RequestHandler.List, then it shows the form with secondary search -->
         <xsl:variable name="isSolrSearchRequest">
-          <xsl:for-each select="str:tokenize($MIR.Solr.Secondary.Search.RequestHandler.List, ',')">
+          <xsl:for-each select="tokenize($MIR.Solr.Secondary.Search.RequestHandler.List, ',') ! normalize-space(.)[. != '']">
             <xsl:variable name="handlerPattern" select="concat('/servlets/solr/', .)"/>
             <xsl:if test="contains($RequestURL, $handlerPattern)">
               <xsl:variable name="afterHandler" select="substring-after($RequestURL, $handlerPattern)"/>
@@ -285,9 +281,8 @@
                   </xsl:choose>
                 </xsl:variable>
 
-                <!-- Decode the current query -->
-                <xsl:variable name="decodedCurrentQryFromLastRequest"
-                              select="decoder:decode($currentQryFromLastRequest, 'UTF-8')" />
+                <xsl:variable name="currentQryFromLastRequestValue"
+                              select="string($currentQryFromLastRequest)" />
 
                 <!-- Get a type of the last request -->
                 <xsl:variable name="lastTypeRequest">
@@ -334,9 +329,9 @@
                           <xsl:when test="$initialCondQuery = '*' or $initialCondQuery = ''">
                             <xsl:value-of select="'*'" />
                           </xsl:when>
-                          <!-- Otherwise, concatenate $initialCondQuery, ' AND ' and $decodedCurrentQryFromLastRequest -->
+                          <!-- Otherwise, concatenate $initialCondQuery, ' AND ' and the current query value -->
                           <xsl:otherwise>
-                            <xsl:value-of select="concat($initialCondQuery, ' AND ', $decodedCurrentQryFromLastRequest)" />
+                            <xsl:value-of select="concat($initialCondQuery, ' AND ', $currentQryFromLastRequestValue)" />
                           </xsl:otherwise>
                         </xsl:choose>
                       </xsl:when>
@@ -354,7 +349,7 @@
 
                 <!-- Preparing the current query for the input field (remove all quotes) -->
                 <xsl:variable name="preparedCurrentQryFromLastRequest"
-                              select="translate($decodedCurrentQryFromLastRequest, '&quot;', '')" />
+                              select="translate($currentQryFromLastRequestValue, '&quot;', '')" />
                 <!-- Input element for the second search -->
                 <input class="form-control" id="qry" placeholder="{mcri18n:translate('mir.placeholder.response.search')}"
                        type="text" value="{$preparedCurrentQryFromLastRequest}" />
@@ -501,7 +496,8 @@
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <xsl:variable name="mods-genre-i18n" select="mcrxml:getDisplayName('mir_genres',$mods-genre)" />
+    <xsl:variable name="mods-genre-i18n"
+      select="mcrclassification:current-label-text(mcrclassification:category('mir_genres', $mods-genre))" />
     <xsl:variable name="hitItemClass">
       <xsl:choose>
         <xsl:when test="$hitNumberOnPage mod 2 = 1">
@@ -525,7 +521,7 @@
       <xsl:value-of select="concat($href, '&amp;start=',$startPosition, '&amp;fl=id&amp;rows=1&amp;origrows=', $rows, '&amp;XSL.Style=browse', $q)"/>
     </xsl:variable>
     <xsl:variable name="hitHref">
-      <xsl:value-of select="mcrxml:regexp($completeHref, '&amp;XSL.Transformer=response-resultlist', '')"/>
+      <xsl:value-of select="replace($completeHref, '&amp;XSL.Transformer=response-resultlist', '')"/>
     </xsl:variable>
 
     <!-- derivate variables -->
@@ -681,17 +677,23 @@
                   <!-- no link to no derivate -->
                 </xsl:when>
 
-                <xsl:when test="not(mcracl:checkDerivateDisplayPermission($derivid))">
+                <xsl:when test="not(mcracl:check-permission($derivid, 'read') or
+                 mcracl:check-permission($derivid, 'view'))">
                   <!-- no link if we can not read -->
                 </xsl:when>
 
                 <xsl:when test="$derivate/str[@name='iviewFile']">
                   <xsl:value-of select="concat($WebApplicationBaseURL, 'rsc/viewer/', $derivid,'/', $derivate/str[@name='iviewFile'])"/>
                 </xsl:when>
-                <xsl:when test="translate(str:tokenize($derivate/str[@name='derivateMaindoc'],'.')[position()=last()],'PDF','pdf') = 'pdf'">
-                  <xsl:variable name="filePath" select="concat($derivate/str[@name='id'],'/',mcrxml:encodeURIPath($derivate/str[@name='derivateMaindoc']))"/>
+                <xsl:when test="translate(tokenize(string(($derivate/str[@name='derivateMaindoc'])[1]), '\.')[last()],'PDF','pdf') = 'pdf'">
+                  <xsl:variable name="filePath"
+                    select="concat(
+                      $derivate/str[@name='id'],
+                      '/',
+                      string-join(tokenize(string(($derivate/str[@name='derivateMaindoc'])[1]), '/') ! encode-for-uri(.), '/')
+                    )"/>
                   <xsl:choose>
-                    <xsl:when test="mcrxml:isMobileDevice($UserAgent)">
+                    <xsl:when test="mcrlayoututils:is-mobile-device($UserAgent)">
                       <!-- for mobile users just show the file link -->
                       <xsl:value-of select="$derivifs"/>
                     </xsl:when>
@@ -727,7 +729,7 @@
               <xsl:choose>
                 <!-- when the thumbnail derivate has pdf as maindoc or a iviewFile, then use the iiif api -->
                 <xsl:when
-                        test="$displayDerivate/str[@name='iviewFile'] or translate(str:tokenize($displayDerivate/str[@name='derivateMaindoc'],'.')[position()=last()],'PDF','pdf') = 'pdf'">
+                        test="$displayDerivate/str[@name='iviewFile'] or translate(tokenize(string(($displayDerivate/str[@name='derivateMaindoc'])[1]), '\.')[last()],'PDF','pdf') = 'pdf'">
                   <div class="hit_icon">
                     <xsl:choose>
                       <xsl:when test="not($isGuestUser)">
@@ -834,7 +836,7 @@
                   </xsl:when>
                 </xsl:choose>
               </xsl:variable>
-              <xsl:for-each select="exslt:node-set($nameList)/arr/str[position() &lt;= 3]">
+              <xsl:for-each select="$nameList/arr/str[position() &lt;= 3]">
                 <xsl:if test="position()!=1">
                   <xsl:value-of select="' / '" />
                 </xsl:if>
@@ -859,7 +861,7 @@
                     <xsl:variable name="idType" select="$classi/label[@xml:lang='de']/@text" />
                     <xsl:variable name="nameQuery" select="concat('mods.nameIdentifier:', $nameIdentifierType, '\:', $nameIdentifier)" />
                     <a
-                      href="{$ServletsBaseURL}solr/mods_nameIdentifier?q={encoder:encode($nameQuery)}&amp;owner=createdby:{$owner}"
+                      href="{$ServletsBaseURL}solr/mods_nameIdentifier?q={replace(encode-for-uri($nameQuery), '%20', '+')}&amp;owner=createdby:{$owner}"
                       title="Suche nach allen Publikationen"
                     >
                       <xsl:value-of select="$author_name" />
@@ -878,7 +880,7 @@
                   </xsl:otherwise>
                 </xsl:choose>
               </xsl:for-each>
-              <xsl:if test="count(exslt:node-set($nameList)/arr/str) &gt; 3">
+              <xsl:if test="count($nameList/arr/str) &gt; 3">
                 <xsl:value-of select="' / et.al.'" />
               </xsl:if>
             </div>
@@ -991,27 +993,27 @@
     <xsl:param name="layout" select="'$'" />
     <xsl:param name="collection" select="''" />
     <xsl:choose>
-      <xsl:when test="mcrxml:resourceAvailable('actionmappings.xml')">
+      <xsl:when test="doc-available('resource:actionmappings.xml')">
       <!-- URL mapping enabled -->
         <xsl:variable name="url">
           <xsl:choose>
             <xsl:when test="string-length($collection) &gt; 0">
               <xsl:choose>
                 <xsl:when test="$layout = 'all'">
-                  <xsl:value-of select="mcractionmapping:getURLforCollection('update-xml',$collection,true())" />
+                  <xsl:value-of select="mcractionmapping:get-url-for-collection('update-xml',$collection,true())" />
                 </xsl:when>
                 <xsl:otherwise>
-                  <xsl:value-of select="mcractionmapping:getURLforCollection('update',$collection,true())" />
+                  <xsl:value-of select="mcractionmapping:get-url-for-collection('update',$collection,true())" />
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:when>
             <xsl:otherwise>
               <xsl:choose>
                 <xsl:when test="$layout = 'all'">
-                  <xsl:value-of select="mcractionmapping:getURLforID('update-xml',$id,true())" />
+                  <xsl:value-of select="mcractionmapping:get-url-for-id('update-xml',$id,true())" />
                 </xsl:when>
                 <xsl:otherwise>
-                  <xsl:value-of select="mcractionmapping:getURLforID('update',$id,true())" />
+                  <xsl:value-of select="mcractionmapping:get-url-for-id('update',$id,true())" />
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:otherwise>
@@ -1020,11 +1022,7 @@
         <xsl:choose>
           <xsl:when test="string-length($url)=0" />
           <xsl:otherwise>
-            <xsl:call-template name="UrlSetParam">
-              <xsl:with-param name="url" select="$url" />
-              <xsl:with-param name="par" select="'id'" />
-              <xsl:with-param name="value" select="$id" />
-            </xsl:call-template>
+            <xsl:value-of select="mcrurl:set-param($url, 'id', $id)" />
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
@@ -1046,7 +1044,7 @@
     <xsl:param name="classId" />
     <xsl:param name="i18nKey" />
     <div class="card">
-      <xsl:variable name="classiDocument" select="document(concat('xslStyle:items2options#xslt:classification:editor:-1:children:',$classId))" />
+      <xsl:variable name="classiDocument" select="document(concat('xslStyle:items2options:classification:editor:-1:children:',$classId))" />
       <div class="card-header" data-mcr-toggle="collapse-next">
         <h3 class="card-title">
           <xsl:value-of select="mcri18n:translate($i18nKey)" />
@@ -1094,7 +1092,7 @@
       </xsl:variable>
       <li>
         <xsl:call-template name="print.hyperLink">
-          <xsl:with-param name="href" select="mcrxml:regexp($filterHref,'(&amp;|%26)(start=)[0-9]*', '')" />
+          <xsl:with-param name="href" select="replace($filterHref,'(&amp;|%26)(start=)[0-9]*', '')" />
           <xsl:with-param name="text" select="@title" />
           <xsl:with-param name="class" select="'dropdown-item'" />
         </xsl:call-template>
@@ -1110,7 +1108,7 @@
     <xsl:if test="contains($RequestURL, $complete)">
       <xsl:variable name="filterHref">
         <xsl:value-of
-          select="mcrxml:regexp(concat(substring-before($RequestURL, $complete), substring-after($RequestURL, $complete)), '(&amp;|%26)(start=)[0-9]*', '')" />
+          select="replace(concat(substring-before($RequestURL, $complete), substring-after($RequestURL, $complete)), '(&amp;|%26)(start=)[0-9]*', '')" />
       </xsl:variable>
       <xsl:call-template name="print.hyperLink">
         <xsl:with-param name="href" select="$filterHref" />
@@ -1216,7 +1214,7 @@
     </xsl:variable>
 
     <xsl:choose>
-      <xsl:when test="mcrbasket:contains('objects',$identifier)">
+      <xsl:when test="exists(document(concat('basket:object:', $identifier))/entry/@uri)">
         <!-- remove from basket -->
         <a
           class="hit_option remove_from_basket {$dropdownclass}"
diff --git a/mir-module/src/main/resources/xsl/response-person.xsl b/mir-module/src/main/resources/xslt/response-person.xsl
similarity index 78%
rename from mir-module/src/main/resources/xsl/response-person.xsl
rename to mir-module/src/main/resources/xslt/response-person.xsl
index 9581028a5f..c4663a02b9 100644
--- a/mir-module/src/main/resources/xsl/response-person.xsl
+++ b/mir-module/src/main/resources/xslt/response-person.xsl
@@ -2,23 +2,18 @@
 <!DOCTYPE xsl:stylesheet [
   <!ENTITY html-output SYSTEM "xsl/xsl-output-html.fragment">
 ]>
-<xsl:stylesheet version="1.0"
-  xmlns:encoder="xalan://java.net.URLEncoder"
-  xmlns:mcri18n="xalan://org.mycore.services.i18n.MCRTranslation"
-  xmlns:mcrxml="xalan://org.mycore.common.xml.MCRXMLFunctions"
-  xmlns:xalan="http://xml.apache.org/xalan"
+<xsl:stylesheet version="3.0"
+  xmlns:mcracl="http://www.mycore.de/xslt/acl"
+  xmlns:mcri18n="http://www.mycore.de/xslt/i18n"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  exclude-result-prefixes="encoder mcri18n mcrxml xalan xsl">
+  exclude-result-prefixes="#all">
 
   &html-output;
-  <xsl:include href="resource:xsl/MyCoReLayout.xsl" />
-  <xsl:include href="resource:xsl/response-utils.xsl" />
+  <xsl:include href="resource:xslt/MyCoReLayout.xsl" />
+  <xsl:include href="resource:xslt/solr/response/response-utils.xsl" />
   <xsl:include href="xslInclude:solrResponse" />
 
-  <xsl:param name="WebApplicationBaseURL" />
-  <xsl:param name="MCR.Results.FetchHit" />
-
-  <xsl:decimal-format name="european" decimal-separator=',' grouping-separator='.' />
+  <xsl:decimal-format name="european" decimal-separator="," grouping-separator="." />
 
   <xsl:variable name="PageTitle">
     <xsl:value-of select="mcri18n:translate('component.solr.searchresult.resultList')" />
@@ -43,19 +38,18 @@
         <xsl:value-of select="mcri18n:translate('pindex.oneObject')" />
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="mcri18n:translate('pindex.nObjects',format-number($numFound, '###.###', 'european'))" />
+        <xsl:value-of
+          select="mcri18n:translate-with-params('pindex.nObjects', format-number($numFound, '###.###', 'european'))" />
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
 
-  <xsl:variable name="query" select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='terms.regex']" />
+  <xsl:variable name="termsRegex" select="/response/lst[@name='responseHeader']/lst[@name='params']/str[@name='terms.regex']" />
 
-  <!-- retain the original query parameters, for attaching them to a url -->
-  <xsl:variable name="params">
+  <xsl:variable name="retainedParams">
     <xsl:for-each select="./response/lst[@name='responseHeader']/lst[@name='params']/str[not(@name='start' or @name='rows')]">
-      <!-- parameterName=parameterValue -->
-      <xsl:value-of select="concat(@name,'=', encoder:encode(., 'UTF-8'))" />
-      <xsl:if test="not (position() = last())">
+      <xsl:value-of select="concat(@name, '=', replace(encode-for-uri(string(.)), '%20', '+'))" />
+      <xsl:if test="not(position() = last())">
         <xsl:value-of select="'&amp;'" />
       </xsl:if>
     </xsl:for-each>
@@ -82,15 +76,18 @@
         <xsl:when test="string-length($nameIdentifierAndType) &gt; 0">
           <xsl:variable name="nameIdentifier" select="substring-after($nameIdentifierAndType, ':')" />
           <xsl:variable name="nameIdentifierType" select="substring-before($nameIdentifierAndType, ':')" />
-          <xsl:variable name="classi" select="document(concat('classification:metadata:all:children:','nameIdentifier',':',$nameIdentifierType))/mycoreclass/categories/category[@ID=$nameIdentifierType]" />
+          <xsl:variable name="classi"
+            select="document(concat('classification:metadata:all:children:', 'nameIdentifier', ':', $nameIdentifierType))/mycoreclass/categories/category[@ID=$nameIdentifierType]" />
           <xsl:variable name="uri" select="$classi/label[@xml:lang='x-uri']/@text" />
           <xsl:variable name="idType" select="$classi/label[@xml:lang='de']/@text" />
           <xsl:variable name="nameQuery" select="concat('mods.nameIdentifier:', $nameIdentifierType, '\:', $nameIdentifier)" />
           <li>
-            <a href="{$ServletsBaseURL}solr/mods_nameIdentifier?q={encoder:encode($nameQuery)}&amp;owner=createdby:{$owner}" title="Suche nach allen Publikationen">
+            <a
+              href="{$ServletsBaseURL}solr/mods_nameIdentifier?q={replace(encode-for-uri($nameQuery), '%20', '+')}&amp;owner=createdby:{$owner}"
+              title="Suche nach allen Publikationen">
               <xsl:value-of select="$linkText" />
             </a>
-            <xsl:text>&#160;</xsl:text><!-- add whitespace here -->
+            <xsl:text>&#160;</xsl:text>
             <a href="{$uri}{$nameIdentifier}" title="Link zu {$idType}">
               <sup>
                 <xsl:value-of select="$idType" />
@@ -100,7 +97,8 @@
         </xsl:when>
         <xsl:otherwise>
           <li>
-            <a href="{$ServletsBaseURL}solr/mods_nameIdentifier?q=mods.name:&quot;{$linkText}&quot;&amp;owner=createdby:{$owner}" title="Suche nach allen Publikationen">
+            <a href="{$ServletsBaseURL}solr/mods_nameIdentifier?q=mods.name:&quot;{$linkText}&quot;&amp;owner=createdby:{$owner}"
+              title="Suche nach allen Publikationen">
               <xsl:value-of select="$linkText" />
             </a>
           </li>
@@ -150,10 +148,9 @@
             <xsl:choose>
               <xsl:when test="lst[@name='terms']/lst[@name='mods.pindexname']/int or
                               lst[@name='terms']/lst[@name='mods.pindexname.published']/int">
-                <!-- show results -->
                 <ul id="resultList">
                   <xsl:choose>
-                    <xsl:when test="mcrxml:isCurrentUserInRole('editor') or mcrxml:isCurrentUserInRole('admin')">
+                    <xsl:when test="mcracl:is-current-user-in-role('editor') or mcracl:is-current-user-in-role('admin')">
                       <xsl:apply-templates select="lst[@name='terms']/lst[@name='mods.pindexname']" />
                     </xsl:when>
                     <xsl:otherwise>
@@ -171,12 +168,12 @@
           <div class="col-md-4">
             <h3><xsl:value-of select="mcri18n:translate('browse.person.firstLetter')" /></h3>
             <ul class="names">
-              <xsl:for-each select="xalan:nodeset($a2z)/*">
+              <xsl:for-each select="$a2z/*">
                 <li>
-                  <xsl:if test="$query = @search">
+                  <xsl:if test="$termsRegex = @search">
                     <xsl:attribute name="class">active</xsl:attribute>
                   </xsl:if>
-                  <a href="{concat($proxyBaseURL,'?XSL.Style=person&amp;terms.regex=',@search)}">
+                  <a href="{concat($proxyBaseURL, '?XSL.Style=person&amp;terms.regex=', @search)}">
                     <xsl:value-of select="name()" />
                   </a>
                   <xsl:if test="position() != last()">
@@ -202,11 +199,11 @@
 
               <xsl:variable name="search_value">
                 <xsl:choose>
-                  <xsl:when test="xalan:nodeset($a2z)/*[@search=$query]">
+                  <xsl:when test="$a2z/*[@search=$termsRegex]">
                     <xsl:value-of select="''" />
                   </xsl:when>
                   <xsl:otherwise>
-                    <xsl:value-of select="$query" />
+                    <xsl:value-of select="$termsRegex" />
                   </xsl:otherwise>
                 </xsl:choose>
               </xsl:variable>
diff --git a/mir-module/src/main/resources/xslt/response-resultlist.xsl b/mir-module/src/main/resources/xslt/response-resultlist.xsl
new file mode 100644
index 0000000000..59b74acf1b
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/response-resultlist.xsl
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:output method="html" encoding="UTF-8" omit-xml-declaration="yes" />
+
+  <xsl:include href="resource:xslt/default-parameters.xsl" />
+  <xsl:include href="xslInclude:functions" />
+  <xsl:include href="resource:xslt/solr/response/response-utils.xsl" />
+  <xsl:include href="resource:xslt/response-mir.xsl" />
+
+  <xsl:variable name="PageTitle" select="''" />
+
+  <xsl:template match="/">
+    <xsl:for-each select="//response[@subresult='groupOwner']/result/doc">
+      <xsl:apply-templates select="." mode="resultList">
+        <xsl:with-param name="hitNumberOnPage" select="position()" />
+      </xsl:apply-templates>
+    </xsl:for-each>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/response2mycoreobject.xsl b/mir-module/src/main/resources/xslt/response2mycoreobject.xsl
new file mode 100644
index 0000000000..8c7c937d11
--- /dev/null
+++ b/mir-module/src/main/resources/xslt/response2mycoreobject.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="3.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  exclude-result-prefixes="#all">
+
+  <xsl:variable name="response" select="/response" />
+
+  <xsl:template match="/">
+    <xsl:variable name="normalResult" select="response/result/doc[1]" />
+    <xsl:variable name="groupedResult" select="response/lst[@name='grouped']/lst[@name='returnId']/arr[@name='groups']/lst/result/doc[1]" />
+    <xsl:apply-templates select="$normalResult | $groupedResult" />
+  </xsl:template>
+
+  <xsl:template match="doc">
+    <xsl:choose>
+      <xsl:when test="str[@name='returnId']">
+        <xsl:apply-templates select="document(concat('mcrobject:', str[@name='returnId']))" mode="attachResponse" />
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="document(concat('mcrobject:', str[@name='id']))" mode="attachResponse" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="/*" mode="attachResponse">
+    <xsl:copy>
+      <xsl:copy-of select="@* | node()" />
+      <xsl:copy-of select="$response" />
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>