diff --git a/koha-tmpl/intranet-tmpl/default/en/about.tmpl b/koha-tmpl/intranet-tmpl/default/en/about.tmpl
index 9892630e2c..d591b32b25 100644
--- a/koha-tmpl/intranet-tmpl/default/en/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/about.tmpl
@@ -1,30 +1,29 @@
-<!-- TMPL_INCLUDE name="about-top.inc" -->
+<!-- TMPL_INCLUDE NAME="about-top.inc" -->
 
 <div id="mainbloc">
-	<!-- TMPL_VAR NAME=about -->
+	<!-- TMPL_VAR NAME="about" -->
 	
 	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
-	<center>
-	<table>
+	<table align="center">
 		<tr>
-			<td width=25%>Koha version:</td>
-			<td><!-- TMPL_VAR ESCAPE=HTML NAME=kohaVersion --></td>
+			<td width="25%">Koha version:</td>
+			<td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td>
 		</tr>
 		<tr>
 			<td>OS version (from 'uname -a'):</td>
-			<td><!-- TMPL_VAR ESCAPE=HTML NAME=osVersion --></td>
+			<td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td>
 		</tr>
 		<tr>
 			<td>Perl version:</td>
-			<td><!-- TMPL_VAR ESCAPE=HTML NAME=perlVersion --></td>
+			<td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td>
 		</tr>
 		<tr>
 			<td>MySQL version:</td>
-			<td><!-- TMPL_VAR ESCAPE=HTML NAME=mysqlVersion --></td>
+			<td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td>
 		</tr>
 		<tr>
 			<td>Apache version:</td>
-			<td><!-- TMPL_VAR ESCAPE=HTML NAME=apacheVersion --></td>
+			<td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td>
 		</tr>
 		<tr>
 			<td>Credits</td>
@@ -35,11 +34,11 @@
 						<td width="50%">
 							<b>Pat Eyler</b>, Kaitiaki<br/>
 							<b>Paul Poulain</b>, 2.2 release manager (MARC developper)<br/>
-							Joshua Ferraro & the <b>Nelsonville Public Library</b> (MARC features funders)<br/>
+							Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features funders)<br/>
 							<b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)<br/>
 							Nicholas Rosasco, (Documentation Compiler)<br/>
 							Mike Hansen<br/>
-							MJ Ray and <b>Turo Technology LLP</b>, England (quality control, installer & updater, 2.0 release maintainer)<br/>
+							MJ Ray and <b>Turo Technology LLP</b>, England (quality control, installer &amp; updater, 2.0 release maintainer)<br/>
 							Nicolas Morin, French Translation<br/>
 						</td>
 						<td width="50%" valign="top">
@@ -53,7 +52,7 @@
 					</tr>
 				</table>
 				<h2>Thanks to</h2>
-				<table width=100%>
+				<table width="100">
 					<tr>
 						<td width="33%">
 							Adam Thick<br/>
@@ -95,6 +94,5 @@
 			</td>
 		</tr>
 	</table>
-	</center>
 </div>
-<!-- TMPL_INCLUDE name="about-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="about-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/auth.tmpl b/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
index d6814b783f..3473e99bcf 100644
--- a/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/auth.tmpl
@@ -24,13 +24,12 @@
 <!-- TMPL_IF NAME="loginprompt" -->
 <!-- login prompt time-->
 
-<center>
 
-<form action='<!-- TMPL_VAR NAME="url" -->' method="post">
+<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
 <!-- TMPL_LOOP NAME="INPUTS" -->
-  <input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->'>
+  <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
 <!-- /TMPL_LOOP -->
-<table border="0" cellpadding="10" cellspacing="0" width="60%">
+<table border="0" cellpadding="10" cellspacing="0" width="60%" align="center">
     <tr><td align="center" valign="top">
 
     <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
diff --git a/koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl b/koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl
index 5a6ca19e23..63305ede0c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl
@@ -1,40 +1,36 @@
 <!-- TMPL_INCLUDE Name="reports-top.inc" -->
-<CENTER>
-<br>
-<h1>
-<a href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="bib" -->&type="intra"> <!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</a></h1><P>
-<p>
+<h1><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="bib" -->&amp;type=intra"> <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a></h1><p>&nbsp;</p>
 
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 width=440 >
-	<TR VALIGN=TOP>
-		<TD  bgcolor="99cc33" background="/images/background-mem.gif">
-			<B>BARCODE <!-- TMPL_VAR Name="barcode" --></B>
-		</TD>
-	</TR>
-	<TR VALIGN=TOP  >
-		<TD width=440 >
+<table  cellspacing="0"  cellpadding="5" border="1" width="440">
+	<tr valign="top">
+		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
+			<b>BARCODE <!-- TMPL_VAR NAME="barcode" --></b>
+		</td>
+	</tr>
+	<tr valign="top">
+		<td width="440">
 
-		<b>Home Branch: </b> <!-- TMPL_VAR Name="homebranch" --> <br>
-		<b>Current Branch: </b> <!-- TMPL_VAR Name="holdingbranch" --><br>
-		<b>Date arrived at current branch: </b> <!-- TMPL_VAR Name="lastdate" --> <br>
-		<b>Number of issues since the above date:</b> <!-- TMPL_VAR Name="count" --> <br>
+		<b>Home Branch: </b> <!-- TMPL_VAR NAME="homebranch" --> <br>
+		<b>Current Branch: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+		<b>Date arrived at current branch: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>
+		<b>Number of issues since the above date:</b> <!-- TMPL_VAR NAME="count" --> <br>
 
-		<table cellspacing =0 cellpadding=5 border=1 width = 440>
-			<TR>
-				<TD> <b>Branch</b></td>
-				<TD> <b>No. of Issues</b></td>
-				<TD> <b>Last seen at branch</b></td>
-			</TR>
+		<table cellspacing="0" cellpadding="5" border="1" width="440">
+			<tr>
+				<th>Branch</th>
+				<th>No. of Issues</th>
+				<th>Last seen at branch</th>
+			</tr>
 			<!-- TMPL_LOOP Name="branchloop" -->
-				<TR>
-					<TD> <b> <!-- TMPL_VAR Name="branchname" --> </b></td>
-					<TD> <b> <!-- TMPL_VAR Name="issues" --> </b></td>
-					<TD> <b> <!-- TMPL_VAR Name="seen" --> </b></td>
-				</TR>
+				<tr>
+					<td> <b> <!-- TMPL_VAR NAME="branchname" --> </b></td>
+					<td> <b> <!-- TMPL_VAR NAME="issues" --> </b></td>
+					<td> <b> <!-- TMPL_VAR NAME="seen" --> </b></td>
+				</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		</TD>
-	</TR>
+		</td>
+	</tr>
 </table>
 
 <!-- TMPL_INCLUDE Name="reports-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl b/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl
index 823b7a8a97..31340c67bb 100644
--- a/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl
@@ -2,43 +2,43 @@
 
 <!-- The manual invoice and credit buttons -->
 
-<h1>Account for <a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->"><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></a></h1><P>
-<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">Create Manual Invoice</a>
+<h1>Account for <a href="moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
+<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
 &nbsp;
-<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">Create Manual Credit</a>
+<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
 <center>
 <p>
 
 <!-- The table with the account items -->
 
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
+<table  cellspacing="0"  cellpadding="5" border="1" >
 
-  <TR VALIGN=TOP>
-    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2><B>FINES & CHARGES</TD>
-    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=1><B>AMOUNT</TD>
-    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=1><B>STILL OWING</TD>
-  </TR>
+  <tr valign="top">
+    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="2"><b>FINES &amp; CHARGES</td>
+    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>AMOUNT</td>
+    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="1"><b>STILL OWING</td>
+  </tr>
 
-  <!-- TMPL_LOOP NAME=accounts -->
+  <!-- TMPL_LOOP NAME="accounts" -->
 
-    <tr VALIGN=TOP>
-      <td><!-- TMPL_VAR NAME=date --></td>
-      <td><!-- TMPL_VAR NAME=description --><!-- TMPL_IF NAME=printtitle --> <!-- TMPL_VAR NAME=title --><!-- /TMPL_IF --></td>
-      <td><!-- TMPL_VAR NAME=amount --></td>
-      <td><!-- TMPL_VAR NAME=amountoutstanding --></td>
+    <tr valign="top">
+      <td><!-- TMPL_VAR NAME="date" --></td>
+      <td><!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
+      <td><!-- TMPL_VAR NAME="amount" --></td>
+      <td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
     </tr>
 
   <!-- /TMPL_LOOP -->
 
-  <tr VALIGN=TOP  >
+  <tr valign="top">
     <td></td>
-    <td colspan=2><b>Total Due</b></td>
-    <td><b><!-- TMPL_VAR NAME=total --></b></td>
+    <td colspan="2"><b>Total Due</b></td>
+    <td><b><!-- TMPL_VAR NAME="total" --></b></td>
   </tr>
 
 </table>
 
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
 <!-- endmenu (member) -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/charges.tmpl b/koha-tmpl/intranet-tmpl/default/en/charges.tmpl
index ddb637650d..9ff6a61c16 100644
--- a/koha-tmpl/intranet-tmpl/default/en/charges.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/charges.tmpl
@@ -1,6 +1,6 @@
-<HTML>
+<html>
 
-<!-- TMPL_VAR NAME=startmenuissue -->
+<!-- TMPL_VAR NAME="startmenuissue" -->
 
 <p>
 Each box needs to be filled in with fine,time to start charging,charging cycle<br>
@@ -8,25 +8,25 @@ eg 1,7,7 = $1 fine, after 7 days, every 7 days.<p>
 
 <table>
   <tr bgcolor="white">
-    <!-- TMPL_LOOP NAME=firstrowloop -->
-      <td><!-- TMPL_VAR NAME=description --></td>
+    <!-- TMPL_LOOP NAME="firstrowloop" -->
+      <td><!-- TMPL_VAR NAME="description" --></td>
     <!-- /TMPL_LOOP -->
   </tr>
-  <form action=/cgi-bin/koha/updatecharges.pl method=post>
-  <!-- TMPL_LOOP NAME=tablebodyloop -->
+  <form action="/cgi-bin/koha/updatecharges.pl" method="post">
+  <!-- TMPL_LOOP NAME="tablebodyloop" -->
     <tr bgcolor="whitw">
-      <td><!-- TMPL_VAR NAME=description --></td>
-      <!-- TMPL_LOOP NAME=rowloop -->
-        <td><input type=text name="<!-- TMPL_VAR NAME=name -->" value="<!-- TMPL_VAR NAME=value -->" size=6></td>
+      <td><!-- TMPL_VAR NAME="description" --></td>
+      <!-- TMPL_LOOP NAME="rowloop" -->
+        <td><input type="text" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" size="6"></td>
       <!-- /TMPL_LOOP -->
     </tr>
   <!-- /TMPL_LOOP -->
 </table>
 
-<input type=submit>
+<input type="submit">
 </form>
 
-<!-- TMPL_VAR NAME=endmenuissue -->
+<!-- TMPL_VAR NAME="endmenuissue" -->
 
 </body>
-</HTML>
\ No newline at end of file
+</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/default/en/default.tmpl b/koha-tmpl/intranet-tmpl/default/en/default.tmpl
index eb25685020..d290b7c870 100644
--- a/koha-tmpl/intranet-tmpl/default/en/default.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/default.tmpl
@@ -1,23 +1,22 @@
-<!-- TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-top.inc" -->
-<center>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<table border=0 cellspacing=0 cellpadding=2>
-<tr bgcolor=#ccccff background="/images/background-mem.gif">
+<table border="0" cellspacing="0" cellpadding="2">
+<tr bgcolor="#ccccff" background="/images/background-mem.gif">
 <th>Title</th><th>Author</th><th>Item Count</th><th>Biblionumber</th></tr>
-<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
   <tr>
-  <td><a href="/cgi-bin/koha/detail.pl?type=intra&bib=<!-- TMPL_VAR NAME=biblionumber ESCAPE=HTML -->"><!-- TMPL_VAR NAME=title --></a></td>
-  <td> <!-- TMPL_VAR NAME=author --> </td>
-  <td align=center> <!-- TMPL_VAR NAME=itemcount --> </td>
-  <td> <!-- TMPL_VAR NAME=biblionumber --> </td>
+  <td><a href="/cgi-bin/koha/detail.pl?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=HTML -->"><!-- TMPL_VAR NAME="title" --></a></td>
+  <td> <!-- TMPL_VAR NAME="author" --> </td>
+  <td align="center"> <!-- TMPL_VAR NAME="itemcount" --> </td>
+  <td> <!-- TMPL_VAR NAME="biblionumber" --> </td>
   </tr>
 <!-- /TMPL_LOOP -->
-<tr bgcolor=#ccccff backgound="/images/background-mem.gif"><td colspan=4>
-    <table border=0 cellpadding=0 cellspacing=0 width=100% background="/images/background-mem.gif">
-    <tr><td align=left>
-    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->>Previous Records</a>
-    </td><td align=right>
-    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->>Next Records</a>
+<tr bgcolor="#ccccff" backgound="/images/background-mem.gif"><td colspan="4">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" background="/images/background-mem.gif">
+    <tr><td align="left">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a>
+    </td><td align="right">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a>
     </td></tr>
     </table>
 </td></tr>
@@ -25,4 +24,4 @@
 <br>
 Results <i><!-- TMPL_VAR NAME="startfrom" --></i> through <i><!-- TMPL_VAR NAME="endat" --></i> of <i><!-- TMPL_VAR NAME="numrecords" --></i> records.
 <hr>
-<!-- TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
index 867efd659c..7850d38d4c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl
@@ -2,7 +2,7 @@
 <html>
 <head>
 	<title>WELCOME TO THE KOHA INTRANET </title>
-	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet-main.css">
+	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/intranet-main.css">
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <!-- JAVASCRIPT SCRIPTS -->
 	<script language="JavaScript" type="text/javascript">
@@ -43,7 +43,7 @@
 			layer.style.visibility = 'hidden';
 		}
 	</script>
-	<script>
+	<script language="javascript" type="text/javascript">
 	var blnOk=true;
 	function Load() {
 		if(document.body.style.backgroundColor!="") { blnOk=false; }
@@ -65,20 +65,20 @@
 		<p class="kohalogo">Koha</p>
 		<p class="kohalogo2">Open Source  Library System</p>
 		<p class="kohalogo2">Librarian interface</p>
-		<hr width="50%"/>
+		<hr width="50%" />
 		<p class="kohalogo2">Koha : gift, donation or contribution</p>
 	</div>
 	<div id="menus">
 <!-- RIGHT (disappearing) BLOC -->
 		<div id="Hint1" class="hint">
 			<h1 class="catalogue">Catalogue</h1>
-			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet" class="catalogue">Search catalogue</a>
+			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Search catalogue</a>
 				<p>Search a biblio. When this biblio is found, you can check its status, reserve it, or see where it is</p>
 			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Virtual shelves</a>
 				<p>Virtual shelves can be used by librarian or patrons to build virtual libraries inside the "real" one.
 				The virtual shelf can be used by a teacher to help his/her students searching information on a specific topic.
 				It can be used by a library to define "most valuable books for &lt;some category of patron&gt;"</p>
-			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet" class="catalogue">Add biblio</a>
+			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Add biblio</a>
 				<p>Directly add a biblio in the library catalogue</p>
 			<!-- TMPL_IF NAME="NOTMARC" -->
 				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
@@ -118,7 +118,7 @@
 		</div>
 		<div id="Hint5" class="hint">
 			<h1 class="reports">Authorities</h1>
-			Authorities management & searches
+			Authorities management &amp; searches
 		</div>
 		<div id="Hint6" class="hint">
 			<h1 class="parameters">Parameters</h1>
diff --git a/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl b/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl
index b3806ab7fd..5e1f865f3e 100644
--- a/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/mancredit.tmpl
@@ -1,21 +1,21 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
 
 <Center><h3>Manual Credit</h3></center>
-<form action=/cgi-bin/koha/mancredit.pl method=post>
-<table cellpadding=2 cellspacing=0 border=0>
-<input type=hidden name="bornum" value="<!-- TMPL_VAR Name="bornum" -->">
-<tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR Name="bornum" --></td></tr>
+<form action="/cgi-bin/koha/mancredit.pl" method="post">
+<table cellpadding="2" cellspacing="0" border="0">
+<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+<tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
 <tr><td><b>Type</b></td><Td>
-<select name=type>
-<option value=C>Credit</option>
-<option value=BAY>Baycorp Adjustment</option>
-<option value=WORK>Worked off</option>
+<select name="type">
+<option value="C">Credit</option>
+<option value="BAY">Baycorp Adjustment</option>
+<option value="WORK">Worked off</option>
 </select>
 </td></tr>
-<tr><td><b>Itemnumber</b></td><td><input type=text name=itemnum></td></tr>
-<tr><td><b>Description</b></td><td><input type=text name=desc size=50></td></tr>
-<tr><td><b>Amount</b></td><td><input type=text name=amount></td></tr>
-<tr><td><input type=submit name=add value=Add></td></tr>
+<tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
+<tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
+<tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
+<tr><td><input type="submit" name="add" value="Add"></td></tr>
 </table>
 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl
index c5c55fc7c7..644281c78d 100644
--- a/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl
@@ -1,24 +1,24 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
 
 <Center><h3>Manual Invoice</h3></center>
-<form action=/cgi-bin/koha/maninvoice.pl method=post>
-<table cellpadding=2 cellspacing=0 border=0>
-<input type=hidden name=bornum value="<!-- TMPL_VAR Name="bornum" -->">
-<tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR Name="bornum" --></td></tr>
+<form action="/cgi-bin/koha/maninvoice.pl" method="post">
+<table cellpadding="2" cellspacing="0" border="0">
+<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+<tr><td><b>Borrowernumber<b></td><td><!-- TMPL_VAR NAME="bornum" --></td></tr>
 <tr><td><b>Type</b></td><Td>
-<select name=type>
-<option value=L>Lost Item</option>
-<option value=F>Fine</option>
-<option value=A>Account Management Fee</option>
-<option value=N>New Card</option>
-<option value=M>Sundry</option>
-<option value=REF>Cash Refund</option>
+<select name="type">
+<option value="L">Lost Item</option>
+<option value="F">Fine</option>
+<option value="A">Account Management Fee</option>
+<option value="N">New Card</option>
+<option value="M">Sundry</option>
+<option value="REF">Cash Refund</option>
 </select>
 </td></tr>
-<tr><td><b>Itemnumber</b></td><td><input type=text name=itemnum></td></tr>
-<tr><td><b>Description</b></td><td><input type=text name=desc size=50></td></tr>
-<tr><td><b>Amount</b></td><td><input type=text name=amount></td></tr>
-<tr><td><input type=submit name=add value=Add></td></tr>
+<tr><td><b>Itemnumber</b></td><td><input type="text" name="itemnum"></td></tr>
+<tr><td><b>Description</b></td><td><input type="text" name="desc" size="50"></td></tr>
+<tr><td><b>Amount</b></td><td><input type="text" name="amount"></td></tr>
+<tr><td><input type="submit" name="add" value="Add"></td></tr>
 </table>
 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/modbib.tmpl b/koha-tmpl/intranet-tmpl/default/en/modbib.tmpl
index a40c85b8ca..2215036723 100644
--- a/koha-tmpl/intranet-tmpl/default/en/modbib.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/modbib.tmpl
@@ -1,60 +1,60 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<a href="modwebsites.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber" -->">Modify Website Links</a>
+<a href="modwebsites.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Modify Website Links</a>
 <form action="updatebiblio.pl" method="post" name="f">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
-<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 <table border="0" cellspacing="0" cellpadding="5">
 <tr valign="top">
 <td>Author</td>
-<td><input type="text" name="author" value="<!-- TMPL_VAR Name="author" ESCAPE=HTML -->"></td>
+<td><input type="text" name="author" value="<!-- TMPL_VAR NAME="author" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Title</td>
-<td><input type="text" name="title" value="<!-- TMPL_VAR Name="title" ESCAPE=HTML -->"></td>
+<td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Abstract</td>
-<td><textarea name="abstract" cols="40" rows="4"><!-- TMPL_VAR Name="abstract" --></textarea></td>
+<td><textarea name="abstract" cols="40" rows="4"><!-- TMPL_VAR NAME="abstract" --></textarea></td>
 </tr>
 <tr valign="top">
 <td>Subject</td>
-<td><textarea name="subject" cols="40" rows="4"><!-- TMPL_VAR Name="subject" --></textarea>
+<td><textarea name="subject" cols="40" rows="4"><!-- TMPL_VAR NAME="subject" --></textarea>
 </td>
 </tr>
 <tr valign="top">
 <td>Copyright Date</td>
-<td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR Name="copyrightdate" ESCAPE=HTML -->"></td>
+<td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Series Title</td>
-<td><input type="text" name="seriestitle" value="<!-- TMPL_VAR Name="seriestitle" ESCAPE=HTML -->"></td>
+<td><input type="text" name="seriestitle" value="<!-- TMPL_VAR NAME="seriestitle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Additional Author</td>
-<td><input type="text" name="additionalauthor" value="<!-- TMPL_VAR Name="additionalauthor" ESCAPE=HTML -->"></td>
+<td><input type="text" name="additionalauthor" value="<!-- TMPL_VAR NAME="additionalauthor" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Subtitle</td>
-<td><input type="text" name="subtitle" value="<!-- TMPL_VAR Name="subtitle" ESCAPE=HTML -->"></td>
+<td><input type="text" name="subtitle" value="<!-- TMPL_VAR NAME="subtitle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Unititle</td>
-<td><input type="text" name="unititle" value="<!-- TMPL_VAR Name="unititle" ESCAPE=HTML -->"></td>
+<td><input type="text" name="unititle" value="<!-- TMPL_VAR NAME="unititle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Notes</td>
-<td><textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR Name="notes" ESCAPE=HTML --></textarea></td>
+<td><textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="notes" ESCAPE=HTML --></textarea></td>
 </tr>
 <tr valign="top">
 <td>Serial</td>
-<td><input type="text" name="serial" value="<!-- TMPL_VAR Name="serial" ESCAPE=HTML -->"></td>
+<td><input type="text" name="serial" value="<!-- TMPL_VAR NAME="serial" ESCAPE=HTML -->"></td>
 </tr>
 </table>
 <br>
 <input type="submit" name="submit" value="Save Changes">
 </form>
-<script>
+<script language="javascript" type="text/javascript">
 function Dopop() {
         newin=window.open("thesaurus_popup.pl?subject="+document.f.subject.value,"thesaurus",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
diff --git a/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl b/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
index a8c1f8ac68..0105b02dfb 100755
--- a/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/modbibitem.tmpl
@@ -1,77 +1,77 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
-<h1><a href=/cgi-bin/koha/detail.pl?bib="<!-- TMPL_VAR Name="biblionumber" -->"&type=intra><!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</a><br>
-Modify Group - <!-- TMPL_VAR Name="description" --></h1><br>
+<h1><a href="/cgi-bin/koha/detail.pl?bib="<!-- TMPL_VAR NAME="biblionumber" -->"&amp;type=intra"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a><br>
+Modify Group - <!-- TMPL_VAR NAME="description" --></h1><br>
 
-<form action=updatebibitem.pl method=post>
-	<table border=0 cellspacing=0 cellpadding=5 align=left>
+<form action="updatebibitem.pl" method="post">
+	<table border="0" cellspacing="0" cellpadding="5" align="left">
 
-		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=YES > RE-ASSIGN TO EXISTING GROUP</b></td>
+		<tr valign="top"  bgcolor="#99cc33">
+			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="2" ><b><input type="radio" name="existing" value="YES" > RE-ASSIGN TO EXISTING GROUP</b></td>
 		</tr>
 
-		<tr valign=top>
-			<td colspan=3>
-				<select name=existinggroup><br>
+		<tr valign="top">
+			<td colspan="3">
+				<select name="existinggroup"><br>
 					<!-- TMPL_LOOP Name="bibitemloop" -->
-						<option value="<!-- TMPL_VAR Name="biblioitemnumber" -->"><!-- TMPL_VAR Name="description" --> - <!-- TMPL_VAR Name="isbn" --><br>
+						<option value="<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="description" --> - <!-- TMPL_VAR NAME="isbn" --><br>
 					<!-- /TMPL_LOOP -->
 				</select>
 			</td>
 		</tr>
 
-		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=NO checked >OR MODIFY DETAILS</b></td>
+		<tr valign="top"  bgcolor="#99cc33">
+			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="2" ><b><input type="radio" name="existing" value="NO" checked >OR MODIFY DETAILS</b></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Item type</td><td><input type=text name=Item Type value="<!-- TMPL_VAR Name="itemtype" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Item type</td><td><input type="text" name="Item" Type value="<!-- TMPL_VAR NAME="itemtype" -->" size="20"></td></tr>
 
 		<tr valign="top" bgcolor="white">
 			<td>URL</td>
-			<td><input type="text" name="url" value="<!-- TMPL_VAR Name="url" -->" size="20"></td>
+			<td><input type="text" name="url" value="<!-- TMPL_VAR NAME="url" -->" size="20"></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Class</td><td><input type=text name=Class value="<!-- TMPL_VAR Name="classification" --><!-- TMPL_VAR Name="dewey" --><!-- TMPL_VAR Name="subclass" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Class</td><td><input type="text" name="Class" value="<!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" -->" size="20"></td></tr>
 
 
 
-		<tr valign=top bgcolor=white><td>Publisher</td><td><input type=text name=Publisher value="<!-- TMPL_VAR Name="publishercode" -->" size=20></td></tr>
-		<tr valign=top bgcolor=white><td>Place</td><td><input type=text name=Place value="<!-- TMPL_VAR Name="place" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Publisher</td><td><input type="text" name="Publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Place</td><td><input type="text" name="Place" value="<!-- TMPL_VAR NAME="place" -->" size="20"></td></tr>
 
 
-		<tr valign=top bgcolor=white><td>ISBN</td><td><input type=text name=ISBN value="<!-- TMPL_VAR Name="isbn" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>ISBN</td><td><input type="text" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Publication Year</td><td><input type=text name=Publication Year value="<!-- TMPL_VAR Name="publicationyear" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Publication Year</td><td><input type="text" name="Publication" Year value="<!-- TMPL_VAR NAME="publicationyear" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Pages</td><td><input type=text name=Pages value="<!-- TMPL_VAR Name="pages" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Pages</td><td><input type="text" name="Pages" value="<!-- TMPL_VAR NAME="pages" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Illustrations</td><td><input type=text name=Illustrations value="<!-- TMPL_VAR Name="illustration" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Illustrations</td><td><input type="text" name="Illustrations" value="<!-- TMPL_VAR NAME="illustration" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Volume</td>
-		<td><input type=text name=Volume value="<!-- TMPL_VAR Name="volumeddesc" -->" size=20></td></tr>
-		<tr valign=top bgcolor=white><td>Notes</td>
-		<td><input name="Notes" size="20" value="<!-- TMPL_VAR name="bnotes" -->"></td></tr>
-		<tr valign=top bgcolor=white><td>Size</td>
-		<td><input type=text name=Size value="<!-- TMPL_VAR Name="size" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Volume</td>
+		<td><input type="text" name="Volume" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Notes</td>
+		<td><input name="Notes" size="20" value="<!-- TMPL_VAR NAME="bnotes" -->"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Size</td>
+		<td><input type="text" name="Size" value="<!-- TMPL_VAR NAME="size" -->" size="20"></td></tr>
 
-		<input type=hidden name=bibnum value="<!-- TMPL_VAR Name="biblionumber" -->">
+		<input type="hidden" name="bibnum" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 
-		<input type=hidden name=bibitemnum value="<!-- TMPL_VAR Name="biblioitemnumber" -->">
+		<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 
 	</table>
 
-	<img src="/images/holder.gif" width=16 height=500 align=left>
+	<img src="/images/holder.gif" width="16" height="500" align="left">
 
 
 
 
-	<TABLE  cellspacing=0 cellpadding=5 border=0 >
+	<table  cellspacing="0" cellpadding="5" border="0" >
 
-		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=5 ><b>CHANGES TO AFFECT THESE BARCODES<br>
+		<tr valign="top"  bgcolor="#99cc33">
+			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="5" ><b>CHANGES TO AFFECT THESE BARCODES<br>
 			Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.</td>
 		</tr>
 
-		<tr valign=top bgcolor=99cc33>
+		<tr valign="top" bgcolor="#99CC33">
 			<td background="/images/background-mem.gif">&nbsp;</td>
 			<td background="/images/background-mem.gif">Barcode</td>
 			<td background="/images/background-mem.gif">Location</td>
@@ -80,27 +80,27 @@ Modify Group - <!-- TMPL_VAR Name="description" --></h1><br>
 		</tr>
 
 		<!-- TMPL_LOOP Name="itemloop" -->
-			<tr valign=top gcolor="#ffffcc">
-				<td><input type=checkbox name="check_group_<!-- TMPL_VAR Name="barcode" -->"></td>
-				<td><a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR Name="itemnumber" -->&bib=<!-- TMPL_VAR Name="biblionumber" -->&bi=<!-- TMPL_VAR Name="biblioitemnumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
-				<td><!-- TMPL_VAR Name="holdingbranch" --></td>
+			<tr valign="top" gcolor="#ffffcc">
+				<td><input type="checkbox" name="check_group_<!-- TMPL_VAR NAME="barcode" -->"></td>
+				<td><a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+				<td><!-- TMPL_VAR NAME="holdingbranch" --></td>
 				<td></td>
-				<td><!-- TMPL_VAR Name="datelastseen" --></td>
+				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 	<p>
 
-	<input type=image  name=submit src=/images/save-changes.gif border=0 width=187 height=42>
+	<input type="image" name="submit" src="/images/save-changes.gif" border="0" width="187" height="42">
 
 
 </form>
 <p>
 
 
-<B>HELP:</B> You <b>must</b> click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record.  IF your changes only apply to some
+<b>HELP:</b> You <b>must</b> click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record.  IF your changes only apply to some
  items, tick the appropriate ones and a new group record will be created automatically for them.
- <br clear=all>
+ <br clear="all">
  <p> &nbsp; </p>
 
 <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/moditem.tmpl b/koha-tmpl/intranet-tmpl/default/en/moditem.tmpl
index 6509f2d824..20319e8df2 100644
--- a/koha-tmpl/intranet-tmpl/default/en/moditem.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/moditem.tmpl
@@ -1,43 +1,43 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<h1><!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</h1><br>
-<table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=white><td><form action=updateitem.pl method=post>
-<table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=white><td>Barcode</td><td><input type=text name=Barcode value="<!-- TMPL_VAR Name="barcode" -->" size=40></td></tr>
-<input type=hidden name=Class value="<!-- TMPL_VAR Name="classification" -->">
-<input type=hidden name=Publisher value="<!-- TMPL_VAR Name="publisher" -->">
-<input type=hidden name=ISBN value="<!-- TMPL_VAR Name="isbn" -->">
-<input type=hidden name=Publication Year value="<!-- TMPL_VAR Name="publicationyear" -->">
-<input type=hidden name=Pages value="<!-- TMPL_VAR Name="pages" -->">
-<input type=hidden name=Illustrations value="<!-- TMPL_VAR Name="illustration" -->">
-<tr valign=top bgcolor=white><td>ItemNotes</td><td><textarea name=ItemNotes cols=40 rows=4><!-- TMPL_VAR Name="itemnotes" --></textarea></td></tr>
-<input type=hidden name=Volume value="<!-- TMPL_VAR Name="volumeddesc" -->">
-<tr valign=top bgcolor=white><td>Home Branch</td><td><input type=text name=Home Branch value="<!-- TMPL_VAR Name="homebranch" -->" size=40></td></tr>
-<tr valign=top bgcolor=white>
+<h1><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</h1><br>
+<table border="0" cellspacing="0" cellpadding="5">
+<tr valign="top" bgcolor="white"><td><form action=updateitem.pl method="post">
+<table border="0" cellspacing="0" cellpadding="5">
+<tr valign="top" bgcolor="white"><td>Barcode</td><td><input type="text" name="Barcode" value="<!-- TMPL_VAR NAME="barcode" -->" size="40"></td></tr>
+<input type="hidden" name="Class" value="<!-- TMPL_VAR NAME="classification" -->">
+<input type="hidden" name="Publisher" value="<!-- TMPL_VAR NAME="publisher" -->">
+<input type="hidden" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
+<input type="hidden" name="Publication Year" value="<!-- TMPL_VAR NAME="publicationyear" -->">
+<input type="hidden" name="Pages" value="<!-- TMPL_VAR NAME="pages" -->">
+<input type="hidden" name="Illustrations" value="<!-- TMPL_VAR NAME="illustration" -->">
+<tr valign="top" bgcolor="white"><td>ItemNotes</td><td><textarea name="ItemNotes" cols="40" rows="4"><!-- TMPL_VAR NAME="itemnotes" --></textarea></td></tr>
+<input type="hidden" name="Volume" value="<!-- TMPL_VAR NAME="volumeddesc" -->">
+<tr valign="top" bgcolor="white"><td>Home Branch</td><td><input type="text" name="Home" Branch value="<!-- TMPL_VAR NAME="homebranch" -->" size="40"></td></tr>
+<tr valign="top" bgcolor="white">
 
 <td>Lost</td>
 <td>
-<input type=radio name=Lost value=1 <!-- TMPL_IF Name="itemlost" -->  checked <!-- /TMPL_IF --> >
+<input type="radio" name="Lost" value="1" <!-- TMPL_IF Name="itemlost" -->  checked <!-- /TMPL_IF --> >
 Yes
-<input type=radio name=Lost value=0 <!-- TMPL_UNLESS Name="itemlost" --> checked <!-- /TMPL_UNLESS --> >
+<input type="radio" name="Lost" value="0" <!-- TMPL_UNLESS Name="itemlost" --> checked <!-- /TMPL_UNLESS --> >
 No
 </td>
 </tr>
-<tr valign=top bgcolor=white>
+<tr valign="top" bgcolor="white">
 <td>Cancelled</td>
-<td><input type=radio name=withdrawn value=1 <!-- TMPL_IF Name="itemwithdrawn" --> checked <!-- /TMPL_IF --> >
+<td><input type="radio" name="withdrawn" value="1" <!-- TMPL_IF Name="itemwithdrawn" --> checked <!-- /TMPL_IF --> >
 Yes
-<input type=radio name=withdrawn value=0 <!-- TMPL_UNLESS Name="itemwithdrawn" --> checked <!-- /TMPL_UNLESS --> >
+<input type="radio" name="withdrawn" value="0" <!-- TMPL_UNLESS Name="itemwithdrawn" --> checked <!-- /TMPL_UNLESS --> >
 No
 </td>
 </tr>
-<input type=hidden name=bibnum value="<!-- TMPL_VAR Name="biblionumber" -->">
-<input type=hidden name=bibitemnum value="<!-- TMPL_VAR Name="biblioitemnumber" -->">
-<input type=hidden name=itemnumber value="<!-- TMPL_VAR Name="itemnumber" -->">
-<tr valign=top bgcolor=white><td></td><td>
+<input type="hidden" name="bibnum" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+<tr valign="top" bgcolor="white"><td></td><td>
 
-<input type=image  name=submit src=<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filesave.png border=0></td></tr>
+<input type="image"  name="submit" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filesave.png" border="0"></td></tr>
 </table>
 </form></td></tr>
 </table>
diff --git a/koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl b/koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl
index 5f23f355aa..bc3f1a4f5a 100644
--- a/koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/modwebsites.tmpl
@@ -1,25 +1,25 @@
 <!-- TMPL_INCLUDE Name="acquisitions-top.inc" -->
 <p>
-<a href="detail.pl?type=intra&bib=<!-- TMPL_VAR Name="biblionumber" -->">Return to Details Page</a>
+<a href="detail.pl?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->">Return to Details Page</a>
 
 
 <!-- TMPL_LOOP Name="websitesloop" -->
 <p>
 <form action="updatewebsite.pl" method="post">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
-<input type="hidden" name="websitenumber" value="<!-- TMPL_VAR Name="websitenumber" -->">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="websitenumber" value="<!-- TMPL_VAR NAME="websitenumber" -->">
 <table>
 <tr valign="top">
 <td>Title</td>
-<td><input type="text" name="title" value="<!-- TMPL_VAR Name="title" -->"></td>
+<td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->"></td>
 </tr>
 <tr valign="top">
 <td>Description</td>
-<td><textarea name="description" cols="40" rows="4"><!-- TMPL_VAR Name="description" --></textarea></td>
+<td><textarea name="description" cols="40" rows="4"><!-- TMPL_VAR NAME="description" --></textarea></td>
 </tr>
 <tr valign="top">
 <td>URL</td>
-<td><input type="text" name="url" value="<!-- TMPL_VAR Name="url" -->"></td>
+<td><input type="text" name="url" value="<!-- TMPL_VAR NAME="url" -->"></td>
 </tr>
 </table>
 <input type="submit" value="Update this Website Link">   <input type="submit" name="delete" value="Delete this Website link">
@@ -29,7 +29,7 @@
 <p>
 <h2><b>Add another Website Link</b></h2>
 <form action="addwebsite.pl" method="post">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 <table>
 <tr valign="top">
 <td>Title</td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl b/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
index 1ac6eff20f..0f7ea8e5b4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/opac-main.tmpl
@@ -20,64 +20,64 @@ input{font-size:16px}
 	alink="#663366" 
 	leftmargin=0 
 	topmargin=0
-	marginheight=0
-	marginwidth=0 >
+	marginheight="0"
+	marginwidth="0" >
 
 <center>
-<table cellspacing=0 cellpadding=0 border=0 >
+<table cellspacing="0" cellpadding="0" border="0" >
 	
-  <tr valign=top >
+  <tr valign="top" >
 	<td background="/images/front-background-med.gif"><img src="/images/holder.gif" 
-	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
-cellspacing=0 cellpadding=0 border=0 >
+	width="1" height="440" align="left" alt="" hspace="0" vspace="0"><table
+cellspacing="0" cellpadding="0" border="0" >
 	
-  <tr valign=top >
-	<td background=" "><img src="/images/holder.gif" width=228 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=57 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=47 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
+  <tr valign="top" >
+	<td><img src="/images/holder.gif" width="228" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="57" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="47" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="1" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="1" height="88" 
+	alt="" hspace="0" vspace="0"></td>
   </tr>
 
-  <tr valign=top >
-	<td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"
- 	width=1 height=30
-	alt=" " hspace=0 vspace=0><br>
-	<img src="/images/koha.gif" width=200 height=128
-	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>
+  <tr valign="top" >
+	<td rowspan=2 align="right" colspan="2"><img src="/images/holder.gif"
+ 	width="1" height="30"
+	alt="" hspace="0" vspace="0"><br>
+	<img src="/images/koha.gif" width="200" height="128"
+	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace="0" vspace="0"></td>
 
-	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272 	height=38
-	alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>
+	<td  colspan="3"><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width="272" height="38"
+	alt="Search the Catalogue" hspace="0" vspace="0" border="0"></a></font></td>
 
   </tr>
 
 
-<tr valign=top >
+<tr valign="top" >
 	<td>&nbsp; &nbsp; </td>
-	<FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>
-	<input type=hidden name=type value=opac>
-	<td background=" " >
+	<form action="/cgi-bin/koha/search.pl" name="catsearch">
+	<input type="hidden" name="type" value="opac">
+	<td >
 
-	<input type=text size="27" name="keyword"><br>
+	<input type="text" size="27" name="keyword"><br>
 	</font>
 	<b>Type in the box and press the enter 			key.</b><br>
 	<a href="/cgi-bin/koha/catalogue-home.pl">
       
-	<img src="/images/front-arrow.gif" width=27 height=22
-	alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>
+	<img src="/images/front-arrow.gif" width="27" height="22"
+	alt="-" hspace="0" vspace="0" border="0" align=middle >Advanced Search (More Options)</a><br>
 
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0>
+	<img src="/images/holder.gif" width="1" height="8"
+	alt="" hspace="0" vspace="0">
 	<p>
 	<!-- TMPL_IF NAME="loggedinuser" -->
-	    <p align=left>Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+	    <p align="left">Logged in as: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
 	<!-- TMPL_ELSE -->
-	    <p align=left><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>
+	    <p align="left"><a href=/cgi-bin/koha/userpage.pl>Log In</a> to Koha</p>
 	<!-- /TMPL_IF -->
 	</td>
 	</form>
@@ -87,37 +87,37 @@ cellspacing=0 cellpadding=0 border=0 >
  
 
 <!--
-  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >
-	<td background=" "  colspan=3><img src="/images/heading-login.gif" width=279 		height=38
-	alt="Member Login" hspace=0 vspace=0 border=0></td>
+  <tr valign="top" ><form action="/cgi-bin/member.pl" method="get" >
+	<td  colspan="3"><img src="/images/heading-login.gif" width="279" 		height="38"
+	alt="Member Login" hspace="0" vspace="0" border="0"></td>
 
   </tr>
-<tr valign=top >
+<tr valign="top" >
         <td></td>
-	<form action="/cgi-bin/member.pl" method=get >
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Card number &nbsp;</font></td>
-	<td background=" " ><input type=text size="12" name="card"></td>
+	<form action="/cgi-bin/member.pl" method="get" >
+	<td >
+	<font size="3" face="arial narrow,arial,helvetica">Card number &nbsp;</font></td>
+	<td ><input type="text" size="12" name="card"></td>
 
   </tr>
 
-  <tr valign=top><td></td>
+  <tr valign="top"><td></td>
 	<td></td>
 	<td></td>
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
-	<td background=" " ><input type=password size="12" name="password"><br>
-	<input type=submit value="OK"><br>
+	<td >
+	<font size="3" face="arial narrow,arial,helvetica">Password</font></td>
+	<td ><input type=password size="12" name="password"><br>
+	<input type="submit" value="OK"><br>
 
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0></td>
+	<img src="/images/holder.gif" width="1" height="8"
+	alt="" hspace="0" vspace="0"></td>
 	</font>
  </tr>
 
-  <tr valign=top >
+  <tr valign="top" >
 	<td></td>
-	<td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331 		height=38
-	alt="Become a Website Member" hspace=0 vspace=0 border=0></a>
+	<td colspan="4"><A href="join.html"><img src="/images/heading-member.gif" width="331" 		height="38"
+	alt="Become a Website Member" hspace="0" vspace="0" border="0"></a>
 	</td>
 	<td>
 	</td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl b/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl
index 726be23d91..e282f09ecc 100644
--- a/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/overdue.tmpl
@@ -11,10 +11,10 @@
 		<th class="reports">Author</th>
 	</tr>
 	
-	<!-- TMPL_LOOP NAME=overdueloop -->
+	<!-- TMPL_LOOP NAME="overdueloop" -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="duedate" --></td>
-			<!-- TMPL_IF NAME=email -->
+			<!-- TMPL_IF NAME="email" -->
 			<td><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="name" --></a></td>
 			<!-- TMPL_ELSE -->
 			<td><!-- TMPL_VAR NAME="name" --></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/reports.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports.tmpl
index f8f690d0fb..42d6ea1b84 100644
--- a/koha-tmpl/intranet-tmpl/default/en/reports.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports.tmpl
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE Name="issues-top.inc" -->
 
-<H1> <!-- TMPL_VAR Name="type" --> reports </H1>
+<h1> <!-- TMPL_VAR NAME="type" --> reports </h1>
 
 <!-- TMPL_LOOP Name="dataloop" -->
-	<!-- TMPL_VAR Name="value" -->
+	<!-- TMPL_VAR NAME="value" -->
 <!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE Name="issues-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/request.tmpl b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
index 2d57922e04..472dd61e76 100644
--- a/koha-tmpl/intranet-tmpl/default/en/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/request.tmpl
@@ -1,81 +1,81 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<form action="placerequest.pl" method=post>
-<input type=hidden name=biblio value="<!-- TMPL_VAR Name="bib" -->">
-<input type=hidden name=type value=str8>
-<input type=hidden name=title value="<!-- TMPL_VAR Name="title" -->">
+<form action="placerequest.pl" method="post">
+<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
+<input type="hidden" name="type" value="str8">
+<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
 <h1>Requesting:
-<a href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="bib" -->><!-- TMPL_VAR Name="title" --></a>
-<!-- TMPL_VAR Name="author" --></h1><P>
+<a href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="bib" -->><!-- TMPL_VAR NAME="title" --></a>
+<!-- TMPL_VAR NAME="author" --></h1><P>
 <p>
 
 
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Rank</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Member Number</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Notes</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Date</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Pickup</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Request</b></TD>
-	</TR>
-	<tr VALIGN=TOP  >
+<table  cellspacing="0"  cellpadding="5" border="1" >
+	<tr valign="top">
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Rank</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Member Number</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Notes</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Date</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Pickup</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Request</b></td>
+	</tr>
+	<tr valign="top"  >
 		<td>
-			<select name=rank-request>
+			<select name="rank-request">
 			<!--$priorityoptions-->
 			<!-- TMPL_LOOP Name="optionloop" -->
-				<option value="<!-- TMPL_VAR Name="num" -->" <!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
-					<!-- TMPL_VAR Name="num" -->
+				<option value="<!-- TMPL_VAR NAME="num" -->" <!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR NAME="num" -->
 				</option>
 			<!-- /TMPL_LOOP -->
 			</select>
 		</td>
-		<td><input type=text size=10 name=member></td>
-		<td><input type=text size=20 name=notes></td>
-		<td><!-- TMPL_VAR Name=date --></td>
-		<td><!-- TMPL_VAR name="CGIbranch" --></td>
+		<td><input type="text" size="10" name="member"></td>
+		<td><input type="text" size="20" name="notes"></td>
+		<td><!-- TMPL_VAR NAME="date" --></td>
+		<td><!-- TMPL_VAR NAME="CGIbranch" --></td>
 		<td>
-			<input type=checkbox name=request value=any>Next Available, or choose from list below
+			<input type="checkbox" name="request" value="any">Next Available, or choose from list below
 		</td>
 	</tr>
 </table>
-<INPUT type="submit" value="request" class="button">
+<input type="submit" value="request" class="button">
 
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Request</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Item type</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Classification</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Volume</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Pubdate</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Copies</b></TD>
-</TR>
+<table  cellspacing="0" cellpadding="5" border="1" >
+<tr valign="top">
+	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Request</b></td>
+	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Item type</b></td>
+	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Classification</b></td>
+	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Volume</b></td>
+	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Pubdate</b></td>
+	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Copies</b></td>
+</tr>
 <!--$bibitemrows-->
 <!-- TMPL_LOOP Name="bibitemloop" -->
-	<tr VALIGN=TOP>
-		<TD>
+	<tr valign="top">
+		<td>
 			<!-- TMPL_IF Name="itemlost" -->
 				Cannot be selected
 			<!-- TMPL_ELSE -->
-				<input type=checkbox name=reqbib value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
-				<input type=hidden name=biblioitem value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
+				<input type="checkbox" name="reqbib" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+				<input type="hidden" name="biblioitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 			<!-- /TMPL_IF -->
 		</td>
-		<TD>
-			<!-- TMPL_VAR Name="description" -->
-		</td>
-		<TD>
-			<!-- TMPL_VAR Name="class" -->
+		<td>
+			<!-- TMPL_VAR NAME="description" -->
 		</td>
 		<td>
-			<!-- TMPL_VAR Name="volumeddesc" -->
+			<!-- TMPL_VAR NAME="class" -->
 		</td>
 		<td>
-			<!-- TMPL_VAR Name="publicationyear" -->
+			<!-- TMPL_VAR NAME="volumeddesc" -->
+		</td>
+		<td>
+			<!-- TMPL_VAR NAME="publicationyear" -->
 		</td>
 		<td>
 			<!-- TMPL_LOOP Name="barcodeloop" -->
-				<!-- TMPL_VAR Name="barcode" --> <!-- TMPL_VAR Name="message" --><br>
+				<!-- TMPL_VAR NAME="barcode" --> <!-- TMPL_VAR NAME="message" --><br>
 			<!-- /TMPL_LOOP -->
 		</td>
 	</tr>
@@ -87,64 +87,64 @@
 <p>&nbsp;</p>
 
 
-<form name=T<!-- TMPL_VAR Name="time" --> action=modrequest.pl method=post>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=7><B>MODIFY EXISTING REQUESTS </b></TD>
-	</TR>
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Rank</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Member</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Notes</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Date</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Pickup</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Request</b></TD>
-	</TR>
+<form name="T<!-- TMPL_VAR NAME="time" -->" action="modrequest.pl" method="post">
+<table  cellspacing="0"  cellpadding="5" border="1" >
+	<tr valign="top">
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" colspan="7"><b>MODIFY EXISTING REQUESTS </b></td>
+	</tr>
+	<tr valign="top">
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Rank</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Member</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Notes</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Date</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Pickup</b></td>
+		<td  bgcolor="#99cc33" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Request</b></td>
+	</tr>
 	<!--$existingreserves-->
 	<!-- TMPL_LOOP Name="reserveloop" -->
-		<tr VALIGN=TOP>
-			<TD>
-			<input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="borrowernumber" -->>
-			<input type=hidden name=biblio value=<!-- TMPL_VAR Name="biblionumber" -->>
-			<select name=rank-request>
+		<tr valign="top">
+			<td>
+			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+			<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+			<select name="rank-request">
 				<!-- TMPL_IF Name="wait" -->
-					<option value=W selected>Waiting</option>
+					<option value="W" selected>Waiting</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP Name="optionloop" -->
-					<option value="<!-- TMPL_VAR Name="num" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
-						<!-- TMPL_VAR Name="num" -->
+					<option value="<!-- TMPL_VAR NAME="num" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+						<!-- TMPL_VAR NAME="num" -->
 					</option>
 				<!-- /TMPL_LOOP -->
-				<option value=del>Del</option>
+				<option value="del">Del</option>
 			</select></td>
-			<TD>
-			<a href=/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="borrowernumber" -->><!-- TMPL_VAR Name="firstname" --> <!-- TMPL_VAR Name="surname" --></a>
+			<td>
+			<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
 			</td>
-			<td><!-- TMPL_VAR Name="notes" --></td>
-			<TD><!-- TMPL_VAR Name="date" --></td>
-			<TD><!-- TMPL_IF Name="wait" -->
-				Item waiting at <b> <!-- TMPL_VAR Name="wbrname" --></b> <input type=hidden name=pickup value=<!-- TMPL_VAR Name="wbrcd" -->>
+			<td><!-- TMPL_VAR NAME="notes" --></td>
+			<td><!-- TMPL_VAR NAME="date" --></td>
+			<td><!-- TMPL_IF Name="wait" -->
+				Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
 				<!-- TMPL_ELSE -->
-					<select name=pickup>
+					<select name="pickup">
 						<!-- TMPL_LOOP Name="branchloop" -->
-							<option value="<!-- TMPL_VAR Name="branch" -->"<!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
-								<!-- TMPL_VAR Name="branchname" -->
+							<option value="<!-- TMPL_VAR NAME="branch" -->"<!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
+								<!-- TMPL_VAR NAME="branchname" -->
 							</option>
 						<!-- /TMPL_LOOP -->
 					</select>
 				<!-- /TMPL_IF -->
 			</td>
-			<TD>
+			<td>
 				<!-- TMPL_IF Name="wait" -->
-					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
-						<!-- TMPL_VAR Name="barcode" -->
+					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME=''biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
+						<!-- TMPL_VAR NAME="barcode" -->
 					</a>
 				<!-- TMPL_ELSE -->
 					<!-- TMPL_IF Name="constrainttypea" -->
 						<i>Next Available</i>
 					<!-- TMPL_ELSE -->
 						<!-- TMPL_IF Name="constrainttypeo" -->
-							This type only : <b><!-- TMPL_VAR Name="volumeddesc" --> <!-- TMPL_VAR Name="itemtype" --></b>
+							This type only : <b><!-- TMPL_VAR NAME="volumeddesc" --> <!-- TMPL_VAR NAME="itemtype" --></b>
 						<!-- /TMPL_IF -->
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_IF -->
@@ -152,15 +152,14 @@
 			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
-	<tr VALIGN=TOP>
-	<TD colspan=6 align=right>
+	<tr valign="top">
+	<td colspan="6" align="right">
 		Delete a request by selecting "del" from the rank list.
-		<INPUT TYPE="image" name="submit"  VALUE="request" BORDER=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png">
+		<input type="image" name="submit"  VALUE="request" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2rightarrow.png">
 	</td>
 	</tr>
 </table>
-<P>
-<br>
+<p>&nbsp;</p>
 </form>
 
 <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/reservereport.tmpl b/koha-tmpl/intranet-tmpl/default/en/reservereport.tmpl
index 2f2fb4e8d5..41976aae7e 100644
--- a/koha-tmpl/intranet-tmpl/default/en/reservereport.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reservereport.tmpl
@@ -1,29 +1,28 @@
 <!-- TMPL_INCLUDE Name="reports-top.inc" -->
 
-<CENTER>
-<table border=0 cellspacing=0 cellpadding=5>
+<table border="0" cellspacing="0" cellpadding="5" align="center">
 	<!-- TMPL_LOOP Name="dataloop" -->
-		<tr valign=top bgcolor='white'>
+		<tr valign="top" bgcolor="white">
 			<td>
-				<!-- TMPL_VAR Name="name" -->
+				<!-- TMPL_VAR NAME="name" -->
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="reservedate" -->
+				<!-- TMPL_VAR NAME="reservedate" -->
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="title" -->
+				<!-- TMPL_VAR NAME="title" -->
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="classification" -->
+				<!-- TMPL_VAR NAME="classification" -->
 			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	<tr>
 		<td>
-			<!-- TMPL_VAR Name="count" -->
+			<!-- TMPL_VAR NAME="count" -->
 		</td>
 		<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
 	</tr>
-</TABLE>
+</table>
 
 <!-- TMPL_INCLUDE Name="reports-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/searchheader.tmpl b/koha-tmpl/intranet-tmpl/default/en/searchheader.tmpl
index 083689087d..ed2599cbec 100644
--- a/koha-tmpl/intranet-tmpl/default/en/searchheader.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/searchheader.tmpl
@@ -1,2 +1,2 @@
-<a href=search.pl?template=cmsdsearchresults.tmpl&startfrom=<!-- TMPL_VAR NAME="startfrom" -->>Results with dewey</a> | <a href=search.pl?template=searchresults.tmpl&startfrom=<!-- TMPL_VAR NAME="startfrom" -->>Results with biblionumber</a>
+<a href="search.pl?template=cmsdsearchresults.tmpl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->">Results with dewey</a> | <a href="search.pl?template=searchresults.tmpl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->">Results with biblionumber</a>
 <hr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl b/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl
index 109bdc3978..53a35fc1dd 100644
--- a/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/shelves.tmpl
@@ -1,43 +1,42 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
 <!-- TMPL_IF Name="viewshelf" -->
-<center>
 <form>
-    <table border=0 cellpadding=2 cellspacing=0>
+    <table border="0" cellpadding="2" cellspacing="0" align="center">
     		<tr>
-			<th colspan=4 bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<font color=white>Contents of <!-- TMPL_VAR Name="shelfname" --></font>
+			<th colspan="4" bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+				<font color="white">Contents of <!-- TMPL_VAR NAME="shelfname" --></font>
 			</th>
 		</tr>
 		<!-- TMPL_LOOP Name="itemsloop" -->
 			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 	<br>
 	<a href="shelves.pl" class="button">Shelf list</a>
-	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
-	<input type=hidden name=modifyshelfcontents value=1>
-	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
-	<input type=submit value="Remove Selected Items" class="button">
+	<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
+	<input type="hidden" name="modifyshelfcontents" value="1">
+	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
+	<input type="submit" value="Remove Selected Items" class="button">
 </form>
 <form>
-	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
-	<input type=hidden name=modifyshelfcontents value=1>
-	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+	<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
+	<input type="hidden" name="modifyshelfcontents" value="1">
+	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
 	<table>
 		<tr>
 			<td>
-				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
+				Add a book by barcode in <!-- TMPL_VAR NAME="shelfname" -->:
 			</td>
 			<td>
 				<input name="addbarcode">
-				<input type=hidden name=modifyshelfcontents value=1>
-				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
+				<input type="hidden" name="modifyshelfcontents" value="1">
+				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
 				<input type="submit" value="Save" class="button">
 			</td>
 		</tr>
@@ -46,62 +45,61 @@
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF Name="shelves" -->
 		<!-- TMPL_IF Name="status1" -->
-			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
+			<font color="red"><!-- TMPL_VAR NAME="string1" --></font><p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_LOOP Name="paramsloop" -->
 			<!-- TMPL_IF Name="status" -->
-				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
+				<font color="red"><!-- TMPL_VAR NAME="string" --></font><p>
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
-		<center>
 		<h1>Bookshelves</h1>
-		<table border=0 cellpadding=7>
+		<table border="0" cellpadding="7" align="center">
 			<tr>
-				<td align=center valign="bottom">
+				<td align="center" valign="bottom">
 					<form>
 						<p>
 							<a href="shelves.pl" class="button">Shelf list</a>
 						</p>
 					</form>
 				</td>
-				<td align=center valign="bottom">
-					<form method=post>
-					<input type="hidden" name="shelves" value=1>
-					<table border=0 cellpadding=0 cellspacing=0>
+				<td align="center" valign="bottom">
+					<form method="post">
+					<input type="hidden" name="shelves" value="1">
+					<table border="0" cellpadding="0" cellspacing="0">
 						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Select Shelves to Delete</font>
+							<th bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+								<font color="white">Select Shelves to Delete</font>
 							</th>
 						</tr>
 						<!-- TMPL_LOOP Name="shelvesloop" -->
 						<tr>
-							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
-								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
+							<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
+								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
+								<!-- TMPL_VAR NAME="shelfname" --> (<!-- TMPL_VAR NAME="shelfbookcount" --> books)
 							</td>
 						</tr>
 						<!-- /TMPL_LOOP -->
 					</table>
 					<p>
-						<input type=submit value="Delete Shelves" class="button"></form>
+						<input type="submit" value="Delete Shelves" class="button"></form>
 					</p>
 				</td>
-				<td align=center valign=bottom>
-					<form method=post>
-					<input type=hidden name=shelves value=1>
-					<table border=0 cellpadding=0 cellspacing=0>
+				<td align="center" valign="bottom">
+					<form method="post">
+					<input type="hidden" name="shelves" value="1">
+					<table border="0" cellpadding="0" cellspacing="0">
 						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Add Shelf</font>
+							<th bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+								<font color="white">Add Shelf</font>
 							</th>
 						</tr>
 						<tr>
 							<td>
-								<p><input name=addshelf size=25></p>
+								<p><input name="addshelf" size="25"></p>
 							</td>
 						</tr>
 					</table>
-								<p><input type=submit value="Add New Shelf" class="button"></p>
+								<p><input type="submit" value="Add New Shelf" class="button"></p>
 					</form>
 				</td>
 			</tr>
@@ -109,13 +107,13 @@
 
 	<!-- TMPL_ELSE -->
 		<center>
-		<table border=0 cellpadding=4 cellspacing=0>
+		<table border="0" cellpadding="4" cellspacing="0">
 			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-					<table border=0 cellpadding=5 cellspacing=0 width=100%>
+				<td bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+					<table border="0" cellpadding="5" cellspacing="0" width="100%">
 						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Shelf List</font>
+							<th bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+								<font color="white">Shelf List</font>
 							</th>
 						</tr>
 					</table>
@@ -123,9 +121,9 @@
 			</tr>
 			<!-- TMPL_LOOP Name="shelvesloop" -->
 			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
-						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
+					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
+						<!-- TMPL_VAR NAME="shelfname" -->(<!-- TMPL_VAR NAME="shelfbookcount" --> books)
 					</a>
 				</td>
 			</tr>
diff --git a/koha-tmpl/intranet-tmpl/default/en/stats.tmpl b/koha-tmpl/intranet-tmpl/default/en/stats.tmpl
index 25ecdb4dff..4659f328c4 100644
--- a/koha-tmpl/intranet-tmpl/default/en/stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/stats.tmpl
@@ -1,33 +1,31 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
 
-<CENTER>
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Name</b></td>
-			<td background='/images/background-mem.gif'><b>Type</b></td>
-			<td background='/images/background-mem.gif'><b>Date/time</b></td>
-			<td background='/images/background-mem.gif'><b>Amount</b></td>
-			<td background='/images/background-mem.gif'><b>Branch</b></td>
+	<table border="0" cellspacing="0" cellpadding="5" align="center">
+		<tr bgcolor="#99cc33">
+			<td background="/images/background-mem.gif"><b>Name</b></td>
+			<td background="/images/background-mem.gif"><b>Type</b></td>
+			<td background="/images/background-mem.gif"><b>Date/time</b></td>
+			<td background="/images/background-mem.gif"><b>Amount</b></td>
+			<td background="/images/background-mem.gif"><b>Branch</b></td>
 		<tr>
-		<!-- TMPL_LOOP name=loop1 -->
+		<!-- TMPL_LOOP NAME=loop1 -->
 		<tr>
-			<td><!-- TMPL_VAR NAME=name --></td>
-			<td><!-- TMPL_VAR NAME=type --></td>
-			<td><!-- TMPL_VAR NAME=time --></td>
-			<td><!-- TMPL_VAR NAME=amount --></td>
-			<td><!-- TMPL_VAR NAME=branch --></td>
+			<td><!-- TMPL_VAR NAME="name" --></td>
+			<td><!-- TMPL_VAR NAME="type" --></td>
+			<td><!-- TMPL_VAR NAME="time" --></td>
+			<td><!-- TMPL_VAR NAME="amount" --></td>
+			<td><!-- TMPL_VAR NAME="branch" --></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-</CENTER>
 
 
 <p>
-	<b>Total paid: <!-- TMPL_VAR NAME=total --></b>
+	<b>Total paid: <!-- TMPL_VAR NAME="total" --></b>
 	<br>
-	<b>Total written off: <!-- TMPL_VAR NAME=totalw --></b>
+	<b>Total written off: <!-- TMPL_VAR NAME="totalw" --></b>
 </p>
 
 <!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
-</BODY>
-</HTML>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl b/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
index 38454d2839..a1b7440869 100644
--- a/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/thesaurus_popup.tmpl
@@ -1,42 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-	<title>Thesaurus value builder for category <!-- TMPL_VAR name="category" --></title>
+	<title>Thesaurus value builder for category <!-- TMPL_VAR NAME="category" --></title>
 </head>
 <body>
 	<form name="f_pop" action="thesaurus_popup.pl" method="post">
-		<textarea name="result" rows=10 cols=60><!-- TMPL_VAR name="result" --></textarea></br>
+		<textarea name="result" rows="10" cols="60"><!-- TMPL_VAR NAME="result" --></textarea></br>
 		<br/><input type="button" value="OK" onClick="javascript:report()">
 		<p>
-			<input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
-			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-			<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
-			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
+			<input type="text" name="search_string" value="<!-- TMPL_VAR NAME="search_string" -->">
+			<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+			<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
+			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 			<input type="hidden" name="op" value="search">
 			<input type="submit" value="Search">
 		</p>
 	</form>
-<!-- TMPL_IF name="search_string" -->
+<!-- TMPL_IF NAME="search_string" -->
 	<form name="f2_pop" action="thesaurus_popup.pl" method="post">
-	<!-- TMPL_VAR name="select_list" -->
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
-	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
+	<!-- TMPL_VAR NAME="select_list" -->
+	<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 	<input type="hidden" name="op" value="select">
-	<input type="hidden" name="result" value="<!-- TMPL_VAR name="result" -->">
+	<input type="hidden" name="result" value="<!-- TMPL_VAR NAME="result" -->">
 	<input type="submit" name="OK" value="OK">
 	</form>
 <!-- /TMPL_IF -->
 <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
-	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+	<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
 	<input type="hidden" name="op" value="add">
 	insert a new authority : <input type="text" name="insert">
 	<input type="submit" name="NEW" value="NEW">
 	</form>
-	<script>
+	<script language="javascript" type="text/javascript">
 		function report() {
-			opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.result.value;
+			opener.document.f.field_value[<!-- TMPL_VAR NAME="index" -->].value= document.f_pop.result.value;
 			self.close();
 			return false;
 		}
diff --git a/koha-tmpl/intranet-tmpl/default/en/updatebiblio.tmpl b/koha-tmpl/intranet-tmpl/default/en/updatebiblio.tmpl
index 2244f5a6e5..4004954057 100644
--- a/koha-tmpl/intranet-tmpl/default/en/updatebiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/updatebiblio.tmpl
@@ -1,17 +1,17 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
 
-<!-- TMPL_VAR Name="error" -->
+<!-- TMPL_VAR NAME="error" -->
 <p> Click submit to force the subject
 <br>
-<form action="/cgi-bin/koha/updatebiblio.pl" method=post>
-<table border=0 cellspacing=0 cellpadding=5>
+<form action="/cgi-bin/koha/updatebiblio.pl" method="post">
+<table border="0" cellspacing="0" cellpadding="5">
 <!-- TMPL_LOOP Name="dataloop" -->
-	<input type=hidden name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
+	<input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
 <!-- /TMPL_LOOP -->
-	<input type=hidden name="Force" value="<!-- TMPL_VAR NAME="substring" -->">
-<TR><TD><input type=submit></TD></TR>
-</TABLE>
+	<input type="hidden" name="Force" value="<!-- TMPL_VAR NAME="substring" -->">
+<tr><td><input type="submit"></td></tr>
+</table>
 </form>
 
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl b/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl
index 59539158ba..76864f1be6 100644
--- a/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/z3950/searchresult.tmpl
@@ -1,7 +1,7 @@
 <HTML>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<!-- TMPL_IF name="refresh" -->
-	<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR name="refresh" -->">
+<!-- TMPL_IF NAME="refresh" -->
+	<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->">
 <!-- /TMPL_IF -->
 <font size="6"><em>Z3950 Search Results</em></font><br />
 
@@ -11,7 +11,7 @@
 	</tr>
 </table>
 <table border="0" cellspacing="0" cellpadding="5" width="80%">
-	<tr valign=top bgcolor=#ffcc00>
+	<tr valign="top" bgcolor="#ffcc00">
 		<td><b>Title</b></td>
 		<td><b>Author</b></td>
 		<td><b>ISBN</b></td>
@@ -19,25 +19,25 @@
 		<td><b>&nbsp;</b></td>
 		<td>&nbsp;</td>
 	</tr>
-	<!-- TMPL_IF name="breeding_loop" -->
-	<!-- TMPL_LOOP name="breeding_loop" -->
-		<tr valign="top" bgcolor="<!-- TMPL_VAR name="toggle" -->">
-			<td><!-- TMPL_VAR name="title" --></a>
-			<td><!-- TMPL_VAR name="author" --></td>
-			<td><!-- TMPL_VAR name="isbn" --></td>
-			<td><!-- TMPL_VAR name="file" --></td>
-			<td><a href="javascript:Import(<!-- TMPL_VAR name="id" -->)">Import this biblio</a></td>
+	<!-- TMPL_IF NAME="breeding_loop" -->
+	<!-- TMPL_LOOP NAME="breeding_loop" -->
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+			<td><!-- TMPL_VAR NAME="title" --></a>
+			<td><!-- TMPL_VAR NAME="author" --></td>
+			<td><!-- TMPL_VAR NAME="isbn" --></td>
+			<td><!-- TMPL_VAR NAME="file" --></td>
+			<td><a href="javascript:Import(<!-- TMPL_VAR NAME="id" -->)">Import this biblio</a></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	<!-- TMPL_ELSE -->
-		<tr><td colspan=6>Nothing found</td></tr>
+		<tr><td colspan="6">Nothing found</td></tr>
 	<!-- /TMPL_IF -->
 </table>
-<!-- TMPL_IF name="numberpending" --><H1><center>Still <!-- TMPL_VAR name="numberpending" --> requests to go</center></H1><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="numberpending" --><h1><center>Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</center></h1><!-- /TMPL_IF -->
 <br />
-<script>
+<script language="javascript" type="text/javascript">
 	function Import(GetThisOne) {
-		opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR name="oldbiblionumber" -->&breedingid="+GetThisOne;
+		opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
 		self.close();
 		return false;
 	}