diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptBiblioitem.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptBiblioitem.tmpl
index d2df1e918c..5a62d5b6fc 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptBiblioitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptBiblioitem.tmpl
@@ -3,56 +3,56 @@
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<a href=$ENV{'SCRIPT_NAME'}?file=$file>New Record</a> | <a href=marcimport.pl>New File</a><br>
-<!-- TMPL_IF name="BIBLIO_EXISTS" -->
-	<table border=0 width=50% cellpadding=10 cellspacing=0>
+<a href="$ENV{'SCRIPT_NAME'}?file=$file">New Record</a> | <a href="marcimport.pl">New File</a><br>
+<!-- TMPL_IF NAME="BIBLIO_EXISTS" -->
+	<table border="0" width="50%" cellpadding="10" cellspacing="0">
 		<tr>
-			<th background=/images/background-acq.gif>Record already in database
+			<th background="/images/background-acq.gif">Record already in database
 			</th>
 		</tr>
 		<tr>
 			<td bgcolor="#dddddd">
-				<!-- TMPL_VAR name="title" --> is already in the database with 
-				biblionumber <!-- TMPL_VAR name="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR name="biblioitemnumber" -->
+				<!-- TMPL_VAR NAME="title" --> is already in the database with 
+				biblionumber <!-- TMPL_VAR NAME="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" -->
 			  </td>
 		</tr>
 	</table>
 	<p>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="BIBLIO_CREATE" -->
-    <table cellpadding=10 cellspacing=0 border=0 width=50%>
+<!-- TMPL_IF NAME="BIBLIO_CREATE" -->
+    <table cellpadding="10" cellspacing="0" border="0" width="50%">
 		<tr>
-			<th background=/images/background-acq.gif>Record entered into database</th>
+			<th background="/images/background-acq.gif">Record entered into database</th>
 		</tr>
 		<tr>
-			<td bgcolor=#dddddd>
-				<!-- TMPL_VAR name="title" -->has been entered into the database with biblionumber
-				<!-- TMPL_VAR name="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR name="biblioitemnumber" --></td>
+			<td bgcolor="#dddddd">
+				<!-- TMPL_VAR NAME="title" -->has been entered into the database with biblionumber
+				<!-- TMPL_VAR NAME="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" --></td>
 		</tr>
 	  </table>
 <!-- /TMPL_IF -->
-    <table border=0 cellpadding=10 cellspacing=0>
-      <tr><th background=/images/background-acq.gif>
-	Add a New Item for <!-- TMPL_VAR name="title" -->
+    <table border="0" cellpadding="10" cellspacing="0">
+      <tr><th background="/images/background-acq.gif">
+	Add a New Item for <!-- TMPL_VAR NAME="title" -->
       </th></tr>
-      <tr><td bgcolor=#dddddd>
+      <tr><td bgcolor="#dddddd">
       <form>
-        <input type=hidden name=newitem value=1>
-        <input type=hidden name=biblionumber value="<!-- TMPL_VAR name="biblionumber" -->">
-        <input type=hidden name=biblioitemnumber value="<!-- TMPL_VAR name="biblioitemnumber" -->">
-        <input type=hidden name=file value="<!-- TMPL_VAR name="file" -->">
-        <table border=0>
-          <tr><td>BARCODE</td><td><input name=barcode size=10 value="<!-- TMPL_VAR name="barcode" -->">
-          Home Branch: <select name=homebranch><!-- TMPL_VAR name="branchselect" --></select>
+        <input type="hidden" name="newitem" value="1">
+        <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+        <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+        <input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
+        <table border="0">
+          <tr><td>BARCODE</td><td><input name="barcode" size="10" value="<!-- TMPL_VAR NAME="barcode" -->">
+          Home Branch: <select name="homebranch"><!-- TMPL_VAR NAME="branchselect" --></select>
 	  </td></tr>
           <tr><td>Replacement Price:</td>
-	  <td><input name=replacementprice size=10></td></tr>
+	  <td><input name="replacementprice" size="10"></td></tr>
           <tr><td>Notes</td>
-	  <td><textarea name=notes rows=4 cols=40 wrap=physical></textarea>
+	  <td><textarea name="notes" rows="4" cols="40" wrap="physical"></textarea>
 	  </td></tr>
         </table>
         <p>
-        <input type=submit value="Add Item">
+        <input type="submit" value="Add Item">
       </form>
       </td></tr>
     </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl
index 2e51f09a3d..5319c43cb2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptItemCopy.tmpl
@@ -1,15 +1,15 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <center>
-<!-- TMPL_IF name="BARCODE_EXISTS" -->
-	<font color=red>Barcode <b><!-- TMPL_VAR name="barcode" --></b> has already been assigned.</font><p>
+<!-- TMPL_IF NAME="BARCODE_EXISTS" -->
+	<font color="red">Barcode <b><!-- TMPL_VAR NAME="barcode" --></b> has already been assigned.</font><p>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="ITEM_ERROR" -->
-	<font color=red>Error : <!-- TMPL_VAR name="error" --></font><p>
+<!-- TMPL_IF NAME="ITEM_ERROR" -->
+	<font color="red">Error : <!-- TMPL_VAR NAME="error" --></font><p>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="ITEM_CREATED" -->
-	<table border=1 align=center cellpadding=10>
-		<tr><td bgcolor=yellow>
-			Item added with barcode <!-- TMPL_VAR name="barcode" -->
+<!-- TMPL_IF NAME="ITEM_CREATED" -->
+	<table border="1" align="center" cellpadding="10">
+		<tr><td bgcolor="yellow">
+			Item added with barcode <!-- TMPL_VAR NAME="barcode" -->
 		</td></tr>
 	</table>
 <!-- /TMPL_IF -->
@@ -18,10 +18,10 @@
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<li><a href=$ENV{'SCRIPT_NAME'}?menu=z3950>Z39.50 Search</a>
+<li><a href="$ENV{'SCRIPT_NAME'}?menu=z3950">Z39.50 Search</a>
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<li><a href=$ENV{'SCRIPT_NAME'}?menu=uploadmarc>Upload MARC Records</a>
+<li><a href="$ENV{'SCRIPT_NAME'}?menu=uploadmarc">Upload MARC Records</a>
 </ul>
 <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl
index bddbeb6a2f..1b36ed25ef 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/AcceptMarcUpload.tmpl
@@ -1,38 +1,38 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<h1><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->>Main Menu</a></h1>
+<h1><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->">Main Menu</a></h1>
 <h2>Select a set of MARC records</h2>
 <ul>
-<!-- TMPL_LOOP name="marc" -->
-	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="id" -->&menu=<!-- TMPL_VAR name="menu" -->><!-- TMPL_VAR name="name" --></a></li>
+<!-- TMPL_LOOP NAME="marc" -->
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="id" -->&amp;menu=<!-- TMPL_VAR NAME="menu" -->"><!-- TMPL_VAR NAME="name" --></a></li>
 <!-- /TMPL_LOOP -->
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Z39.50 Search</a>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Upload MARC Records</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">Z39.50 Search</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Upload MARC Records</a>
 </ul>
 </ul>
 <p>
-<table border=1 bgcolor=#dddddd>
-	<tr><th bgcolor=#bbbbbb colspan=2>
+<table border="1" bgcolor="#dddddd">
+	<tr><th bgcolor="#bbbbbb" colspan="2">
 		Upload a set of MARC records</th>
 	</tr>
 	<tr>
 		<td>Upload a set of MARC records:</td>
 		<td>
-			<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR name="menu" -->" enctype="multipart/form-data">
-			<input type="file" name="uploadmarc"/>
+			<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR NAME="menu" -->" enctype="multipart/form-data">
+			<input type="file" name="uploadmarc" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input type=hidden name=menu value="<!-- TMPL_VAR name="menu" -->">
+			<input type="hidden" name="menu" value="<!-- TMPL_VAR NAME="menu" -->">
 			Name this set of MARC records:
 		</td>
 		<td>
-			<input type=text name=name>
+			<input type="text" name="name">
 		</td>
 	</tr>
 	<tr>
-		<td colspan=2 align=center>
-			<input type=submit>
+		<td colspan="2" align="center">
+			<input type="submit">
 		</td>
 	</tr>
 </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl
index 46b14c69ac..498c8c27c7 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/ListFileRecords.tmpl
@@ -1,50 +1,50 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <h1>Main Menu</h1>
 <ul>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Z39.50 Search</a>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Upload MARC Records</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">Z39.50 Search</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Upload MARC Records</a>
 </ul>
 <center>
 <p>
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<a href=$ENV{'SCRIPT_NAME'}?menu=$menu>Select a New File</a>
+<a href="$ENV{'SCRIPT_NAME'}?menu=$menu">Select a New File</a>
 <p>
-<!-- TMPL_IF name="IS_MARC" -->
-	<table border=0 cellpadding=10 cellspacing=0>
+<!-- TMPL_IF NAME="IS_MARC" -->
+	<table border="0" cellpadding="10" cellspacing="0">
 	<tr>
-		<th background=/images/background-acq.gif>
-		 	Select a Record to Import from <!-- TMPL_VAR name="recordsource" -->
+		<th background="/images/background-acq.gif">
+		 	Select a Record to Import from <!-- TMPL_VAR NAME="recordsource" -->
 		</th>
 	</tr>
 	<tr>
-		<td bgcolor=#dddddd>
+		<td bgcolor="#dddddd">
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="IS_Z3950" -->
-<table border=0 cellpadding=10 cellspacing=0>
+<!-- TMPL_IF NAME="IS_Z3950" -->
+<table border="0" cellpadding="10" cellspacing="0">
 <tr>
-		<td bgcolor=#dddddd>
-		<!-- TMPL_IF name="HAS_NUMRECORDS" -->
-	            <a name=SERVER-<!-- TMPL_VAR name="srvid" -->></a> " <!-- TMPL_VAR name="srvname" -->
-		<font size=-1>[Viewing <!-- TMPL_VAR name="startrecord" --> to <!-- TMPL_VAR name="highest" --> of <!-- TMPL_VAR name="numrecords" --> records]  <!-- TMPL_VAR name="previous" --> | <!-- TMPL_VAR name="next" --> </font><br>
+		<td bgcolor="#dddddd">
+		<!-- TMPL_IF NAME="HAS_NUMRECORDS" -->
+	            <a name="SERVER-<!-- TMPL_VAR NAME="srvid" -->"></a> " <!-- TMPL_VAR NAME="srvname" -->
+		<font size="-1">[Viewing <!-- TMPL_VAR NAME="startrecord" --> to <!-- TMPL_VAR NAME="highest" --> of <!-- TMPL_VAR NAME="numrecords" --> records]  <!-- TMPL_VAR NAME="previous" --> | <!-- TMPL_VAR NAME="next" --> </font><br>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="PENDING" -->
-			<font color=red>Search still pending...</font>
+		<!-- TMPL_IF NAME="PENDING" -->
+			<font color="red">Search still pending...</font>
 		<!-- TMPL_ELSE -->
-			<font color=red>processing... <!-- TMPL_VAR name="elapsedtime" --></font>
+			<font color="red">processing... <!-- TMPL_VAR NAME="elapsedtime" --></font>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="NO_RECORDS" -->
-			<b>No results found for query <!-- TMPL_VAR name="id" --></b>
+		<!-- TMPL_IF NAME="NO_RECORDS" -->
+			<b>No results found for query <!-- TMPL_VAR NAME="id" --></b>
 		<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-	<!-- TMPL_LOOP name="LINES" -->
-<!--		<a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="file" -->&resultsid=<!-- TMPL_VAR name="resultsid" -->&<!-- TMPL_VAR name="searchfield" -->=<!-- TMPL_VAR name="searchvalue" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->&searchvalue=<!-- TMPL_VAR name="searchvalue" -->> -->
-		<a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="file" -->&numrecord=<!-- TMPL_VAR name="numrecord" -->>
-				<!-- TMPL_VAR name="title" -->
-				<!-- TMPL_VAR name="author" -->
+	<!-- TMPL_LOOP NAME="LINES" -->
+<!--		<a href=<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="file" -->&amp;resultsid=<!-- TMPL_VAR NAME="resultsid" -->&amp;<!-- TMPL_VAR NAME="searchfield" -->=<!-- TMPL_VAR NAME="searchvalue" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;searchvalue=<!-- TMPL_VAR NAME="searchvalue" -->> -->
+		<a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="file" -->&amp;numrecord=<!-- TMPL_VAR NAME="numrecord" -->">
+				<!-- TMPL_VAR NAME="title" -->
+				<!-- TMPL_VAR NAME="author" -->
 		</a>
-		<!-- TMPL_VAR name="donetext" --><br>
+		<!-- TMPL_VAR NAME="donetext" --><br>
 	<!-- /TMPL_LOOP -->
 </td>
 </tr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/mainmenu.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/mainmenu.tmpl
index 545f8785de..4755eae66c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/mainmenu.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/mainmenu.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <h1>Main Menu</h1>
 <ul>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Z39.50 Search</a>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Upload MARC Records</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">Z39.50 Search</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Upload MARC Records</a>
 </ul>
 <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl
index 20460dbdfe..596f095244 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl
@@ -1,60 +1,60 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<a href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>
-<img height=42  WIDTH=120 BORDER="0" src="/images/requests.gif" align="right" border="0"></a>
-<font SIZE=6><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
+<a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">
+<img height="42"  width="120" border="0" src="/images/requests.gif" align="right" border="0"></a>
+<font size="6"><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
 <!-- TMPL_VAR NAME="class" --></em></font><p>
 <!-- FIXME - "callpadding" should be "cellpadding", right? -->
 <table cellspacing="0" callpadding="5" border="1" align="left" width="220">
-<!-----------------old style RECORD TABLE--------->
+<!-- ---------------old style RECORD TABLE------- -->
 <center>
 <h1>New Record</h1>
 Full MARC Record available at bottom
-<form method=post>
-<table border=1>
-	<tr bgcolor="#dddddd"><td>Title</td><td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Subtitle</td><td><input type="text" name="subtitle" value="<!-- TMPL_VAR NAME="subtitle" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Author</td><td><input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Additional authors</td><td><textarea name="additionalauthors" rows=4 cols=20><!-- TMPL_VAR NAME="additionalauthors" --></textarea></td></tr>
-	<tr bgcolor="#dddddd"><td>Illustrator</td><td><input type="text" name="illustrator" value="<!-- TMPL_VAR NAME="illustrator" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Copyright</td><td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" size=20 maxlength=80></td></tr>
-	<tr bgcolor="#dddddd"><td>Series Title</td><td><input type="text" name="seriestitle" value="<!-- TMPL_VAR NAME="seriestitle" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Volume</td><td><input type="text" name="volume" value="<!-- TMPL_VAR NAME="volume" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Number</td><td><input type="text" name="number" value="<!-- TMPL_VAR NAME="number" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Volume Date</td><td><input type="text" name="volumedate" value="<!-- TMPL_VAR NAME="volumedate" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Volume Description</td><td><input type="text" name="volumedesc" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Subject</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Notes</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Item type</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
-	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size=40 maxlength=40></td></tr>
-	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size=40 maxlength=40></td></tr>
-	<tr bgcolor="#dddddd"><td>LCCN</td><td><input type="text" name="lccn" value="<!-- TMPL_VAR NAME="lccn" -->" size=40 maxlength=40></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Dewey</td><td><input type="text" name="dewey" value="<!-- TMPL_VAR NAME="dewey" -->" size=8 maxlength=10></td></tr>
-	<tr bgcolor="#dddddd"><td>Subclass</td><td><input type="text" name="subclass" value="<!-- TMPL_VAR NAME="subclass" -->" size=40 maxlength=40></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Publication Year</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size=5 maxlength=10></td></tr>
-	<tr bgcolor="#dddddd"><td>Publisher</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Place</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size=5 maxlength=10></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Size</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size=40 maxlength=40></td></tr>
+<form method="post">
+<table border="1">
+	<tr bgcolor="#dddddd"><td>Title</td><td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Subtitle</td><td><input type="text" name="subtitle" value="<!-- TMPL_VAR NAME="subtitle" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Author</td><td><input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Additional authors</td><td><textarea name="additionalauthors" rows="4" cols="20"><!-- TMPL_VAR NAME="additionalauthors" --></textarea></td></tr>
+	<tr bgcolor="#dddddd"><td>Illustrator</td><td><input type="text" name="illustrator" value="<!-- TMPL_VAR NAME="illustrator" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Copyright</td><td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" size="20" maxlength="80"></td></tr>
+	<tr bgcolor="#dddddd"><td>Series Title</td><td><input type="text" name="seriestitle" value="<!-- TMPL_VAR NAME="seriestitle" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Volume</td><td><input type="text" name="volume" value="<!-- TMPL_VAR NAME="volume" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Number</td><td><input type="text" name="number" value="<!-- TMPL_VAR NAME="number" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Volume Date</td><td><input type="text" name="volumedate" value="<!-- TMPL_VAR NAME="volumedate" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Volume Description</td><td><input type="text" name="volumedesc" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Subject</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Notes</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Item type</td><td><select name="itemtype">$itemtypeselect</select></td></tr>
+	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#dddddd"><td>LCCN</td><td><input type="text" name="lccn" value="<!-- TMPL_VAR NAME="lccn" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Dewey</td><td><input type="text" name="dewey" value="<!-- TMPL_VAR NAME="dewey" -->" size="8" maxlength="10"></td></tr>
+	<tr bgcolor="#dddddd"><td>Subclass</td><td><input type="text" name="subclass" value="<!-- TMPL_VAR NAME="subclass" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Publication Year</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size="5" maxlength="10"></td></tr>
+	<tr bgcolor="#dddddd"><td>Publisher</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Place</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size="5" maxlength="10"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Size</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size="40" maxlength="40"></td></tr>
 </table>
-<input type=submit>
-<input type="hidden" name="insertnewrecord" value=1>
-<!-- <input type="hidden" name="origisbn" value="<!-- TMPL_VAR name="qisbn" -->">
-<input type="hidden" name="origissn" value="<!-- TMPL_VAR name="qissn" -->">
-<input type="hidden" name="origlccn" value="<!-- TMPL_VAR name="qlccn" -->">
-<input type="hidden" name="origcontrolnumber" value="<!-- TMPL_VAR name="qcontrolnumber" -->"> -->
-<input type="hidden" name="file" value="<!-- TMPL_VAR name="file" -->">
-<input type="hidden" name="numrecord" value="<!-- TMPL_VAR name="numrecord" -->">
+<input type="submit">
+<input type="hidden" name="insertnewrecord" value="1">
+<!-- <input type="hidden" name="origisbn" value="<!-- TMPL_VAR NAME="qisbn" -->">
+<input type="hidden" name="origissn" value="<!-- TMPL_VAR NAME="qissn" -->">
+<input type="hidden" name="origlccn" value="<!-- TMPL_VAR NAME="qlccn" -->">
+<input type="hidden" name="origcontrolnumber" value="<!-- TMPL_VAR NAME="qcontrolnumber" -->"> -->
+<input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
+<input type="hidden" name="numrecord" value="<!-- TMPL_VAR NAME="numrecord" -->">
 </form>
 
 <!-- MARC RECORD -->
-<table width=100% cellspacing=1 cellpading=1>
-<th colspan=4 background="/images/background-acq.gif">MARC RECORD</th>
-<!-- TMPL_LOOP name="MARC" -->
-<tr bgcolor="<!-- TMPL_VAR name="color" -->">
-	<td width=5% align="right"><b><!-- TMPL_VAR name="tagid" --></b>&nbsp;</td>
-	<td width=3% align="right"><b><!-- TMPL_VAR name="subfield" --></b>&nbsp;</td>
-	<td width=48%><!-- TMPL_VAR name="tagmean" -->&nbsp;</td>
-	<td width=45% bgcolor="<!-- TMPL_VAR name="color" -->"><!-- TMPL_VAR name="tagvalue" -->&nbsp;</td>
+<table width="100%" cellspacing="1" cellpadding="1">
+<th colspan="4" background="/images/background-acq.gif">MARC RECORD</th>
+<!-- TMPL_LOOP NAME="MARC" -->
+<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+	<td width="5%" align="right"><b><!-- TMPL_VAR NAME="tagid" --></b>&nbsp;</td>
+	<td width="3%" align="right"><b><!-- TMPL_VAR NAME="subfield" --></b>&nbsp;</td>
+	<td width="48%"><!-- TMPL_VAR NAME="tagmean" -->&nbsp;</td>
+	<td width="45%" bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="tagvalue" -->&nbsp;</td>
 <tr>
 <!-- /TMPL_LOOP -->
 </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/marcimport/uploadmarc.tmpl b/koha-tmpl/intranet-tmpl/default/en/marcimport/uploadmarc.tmpl
index cf0af8b1bc..40c2a14bc9 100644
--- a/koha-tmpl/intranet-tmpl/default/en/marcimport/uploadmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/marcimport/uploadmarc.tmpl
@@ -1,38 +1,38 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<h1><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->>Main Menu</a></h1>
+<h1><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->">Main Menu</a></h1>
 <ul>
-	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Z39.50 Search</a>
-	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Upload MARC Records</a>
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">Z39.50 Search</a>
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Upload MARC Records</a>
 </ul>
 <h2>Select a set of MARC records</h2><ul>
-<!-- TMPL_LOOP name="marc" -->
-	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="id" -->&menu=<!-- TMPL_VAR name="menu" -->><!-- TMPL_VAR name="name" --></a></li>
+<!-- TMPL_LOOP NAME="marc" -->
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="id" -->&amp;menu=<!-- TMPL_VAR NAME="menu" -->"><!-- TMPL_VAR NAME="name" --></a></li>
 <!-- /TMPL_LOOP -->
 </ul>
 <p>
-<table border=1 bgcolor=#dddddd>
-	<tr><th bgcolor=#bbbbbb colspan=2>
+<table border="1" bgcolor="#dddddd">
+	<tr><th bgcolor="#bbbbbb" colspan="2">
 		Upload a set of MARC records</th>
 	</tr>
 	<tr>
 		<td>Upload a set of MARC records:</td>
 		<td>
-			<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR name="menu" -->" enctype="multipart/form-data">
-			<input type="file" name="uploadmarc"/>
+			<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR NAME="menu" -->" enctype="multipart/form-data">
+			<input type="file" name="uploadmarc" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input type=hidden name=menu value=<!-- TMPL_VAR name="menu" -->>
+			<input type="hidden" name="menu" value=<!-- TMPL_VAR NAME="menu" -->>
 			Name this set of MARC records:
 		</td>
 		<td>
-			<input type=text name=name>
+			<input type="text" name="name">
 		</td>
 	</tr>
 	<tr>
-		<td colspan=2 align=center>
-			<input type=submit>
+		<td colspan="2" align="center">
+			<input type="submit">
 		</td>
 	</tr>
 </table>