diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc
index 77c715acd2..20a23ba92a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-strings.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- catalog-strings.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     /* Some required variables from the template */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc
index 7f1f6d7647..a3e68f4b11 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-widgets-marc21.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <div id="editor-widget-templates" style="display:none">
     <div id="widget-leader">
         Leader:&nbsp;<span title="Record length (autogenerated)">#####</span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
index 1a4ebc5f59..4b53919b83 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -1,4 +1,5 @@
 [% USE Koha %]
+[% USE raw %]
 [% PROCESS 'modal-claims.inc' %]
 [% INCLUDE 'format_price.inc' %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc
index b739f8ac4c..d087f3a334 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/format_price.inc
@@ -1,4 +1,5 @@
 [% USE Koha %]
+[% USE raw %]
 <!-- format-price.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     [%# This should use the Format template plugin, but not pushed yet %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal-strings.inc
index b718f2e34f..1d926c4360 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal-strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-modal-strings.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- ill-batch-table-strings.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var ill_batch_add = _("Add new batch");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-table-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-table-strings.inc
index 8f162a447d..6d825f220b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-table-strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-batch-table-strings.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- ill-batch-table-strings.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var ill_batch_borrower_details = _("View borrower details");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc
index 296b1fab51..402c4039e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table-strings.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- ill-list-table-strings.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var ill_borrower_details = _("View patron details");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/shared/custom_fields.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/shared/custom_fields.inc
index bfdc09d97d..509c2d6a43 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/shared/custom_fields.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/shared/custom_fields.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <fieldset class="rows">
     <legend>Custom fields</legend>
     <ol id="standard-fields">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc
index 3686945072..e07cd7d161 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- installer-strings.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var MSG_LETTERS_ONLY = _("Please only enter letters.");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc
index d19d727cf6..75dac28013 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-biblio-format.inc
@@ -1,4 +1,5 @@
-
+[% USE Koha %]
+[% USE raw %]
 <script nonce="[% Koha.CSPNonce | $raw %]">
     (function () {
         /**
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-get-age.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-get-age.inc
index d6b39c535c..5728b926ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-get-age.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-patron-get-age.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- js-patron-get-age.inc -->
 [% USE KohaDates %]
 <script nonce="[% Koha.CSPNonce | $raw %]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc
index 6c6bbc7bcd..2d54f016ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/last-borrower.inc
@@ -1,4 +1,5 @@
-
+[% USE Koha %]
+[% USE raw %]
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var showLastPatronCount = "[% Koha.Preference('showLastPatronCount') | html %]";
 </script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
index f652644bc3..324f8aa54b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -1,4 +1,5 @@
 [% USE Koha %]
+[% USE raw %]
 <!-- snippet for form to set borrower and patron category messaging preferences -->
 
 <input type="hidden" name="modify" value="yes" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc
index 106d39d55e..65e47f7fc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/password_check.inc
@@ -1,4 +1,5 @@
 [% USE Koha %]
+[% USE raw %]
 <!-- password_check.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var pwd_title = "";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/erm_sushi_harvester.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/erm_sushi_harvester.inc
index ca3e43b43d..6dceecda48 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/erm_sushi_harvester.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/erm_sushi_harvester.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- str/job_progress.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var REQUESTING_SUSHI = _("Requesting SUSHI service");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/import_from_kbart_file.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/import_from_kbart_file.inc
index 0dc59437e6..205efb82f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/import_from_kbart_file.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/import_from_kbart_file.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- str/job_progress.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var READING_FILE = _("Reading file");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/job_progress.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/job_progress.inc
index f604e63160..384312aac5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/job_progress.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/job_progress.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- str/job_progress.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var JOB_PROGRESS_NOT_STARTED = _("Not started");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc
index 60fb2fe1bc..f6918fca63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- str/tinymce_i18n.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     /* tinymce considers 'en' to be the default translation.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc
index 90264d622b..44090f6f0d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/validator-strings.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- validator-strings.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     $(document).ready(function () {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc
index bc58a8a758..382aef5b87 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950_search.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- z3950_search.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var interface = "[% interface | html %]";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
index a70e622f8b..dc849aeef3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 [% USE KohaDates %]
 
 [% IF enrollments %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
index 19d0a87cce..d12327954e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 [% USE AuthorisedValues %]
 
 <h1 id="heading"> Enroll in <em>[% club.name | html %]</em> </h1>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/custom_fields.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/custom_fields.inc
index 903df909c7..f5e1776d54 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/custom_fields.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/shared/custom_fields.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <ol id="standard-fields">
     [% keys = whole.value.other.custom_key.split('\0') %]
     [% values = whole.value.other.custom_value.split('\0') %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-biblio-format.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-biblio-format.inc
index d06a2ab0f6..907ca17c92 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-biblio-format.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-biblio-format.inc
@@ -1,4 +1,5 @@
-
+[% USE Koha %]
+[% USE raw %]
 <script nonce="[% Koha.CSPNonce | $raw %]">
     (function () {
         /**
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/password_check.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/password_check.inc
index 81e3b020f5..97ba6776ad 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/password_check.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/password_check.inc
@@ -1,4 +1,5 @@
 [% USE Koha %]
+[% USE raw %]
 <script nonce="[% Koha.CSPNonce | $raw %]">
     var pwd_title = "";
     var pattern_title = "";
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/validator-strings.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/validator-strings.inc
index d45abe00ff..cd3101cba9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/validator-strings.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/validator-strings.inc
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 <!-- validator-strings.inc -->
 <script nonce="[% Koha.CSPNonce | $raw %]">
     $(document).ready(function () {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
index 63ba2f6644..20d5d5c209 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 [% USE KohaDates %]
 
 [% IF enrollments %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
index 98ade5e625..42c2840ff1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt
@@ -1,3 +1,5 @@
+[% USE Koha %]
+[% USE raw %]
 [% USE AuthorisedValues %]
 
 <h2> Enroll in <em>[% club.name | html %]</em> </h2>