From 82453a8eabce4c224bdf054478270d20475c3641 Mon Sep 17 00:00:00 2001
From: Didier Gautheron <didier.gautheron@biblibre.com>
Date: Fri, 8 May 2020 15:19:54 +0200
Subject: [PATCH] Bug 25381: XSLTs should not define entities

Bug 23290 explicitly disabled entity expansion during XML parsing for security reasons.

However, many XSLTs define the following entity:
<!ENTITY nbsp "&#160;" >

They don't use the entity &nbsp, but its presence could lead to confusion.
---
 koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_007.xml            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21Languages.xsl             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl               | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl          | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl           | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1          | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl           | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl      | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl           | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl           | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2RDFDC.xsl           | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl            | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/compact.xsl                     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/identity.xsl                    | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl         | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/plainMARC.xsl                   | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21Languages.xsl            | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl      | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl     | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl            | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl     | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl    | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl           | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl     | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl    | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl           | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl                    | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/plainMARC.xsl                  | 2 +-
 misc/maintenance/generate_MARC21Languages.pl                         | 2 +-
 50 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml
index ae0a641aa0..f2640f2b6d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml
+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_006.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <Tagfield tag="006" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="./marc21_field_CF.xsd">
   <Material id="BKS"><name>Books</name><description></description>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_007.xml b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_007.xml
index fe956b357e..b493abb932 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_007.xml
+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_007.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <Tagfield tag="007" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="./marc21_field_CF.xsd">
   <Material id="MPS"><name>Maps</name><description></description>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
index 15ddc00fdd..bb643a5e49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <Tagfield tag="008" xmlns="http://koha-community.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="./marc21_field_CF.xsd">
   <Material id="BKS"><name>Books</name><description></description>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd
index be91f27bb8..3445618113 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd
+++ b/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_CF.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xs:schema xmlns="http://koha-community.org" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://koha-community.org" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
   <xs:annotation>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21Languages.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21Languages.xsl
index a0889a49f1..2ed41d0499 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21Languages.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21Languages.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <!-- This file generated by generate_MARC21Languages.pl -->
     <xsl:template name="languageCodeText">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl
index 1233d67f8c..92bcb62abe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
 	<xsl:import href="MARC21slimUtils.xsl"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl
index ade69de935..bf969eac66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl
index 8af36c9d2a..a7dc31e2e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MADS.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0" xmlns:mads="http://www.loc.gov/mads/v2"
     xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl
index 680bf10945..814562ca6b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:xlink="http://www.w3.org/TR/xlink" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns="http://www.loc.gov/mods/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
 	<xsl:include href="MARC21slimUtils.xsl"/>
     <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl
index d796f66728..1bc4205ac0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3-1.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="xlink marc">
 	<xsl:include href="MARC21slimUtils-MODS31.xsl"/>
 	<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl
index e040c76252..ab995cc4cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS3.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns="http://www.loc.gov/mods/v3" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="xlink marc">
 	<xsl:include href="MARC21slimUtils.xsl"/>
 	<xsl:output method="xml" indent="yes" encoding="UTF-8"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl
index a4cd457bf8..d0618d380b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS32.xsl
@@ -1,4 +1,4 @@
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet xmlns="http://www.loc.gov/mods/v3" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="xlink marc" version="1.0">
 	<xsl:include href="MARC21slimUtils.xsl"/>
 	<xsl:output encoding="UTF-8" indent="yes" method="xml"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl
index 36ba41f605..64905eca71 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
 	<xsl:import href="MARC21slimUtils.xsl"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl
index 922605bf36..503bd2c139 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
 	<xsl:import href="MARC21slimUtils.xsl"/>
     <xsl:output method="xml" indent="yes" encoding="UTF-8"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1 b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1
index d100a59fa8..f8b7ecd99f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl.1
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
 	<xsl:import href="MARC21slimUtils.xsl"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl
index 9d38ee10ec..a8a50c7576 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
 	<xsl:import href="MARC21slimUtils2.xsl"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl
index 009d8b1a1c..63fa07467a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2SRWDC.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:srw_dc="info:srw/schema/1/dc-schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
 	<xsl:import href="MARC21slimUtils.xsl"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index cd3a060472..18dbd0d651 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <!-- Edited: Bug 1807 [ENH] XSLT enhancements sponsored by bywater solutions 2015/01/19 WS wsalesky@gmail.com  -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
index be70b9abcb..8a7624bde0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl
index 1a10e8b5f5..d0c5ccddb1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim9522852.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl
index 5a8d6cc6ef..3708f9a0ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim"
 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
index 0e1f4a1e6b..ed6cd1c556 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl
index 8998b53fea..e5e8c200c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils2.xsl
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <!-- 8/19/04: ntra added "marc:" prefix to datafield element -->
 	<xsl:template name="datafield">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl
index 291ab06b96..a602611206 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">
 	<xsl:import href="MARC21slimUtils.xsl"/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
index 861488963e..4eb7ec1a4b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
index 0c8711765b..263b2472ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:items="http://www.koha-community.org/items"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
index e068fab616..0a51fc9906 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl
index 50681b43ad..28b4ca1123 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.w3.org/1999/xhtml"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
index f05d24dda7..6d24a87b78 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0" 
   xmlns:marc="http://www.loc.gov/MARC21/slim" 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2RDFDC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2RDFDC.xsl
index 27104b29bb..77e93cc046 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2RDFDC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2RDFDC.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet
  xmlns:marc="http://www.loc.gov/MARC21/slim"
  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
index 5f6e2b1782..79e5c86279 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
index 880668dbfd..5d0a06da15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index 0c4cf0f4a4..5cc3cff934 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/compact.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/compact.xsl
index 263b140a4d..6dd214a8a9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/compact.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/compact.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
   
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.w3.org/1999/xhtml"
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/identity.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/identity.xsl
index 2e0743ea22..98b7c59f99 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/identity.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/identity.xsl
@@ -1,4 +1,4 @@
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <!-- identity transformation -->
   <!-- Whenever you match any node or any attribute -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl
index dcf76e18c1..02c6236291 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/oilsMARC21slim2HTML.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="html" encoding="UTF-8"/>
 	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/plainMARC.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/plainMARC.xsl
index 84c2753d07..48af81c38d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/plainMARC.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/plainMARC.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="html" encoding="UTF-8"/>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21Languages.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21Languages.xsl
index a0889a49f1..2ed41d0499 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21Languages.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21Languages.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <!-- This file generated by generate_MARC21Languages.pl -->
     <xsl:template name="languageCodeText">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 21709f34d1..2d6e4bf282 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <!-- Edited: Bug 1807 [ENH] XSLT enhancements sponsored by bywater solutions 2015/01/19 WS wsalesky@gmail.com  -->
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index 339f058b70..9ea4b4707c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:items="http://www.koha-community.org/items"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
index 07b20dddbf..4da96d5b1d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl
index 28c770204d..b030cbc458 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl
index 534f51b1c2..ff2932d4bc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
 <xsl:stylesheet version="1.0"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl
index f06ee8130e..ec9358eef4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
index e5afad7c67..33d4ecba5b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
index 3279def752..7903696039 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl
index b14b93fdba..d7600a7f27 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl
index eaded8cdaa..cd70ceacf8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns="http://www.w3.org/1999/xhtml"
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/plainMARC.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/plainMARC.xsl
index fb8a07ed1c..df5ddab365 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/plainMARC.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/plainMARC.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
     <xsl:output method="html" encoding="UTF-8"/>
 
diff --git a/misc/maintenance/generate_MARC21Languages.pl b/misc/maintenance/generate_MARC21Languages.pl
index 2394ada38e..e658c54e18 100755
--- a/misc/maintenance/generate_MARC21Languages.pl
+++ b/misc/maintenance/generate_MARC21Languages.pl
@@ -87,7 +87,7 @@ sub generate_header {
     my ($file_handle) = @_;
     print {$file_handle} <<"HEADER";
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+<!DOCTYPE stylesheet>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <!-- This file generated by generate_MARC21Languages.pl -->
     <xsl:template name="languageCodeText">
-- 
2.11.0