diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt
index 10c8408320..b48869e23d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tt
@@ -1,3 +1,4 @@
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>UNIMARC field 123a builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -30,17 +31,17 @@
 </table>
 <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script type="text/javascript">
-//<![CDATA[
-function report() {
-	    var doc   = opener.document; 
+
+[% MACRO jsinclude BLOCK %]
+    <script type="text/javascript">
+        function report() {
+            var doc   = opener.document;
             var field = doc.getElementById("[% index %]");
             field.value =  document.f_pop.f1.value;
-	    self.close();
-	    return false;
-	}
-//]]>
-</script>
+            self.close();
+            return false;
+        }
+    </script>
+[% END %]
 
-
-[% INCLUDE 'popup-bottom.inc' %]
+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tt
index 90cdd6aaa0..54cb77f177 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tt
@@ -1,3 +1,4 @@
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>UNIMARC field 123d builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -46,9 +47,10 @@
 </table>
 <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script type="text/javascript">
-//<![CDATA[
-	function report() {
+
+[% MACRO jsinclude BLOCK %]
+    <script type="text/javascript">
+        function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
             document.f_pop.f4.value=document.f_pop.f4.value+'  ';
@@ -56,14 +58,13 @@
             document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
             document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
 
-            var doc   = opener.document; 
+            var doc   = opener.document;
             var field = doc.getElementById("[% index %]");
-        
             field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-	    window.close();
-	    return false;
-	}
-//]]>
-</script>
+            window.close();
+            return false;
+        }
+    </script>
+[% END %]
 
-[% INCLUDE 'popup-bottom.inc' %]
+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tt
index 7fc52dd792..ea2cf43d3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tt
@@ -1,3 +1,4 @@
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>UNIMARC field 123e builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -46,9 +47,10 @@
 </table>
 <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script type="text/javascript">
-//<![CDATA[
-	function report() {
+
+[% MACRO jsinclude BLOCK %]
+    <script type="text/javascript">
+        function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
             document.f_pop.f4.value=document.f_pop.f4.value+'  ';
@@ -56,14 +58,14 @@
             document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
             document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
 
-            var doc   = opener.document; 
+            var doc   = opener.document;
             var field = doc.getElementById("[% index %]");
-        
-            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-	    window.close();
-	    return false;
-	}
-//]]>
-</script>
 
-[% INCLUDE 'popup-bottom.inc' %]
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
+            window.close();
+            return false;
+        }
+    </script>
+[% END %]
+
+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tt
index 8a87afaa28..bb0d414661 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tt
@@ -1,3 +1,4 @@
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>UNIMARC field 123f builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -46,9 +47,10 @@
 </table>
 <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script type="text/javascript">
-//<![CDATA[
-	function report() {
+
+[% MACRO jsinclude BLOCK %]
+    <script type="text/javascript">
+        function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
             document.f_pop.f4.value=document.f_pop.f4.value+'  ';
@@ -56,14 +58,14 @@
             document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
             document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
 
-            var doc   = opener.document; 
+            var doc   = opener.document;
             var field = doc.getElementById("[% index %]");
-        
-            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-	    window.close();
-	    return false;
-	}
-//]]>
-</script>
 
-[% INCLUDE 'popup-bottom.inc' %]
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
+            window.close();
+            return false;
+        }
+    </script>
+[% END %]
+
+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tt
index 0eb1cf90f9..d256865ce1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tt
@@ -1,3 +1,4 @@
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>UNIMARC field 123g builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -46,9 +47,10 @@
 </table>
 <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script type="text/javascript">
-//<![CDATA[
-	function report() {
+
+[% MACRO jsinclude BLOCK %]
+    <script type="text/javascript">
+        function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
             document.f_pop.f4.value=document.f_pop.f4.value+'  ';
@@ -56,14 +58,14 @@
             document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
             document.f_pop.f4.value=document.f_pop.f4.value.substring(0,2);
 
-            var doc   = opener.document; 
+            var doc   = opener.document;
             var field = doc.getElementById("[% index %]");
-        
-            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-	    window.close();
-	    return false;
-	}
-//]]>
-</script>
 
-[% INCLUDE 'popup-bottom.inc' %]
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
+            window.close();
+            return false;
+        }
+    </script>
+[% END %]
+
+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123i_j.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123i_j.tt
index 898953da62..41381a46bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123i_j.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123i_j.tt
@@ -1,3 +1,4 @@
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>UNIMARC field 123i/j builder</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -36,22 +37,23 @@
 </table>
 <fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script type="text/javascript">
-//<![CDATA[
-    function report() {
-        var f2= "000" + document.f_pop.f2.value;
-        f2 = f2.substring(f2.length-3);
-        var f3= "00" + document.f_pop.f3.value;
-        f3 = f3.substring(f3.length-2);
-        var f4= "00" + document.f_pop.f4.value;
-        f4 = f4.substring(f4.length-2);
-        var doc   = opener.document;
-        var field = doc.getElementById("[% index %]");
-        field.value =  document.f_pop.f1.value+ f2 + f3 + f4;
-        window.close();
-        return false;
-    }
-//]]>
-</script>
 
-[% INCLUDE 'popup-bottom.inc' %]
+[% MACRO jsinclude BLOCK %]
+    <script type="text/javascript">
+        function report() {
+            var f2= "000" + document.f_pop.f2.value;
+            f2 = f2.substring(f2.length-3);
+            var f3= "00" + document.f_pop.f3.value;
+            f3 = f3.substring(f3.length-2);
+            var f4= "00" + document.f_pop.f4.value;
+            f4 = f4.substring(f4.length-2);
+            var doc   = opener.document;
+            var field = doc.getElementById("[% index %]");
+            field.value =  document.f_pop.f1.value+ f2 + f3 + f4;
+            window.close();
+            return false;
+        }
+    </script>
+[% END %]
+
+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]