From c6131c44292da78fe10b1d179d579c8c078bc0a1 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 27 Aug 2007 10:45:51 -0500
Subject: [PATCH] Corrections for XHTML compliance, again.

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 .../prog/en/includes/action-catalogue.inc     |   6 +-
 .../prog/en/includes/error-bottom.inc         |   3 +-
 .../prog/en/includes/error-top.inc            |  18 +-
 .../prog/en/includes/holidays-top.inc         |   2 +-
 .../intranet-tmpl/prog/en/includes/menus.inc  |   4 +-
 .../prog/en/includes/popup-top.inc            |  12 +-
 .../intranet-tmpl/prog/en/modules/about.tmpl  |  12 +-
 .../prog/en/modules/acqui/acqui-home.tmpl     |   2 +-
 .../prog/en/modules/acqui/basket.tmpl         |   6 +-
 .../prog/en/modules/acqui/booksellers.tmpl    |   6 +-
 .../prog/en/modules/acqui/histsearch.tmpl     |   4 +-
 .../prog/en/modules/acqui/neworderbiblio.tmpl |   2 +-
 .../prog/en/modules/acqui/neworderempty.tmpl  |   2 +-
 .../en/modules/acqui/newordersuggestion.tmpl  |   8 +-
 .../prog/en/modules/acqui/orderreceive.tmpl   |   4 +-
 .../prog/en/modules/acqui/parcel.tmpl         |  44 +-
 .../prog/en/modules/acqui/parcels.tmpl        |  26 +-
 .../prog/en/modules/acqui/supplier.tmpl       |  49 +--
 .../prog/en/modules/admin/aqbookfund.tmpl     |   2 +-
 .../prog/en/modules/admin/aqbudget.tmpl       |   6 +-
 .../admin/auth_subfields_structure.tmpl       |   4 +-
 .../en/modules/admin/auth_tag_structure.tmpl  |  12 +-
 .../prog/en/modules/admin/authtypes.tmpl      |   4 +-
 .../en/modules/admin/biblio_framework.tmpl    |   2 +-
 .../prog/en/modules/admin/branches.tmpl       |  28 +-
 .../prog/en/modules/admin/categorie.tmpl      |   8 +-
 .../prog/en/modules/admin/categoryitem.tmpl   |  60 +--
 .../prog/en/modules/admin/charges.tmpl        |   4 +-
 .../prog/en/modules/admin/checkmarc.tmpl      |   2 +-
 .../prog/en/modules/admin/cities.tmpl         |   6 +-
 .../prog/en/modules/admin/currency.tmpl       |  19 +-
 .../prog/en/modules/admin/itemtypes.tmpl      |  22 +-
 .../admin/marc_subfields_structure.tmpl       |   2 +-
 .../en/modules/admin/marctagstructure.tmpl    |  34 +-
 .../prog/en/modules/admin/printers.tmpl       |  10 +-
 .../prog/en/modules/admin/roadtype.tmpl       |  26 +-
 .../prog/en/modules/admin/thesaurus.tmpl      |   2 +-
 .../prog/en/modules/admin/z3950servers.tmpl   |  14 +-
 .../en/modules/authorities/auth_finder.tmpl   |  36 +-
 .../modules/authorities/authorities-home.tmpl |  28 +-
 .../en/modules/authorities/authorities.tmpl   |  74 ++--
 .../prog/en/modules/authorities/detail.tmpl   |  10 +-
 .../authorities/searchresultlist-auth.tmpl    |  56 +--
 .../modules/authorities/searchresultlist.tmpl |   2 +-
 .../prog/en/modules/catalogue/ISBDdetail.tmpl |   2 +-
 .../prog/en/modules/catalogue/MARCdetail.tmpl |  62 +--
 .../prog/en/modules/catalogue/advsearch.tmpl  |  64 +--
 .../prog/en/modules/catalogue/dictionary.tmpl |  10 +-
 .../prog/en/modules/catalogue/moredetail.tmpl |  50 +--
 .../prog/en/modules/catalogue/results.tmpl    |  38 +-
 .../prog/en/modules/catalogue/subject.tmpl    |  10 +-
 .../modules/cataloguing/addbiblio-nomarc.tmpl |   2 +-
 .../en/modules/cataloguing/addbiblio.tmpl     |  12 +-
 .../prog/en/modules/cataloguing/addbooks.tmpl |   2 +-
 .../modules/cataloguing/additem-nomarc.tmpl   |   5 +-
 .../prog/en/modules/cataloguing/additem.tmpl  |   4 +-
 .../modules/cataloguing/thesaurus_popup.tmpl  |  38 +-
 .../value_builder/labs_theses.tmpl            |  26 +-
 .../cataloguing/value_builder/macles.tmpl     |  46 +-
 .../value_builder/marc21_leader.tmpl          |  94 ++--
 .../value_builder/unimarc_field_100.tmpl      | 198 +++++----
 .../value_builder/unimarc_field_105.tmpl      | 401 +++++++++---------
 .../value_builder/unimarc_field_106.tmpl      |  20 +-
 .../value_builder/unimarc_field_110.tmpl      | 176 ++++----
 .../en/modules/cataloguing/z3950_search.tmpl  |  14 +-
 .../prog/en/modules/circ/bookcount.tmpl       |   2 +-
 .../prog/en/modules/circ/branchoverdues.tmpl  |  20 +-
 .../prog/en/modules/circ/branchtransfers.tmpl |   8 +-
 .../prog/en/modules/circ/circulation.tmpl     |  33 +-
 .../prog/en/modules/circ/pendingreserves.tmpl |   6 +-
 .../prog/en/modules/circ/returns.tmpl         |  14 +-
 .../prog/en/modules/circ/stats.tmpl           |   2 +-
 .../prog/en/modules/circ/transferstodo.tmpl   |   2 +-
 .../en/modules/circ/transferstoreceive.tmpl   |  16 +-
 .../prog/en/modules/circ/waitingreserves.tmpl |  32 +-
 .../help/admin/auth_subfields_structure.tmpl  |   8 +-
 .../help/admin/marc_subfields_structure.tmpl  |  38 +-
 .../modules/help/admin/systempreferences.tmpl |  20 +-
 .../help/bull/subscription-detail.tmpl        |   4 +-
 .../prog/en/modules/help/nohelp.tmpl          |   6 +-
 .../prog/en/modules/installer/step1.tmpl      |  12 +-
 .../prog/en/modules/installer/step2.tmpl      |   4 +-
 .../prog/en/modules/installer/step3.tmpl      |  16 +-
 .../modules/labels/label-create-template.tmpl |  47 +-
 .../modules/labels/label-edit-template.tmpl   |  64 +--
 .../prog/en/modules/labels/label-print.tmpl   |  10 +-
 .../prog/en/modules/maint/catmaintain.tmpl    |  36 +-
 .../en/modules/members/borrowers_details.tmpl |  14 +-
 .../en/modules/members/guarantor_search.tmpl  |   4 +-
 .../en/modules/members/member-password.tmpl   |   2 +-
 .../members/member-quicksearch-results.tmpl   |   2 +-
 .../prog/en/modules/members/member.tmpl       |   2 +-
 .../prog/en/modules/members/memberentryA.tmpl | 283 ++++++------
 .../prog/en/modules/members/memberentryC.tmpl | 315 +++++++-------
 .../prog/en/modules/members/memberentryI.tmpl | 202 ++++-----
 .../prog/en/modules/members/memberentryP.tmpl | 299 ++++++-------
 .../modules/members/moremember-receipt.tmpl   |   6 +-
 .../prog/en/modules/members/moremember.tmpl   |  10 +-
 .../modules/reports/acquisitions_stats.tmpl   |   4 +-
 .../en/modules/reports/bor_issues_top.tmpl    |   6 +-
 .../en/modules/reports/borrowers_out.tmpl     |   6 +-
 .../en/modules/reports/borrowers_stats.tmpl   |   2 +-
 .../en/modules/reports/cat_issues_top.tmpl    |   6 +-
 .../en/modules/reports/catalogue_out.tmpl     |   6 +-
 .../en/modules/reports/catalogue_stats.tmpl   |   2 +-
 .../prog/en/modules/reports/inventory.tmpl    |   2 +-
 .../en/modules/reports/issues_avg_stats.tmpl  |   2 +-
 .../reports/issues_by_borrower_category.tmpl  |   2 +-
 .../prog/en/modules/reports/issues_stats.tmpl |   4 +-
 .../prog/en/modules/reports/itemtypes.tmpl    |   2 +-
 .../prog/en/modules/reports/reports-home.tmpl |   2 +-
 .../prog/en/modules/reserve/request.tmpl      |  22 +-
 .../modules/serials/acqui-search-result.tmpl  |   2 +-
 .../en/modules/serials/checkexpiration.tmpl   |   8 +-
 .../prog/en/modules/serials/claims.tmpl       |   6 +-
 .../en/modules/serials/distributedto.tmpl     |   6 +-
 .../serials/receipt-search-result.tmpl        |  40 +-
 .../prog/en/modules/serials/result.tmpl       |   4 +-
 .../modules/serials/serial-issues-full.tmpl   |   2 +-
 .../en/modules/serials/serial-issues.tmpl     |   4 +-
 .../modules/serials/serials-collection.tmpl   |  12 +-
 .../prog/en/modules/serials/serials-edit.tmpl |  52 +--
 .../prog/en/modules/serials/serials-home.tmpl |  13 +-
 .../en/modules/serials/serials-recieve.tmpl   |  44 +-
 .../en/modules/serials/subscription-add.tmpl  |  68 +--
 .../modules/serials/subscription-detail.tmpl  |  10 +-
 .../en/modules/suggestion/acceptorreject.tmpl |   8 +-
 .../prog/en/modules/tools/cleanborrowers.tmpl |  10 +-
 .../prog/en/modules/tools/holidays.tmpl       |  54 +--
 .../prog/en/modules/tools/inventory.tmpl      |  10 +-
 .../prog/en/modules/tools/itemslost.tmpl      |   2 +-
 .../prog/en/modules/tools/koha-news.tmpl      |  10 +-
 .../prog/en/modules/tools/letter.tmpl         |  32 +-
 .../prog/en/modules/tools/overduerules.tmpl   |   6 +-
 .../prog/en/modules/tools/printerConfig.tmpl  |  32 +-
 .../prog/en/modules/tools/viewlog.tmpl        |  10 +-
 .../virtualshelves/addbybiblionumber.tmpl     |   2 +-
 .../en/modules/virtualshelves/shelves.tmpl    |  11 +-
 138 files changed, 1993 insertions(+), 2029 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
index 3e4a263cc6..d13b0f9ea3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
@@ -1,10 +1,10 @@
     <div id="action">
             
             <div class="edit">
-                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=">
+                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">
                     Edit biblio
                 </a>
-                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!--TMPL_VAR Name="current_framework" -->&op=duplicate">
+                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">
                     Duplicate
                 </a>
                 <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
@@ -28,7 +28,7 @@
             </div>
             
             <div class="others">
-                <a href="#" onclick="JavaScript:window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">
+                <a href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">
                     Add to shelf
                 </a>
                 <a href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
index 096e1e0ff0..fee0fd7c1b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
@@ -1,5 +1,4 @@
-<br clear="all">
-<p> &nbsp; </p>
+<br clear="all" />
 
 <div class="center">
 <a href="/cgi-bin/koha/mainpage.pl">Home</a> ||
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
index 68f4402614..4fe5e520b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
@@ -1,9 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>KOHA: INTRANET: Catalogue</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
+<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
 
 <script language="JavaScript">
 <!-- Hide from old browsers
@@ -20,7 +20,7 @@ function Help() {
 }
 </script>
 
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/css/staff.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/css/staff.css" />
 <style type="text/css">
 .catalogue {
 	background-color:#ad11ad;
@@ -41,15 +41,15 @@ a.catalogue:hover {
 <div id="menubar">
 	<span class="koha">KOHA</span>
 	<span class="koha"><a class="home" href="/cgi-bin/koha/mainpage.pl">Koha</a></span>
-	<a class="acquisition" href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
-	<a class="catalogue" href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a>
-	<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
+	<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
+	<a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a>
+	<a  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
 	<a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>
 	<a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
 	<a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>
 	<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>
 	<a class="about" href="/cgi-bin/koha/about.pl">About</a>
-	<a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
+	<a href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
 </div>
 <div id="submenu">
 	<span class="koha">options &gt;&gt;&nbsp;&nbsp;</span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc
index 48b2430fd2..2783caafd3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc
@@ -1,5 +1,5 @@
 </title>
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 
 <!-- Estos scripts permiten manejar calendario de fechas. -->
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/calendar.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
index b520be386c..4cdf4f1b94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
@@ -1,9 +1,9 @@
 <div id="kohalogo">
-    <img src="/intranet-tmpl/prog/img/koha-logo-white.png" height="60px"/>
+    <img src="/intranet-tmpl/prog/img/koha-logo-white.png" height="60px" />
     <h3><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h3>
 </div>
 <div id="onlinehelp">
-    <a href="#" onclick="javascript:window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
+    <a href="#" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
 </div>
 <div id="mainmenu">
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc
index 2eaba5b333..593db34044 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc
@@ -1,11 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>popup</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
+<title>Popup</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf8" />
 
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/css/staff.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/css/staff.css" />
 
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
index d0a53a5799..d53c0b6e0e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
@@ -9,12 +9,12 @@
 	
 <table>
 	<caption>Server information</caption>
-	<tr><th>Koha version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td></tr>
-	<tr><th>OS version ('uname -a'): </th><td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td></tr>
-	<tr><th>Perl version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td></tr>
-	<tr><th>MySQL version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td></tr>
-	<tr><th>Apache version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td></tr>
-	<tr><th>Zebra version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="zebraVersion" --></td></tr>
+	<tr><th>Koha version: </th><td><!-- TMPL_VAR ESCAPE="HTML" name="kohaVersion" --></td></tr>
+	<tr><th>OS version ('uname -a'): </th><td><!-- TMPL_VAR ESCAPE="HTML" name="osVersion" --></td></tr>
+	<tr><th>Perl version: </th><td><!-- TMPL_VAR ESCAPE="HTML" name="perlVersion" --></td></tr>
+	<tr><th>MySQL version: </th><td><!-- TMPL_VAR ESCAPE="HTML" name="mysqlVersion" --></td></tr>
+	<tr><th>Apache version: </th><td><!-- TMPL_VAR ESCAPE="HTML" name="apacheVersion" --></td></tr>
+	<tr><th>Zebra version: </th><td><!-- TMPL_VAR ESCAPE="HTML" name="zebraVersion" --></td></tr>
 </table>
 
 <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
index 250010b153..6078e1fea0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl
@@ -60,7 +60,7 @@
     <input type="submit" value="Save Exchange Rate" />
     </form>
 <!-- TMPL_ELSE -->
-    <a href="/cgi-bin/koha/admin/currency.pl?op=add_form" class="button acquisition">
+    <a href="/cgi-bin/koha/admin/currency.pl?op=add_form" class="button">
     Add Currency
     </a>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 3e78738989..da8e33d57d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -58,7 +58,7 @@
                     <td><!-- TMPL_VAR NAME="publishercode" --></td>
                     <!-- TMPL_IF name="closedate" -->
                         <td><p>
-                            <!-- TMPL_VAR NAME="title" --><br/>
+                            <!-- TMPL_VAR NAME="title" --><br />
                                 <!-- TMPL_VAR NAME="author" -->
                                 <!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
                                 <!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
@@ -82,10 +82,10 @@
                     <!-- TMPL_IF name="active" -->
                         <!-- TMPL_UNLESS name="closedate" -->
                         <td>
-                            <a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">Modify</a>
+                            <a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">Modify</a>
                         </td>
                         <td>
-                        <a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a>
+                        <a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;quantity=0&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a>
                         </td>
                         <!-- /TMPL_UNLESS -->
                     <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
index aadb115c22..f04b081c55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
@@ -18,15 +18,15 @@
 		<tr>
 			<td>
 				<!-- TMPL_IF name="active" -->
-					<a href="basket.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Add order</a>
+					<a href="basket.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Add order</a>
 				<!-- TMPL_ELSE -->
 					Inactive
 				<!-- /TMPL_IF -->
 			</td>
 			<td>
-				<a href="parcels.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Receive order</a>
+				<a href="parcels.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Receive order</a>
 			</td>
-			<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
+			<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->"><!-- TMPL_VAR name="name" --></a></td>
 			<td>
 				<table>
 				    <!-- TMPL_IF NAME="loop_basket"-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
index 0107815dd6..f568f7a991 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tmpl
@@ -7,7 +7,7 @@
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="/intranet-tmpl/prog/en/lib/calendar/calendar-system.css" />
 <!-- End of additions -->
 
 <!-- Additions to enable Calendar system -->
@@ -102,7 +102,7 @@
 				<tr>
 					<td>
 					    <!-- TMPL_IF NAME="invoicenumber" -->
-					        <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=<!-- TMPL_VAR NAME="invoicenumber"-->&supplierid=<!-- TMPL_VAR NAME="id"-->&datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
+					        <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=<!-- TMPL_VAR NAME="invoicenumber"-->&amp;supplierid=<!-- TMPL_VAR NAME="id"-->&amp;datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
 					    <!-- TMPL_ELSE -->
 					        &nbsp;
 					    <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
index 19bd2fc508..dda9bcbf54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -46,7 +46,7 @@
                 </p>
             </td>
             <td>
-            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="order this one !">
+            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="order this one !">
                 Order
             </a>
             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index bbd37ad11a..d1a01b58ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -51,7 +51,7 @@ function messenger(X,Y,etc){
     win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
     win.focus();
     win.document.close();
-    win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br>");
+    win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br />");
     win.document.write(etc);
     win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
     win.document.write("</font></body></html>");
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
index 14e8ec2a24..c46e41dc33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
@@ -30,7 +30,7 @@
                 &nbsp;
             </th>
             <th>
-                <input type="submit" class="button acquisition" value="Set Filter" />
+                <input type="submit" class="button" value="Set Filter" />
             </th>
         </tr>
         <!-- TMPL_LOOP NAME="suggestions_loop" -->
@@ -41,7 +41,7 @@
                         <!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR NAME="publishercode" --> <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="publishercode" --><br />published by:<!-- TMPL_VAR NAME="publishercode" --> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR NAME="publicationyear" --></i> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR NAME="place" --></i> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR NAME="note" -->)</i></p> <!-- /TMPL_IF -->
@@ -55,9 +55,9 @@
                 </td>
                 <td>
                     <!-- TMPL_IF name="biblionumber" -->
-                        <a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
+                        <a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button">Order</a>
                     <!-- TMPL_ELSE -->
-                        <a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
+                        <a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button">Order</a>
                     <!-- /TMPL_IF -->
                 </td>
             </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
index 210326ccc9..6f0dc51c15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
@@ -16,9 +16,9 @@
     win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
     win.focus();
     win.document.close();
-    win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size=2><p><br>");
+    win.document.write("<body link=\"#333333\" bgcolor=\"#ffffff\" text=\"#000000\"><font size=\"2\"><p><br />");
     win.document.write(etc);
-    win.document.write("<center><form><input type=button onclick='self.close()' value=Close></form></center>");
+    win.document.write("<center><form><input type=\"button\" onclick=\"self.close();\" value=\"Close\"></form></center>");
     win.document.write("</font></body></html>");
 }
     //-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
index ab669eb8e3..ca7cdab190 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -22,14 +22,14 @@
     <form action="" method="get" name="orderform">
     <table>
         <tr>
-            <th class="acquisition">BASKET</th>
-            <th class="acquisition">Summary</th>
-            <th class="acquisition">QTY ordered</th>
-            <th class="acquisition">Est Cost</th>
-            <th class="acquisition">ACTUAL</th>
-            <th class="acquisition">P&amp;P</th>
-            <th class="acquisition">QTY received</th>
-            <th class="acquisition">TOTAL</th>
+            <th>BASKET</th>
+            <th>Summary</th>
+            <th>QTY ordered</th>
+            <th>Est Cost</th>
+            <th>ACTUAL</th>
+            <th>P&amp;P</th>
+            <th>QTY received</th>
+            <th>TOTAL</th>
         </tr>
         <!-- TMPL_LOOP NAME="loop_received" -->
             <tr>
@@ -48,12 +48,12 @@
             </tr>
         <!-- /TMPL_LOOP -->
         <tr>
-            <th class="acquisition" colspan="3"></th>
-            <th class="acquisition">SUBTOTALS</th>
-            <th class="acquisition"><!-- TMPL_VAR NAME="totalprice" --></th>
-            <th class="acquisition"><!-- TMPL_VAR NAME="totalfreight" --></th>
-            <th class="acquisition"><!-- TMPL_VAR NAME="totalquantity" --></th>
-            <th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
+            <th colspan="3"></th>
+            <th>SUBTOTALS</th>
+            <th><!-- TMPL_VAR NAME="totalprice" --></th>
+            <th><!-- TMPL_VAR NAME="totalfreight" --></th>
+            <th><!-- TMPL_VAR NAME="totalquantity" --></th>
+            <th><!-- TMPL_VAR NAME="tototal" --></th>
         </tr>
         <tr>
             <td colspan="5">
@@ -78,17 +78,17 @@
         <input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
         <input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
         <input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
-        <p><b>Search ISBN or Title:</b> <input type="text" size="25" name="recieve" /></p>
+        <p><label for="recieve">Search ISBN or Title:</label> <input type="text" size="25" id="recieve" name="recieve" /></p>
     </form>
     <table> <caption>or select a pending orders</caption>
         <tr>
-            <th class="acquisition">BASKET</th>
-            <th class="acquisition">Summary</th>
-            <th class="acquisition">Est. Cost</th>
-            <th class="acquisition">P&amp;P</th>
-            <th class="acquisition">QTY Ordered</th>
-            <th class="acquisition">QTY</th>
-            <th class="acquisition">TOTAL</th>
+            <th>BASKET</th>
+            <th>Summary</th>
+            <th>Est. Cost</th>
+            <th>P&amp;P</th>
+            <th>QTY Ordered</th>
+            <th>QTY</th>
+            <th>TOTAL</th>
         </tr>
         <!-- TMPL_LOOP NAME="loop_orders" -->
             <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
index ae75b28402..31cb2b6255 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
@@ -9,21 +9,21 @@
 <div id="resultnumber">
 <!-- Row of numbers corresponding to search result pages -->
 <!-- TMPL_IF NAME="displayprev" -->
-    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
+    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0" /></a>
 <!-- TMPL_ELSE -->
-    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0" />
 <!-- /TMPL_IF -->
 <!-- TMPL_LOOP NAME="numbers" -->
     <!-- TMPL_IF NAME="highlight" -->
     <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
     <!-- TMPL_ELSE -->
-    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0" /></a>
     <!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 <!-- TMPL_IF NAME="displaynext" -->
-    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
+    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0" /></a>
 <!-- TMPL_ELSE -->
-    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0" />
 <!-- /TMPL_IF -->
 </div>
 
@@ -43,7 +43,7 @@
         <tr>
             <th>
                 &nbsp;
-                <input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+                <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
             </th>
             <th>
                 <input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->">
@@ -70,7 +70,7 @@
                 </select>
             </th>
             <th>
-                <input type="submit" class="button acquisition" value="Filter">
+                <input type="submit" class="button" value="Filter">
             </th>
         </tr>
 <!-- Actual Search Results -->
@@ -84,7 +84,7 @@
         </td>
         <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
         <!-- /TMPL_IF -->
-            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;invoice=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
+            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE="URL" -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE="URL" --><!--TMPL_IF Name="code"-->&amp;invoice=<!--TMPL_VAR Name="code" ESCAPE="URL" --><!--/TMPL_IF-->">
                 <!-- TMPL_VAR NAME="datereceived" -->
             </a>
         </td>
@@ -108,20 +108,20 @@
     <legend>Receive a new Parcel </legend>
         <form method="get" action="parcel.pl">
         <p>
-            <input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+            <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
             <label>Parcel Code</label>
-            <input type="text" size="20" name="invoice">
+            <input type="text" size="20" name="invoice" />
         </p>
         <p>
             <label>GST</label>
-            <input type="text" size="20" name="gst">
+            <input type="text" size="20" name="gst" />
         </p>
         <p>
             <label>Freight</label>
-            <input type="text" size="20" name="freight">
+            <input type="text" size="20" name="freight" />
         </p>
         <p>
-            <input type="submit" class="button acquisition" value="save">
+            <input type="submit" class="button" value="save" />
         </p>
         </form>
     </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 69a38ccbe8..cc83cbfbb3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -6,9 +6,9 @@
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
 <!--TMPL_IF Name="enter"-->
-    <form action=updatesupplier.pl method="post">
+    <form action="updatesupplier.pl" method="post">
     
-    <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+    <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
     
     <!-- TMPL_IF name="id" -->
         <h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
@@ -19,7 +19,7 @@
             <legend>Company details</legend>
             <p>
                 <label>Company Name</label>
-                <input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->">
+                <input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->" />
             </p>
             <p>
                 <label>Postal Address</label>
@@ -31,42 +31,42 @@
             </p>
             <p>
                 <label>Phone</label>
-                <input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->">
+                <input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" />
             </p>
             <p>
                 <label>Fax</label>
-                <input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->">
+                <input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" />
             </p>
             <p>
                 <label>Website</label>
-                <input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->">
+                <input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->" />
             </p>
         </fieldset>
         <fieldset>
             <legend>Contact details</legend>
             <p>
                 <label>Contact Name</label>
-                <input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
+                <input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" />
             </p>
             <p>
                 <label>Position</label>
-                <input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
+                <input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" />
             </p>
             <p>
                 <label>Phone</label>
-                <input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->">
+                <input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" /> 
             </p>
             <p>
                 <label>Alternative phone</label>
-                <input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
+                <input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" />
             </p>
             <p>
                 <label>Fax</label>
-                <input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->">
+                <input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" />
             </p>
             <p>
                 <label>E-mail</label>
-                <input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->">
+                <input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" />
             </p>
             <p>
                 <label>Notes</label>
@@ -78,11 +78,11 @@
             <p>
                 <label>Supplier is</label>
                     <!-- TMPL_IF name="active" -->
-                        <input type="radio" name="status" value="1" checked>Active
-                        <input type="radio" name="status" value="0">Inactive</td>
+                        <input type="radio" name="status" value="1" checked="checked" />Active
+                        <input type="radio" name="status" value="0" />Inactive</td>
                     <!-- TMPL_ELSE -->
-                        <input type="radio" name="status" value="1">Active
-                        <input type="radio" name="status" value="0" checked>Inactive</td>
+                        <input type="radio" name="status" value="1" />Active
+                        <input type="radio" name="status" value="0" checked="checked" />Inactive</td>
                     <!-- /TMPL_IF -->
             </p>
             <p>
@@ -124,7 +124,7 @@
                     <input type="radio" name="list_gst" value="1" />include GST
                     <input type="radio" name="list_gst" value="0" checked="checked" />don't include GST
 				<!-- /TMPL_IF -->
-            </p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0"><!-- /TMPL_IF -->
+            </p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0" /><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="GST" --><p>
                 <label>Invoice prices</label>
 				<!-- TMPL_IF name= "invoiceincgst" -->
@@ -134,10 +134,10 @@
                     <input type="radio" name="invoice_gst" value="1">include GST
                     <input type="radio" name="invoice_gst" value="0" checked="checked" />don't include GST
 
-            </p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0"><!-- /TMPL_IF -->
+            </p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0" /><!-- /TMPL_IF -->
             <p>
                 <label>Discount</label>
-                <input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->"> %
+                <input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %
             </p>
             <p>
                 <label>Notes</label>
@@ -149,17 +149,9 @@
 <!--TMPL_ELSE-->
     <h1>Information for : <!-- TMPL_VAR NAME="name" --></h1>
     <div id="action">
-        <div class="edit">
-            <a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">
+        <a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&amp;op=enter">
                 Edit Supplier
             </a>
-            <!-- TMPL_UNLESS name="basketcount" -->
-                <a href="javascript:confirm_deletion()">
-                    Delete Supplier
-                </a>
-            <!-- /TMPL_UNLESS -->
-        </div>
-        <div class="view">
             <a href="booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">
                 Manage Orders
             </a>
@@ -167,7 +159,6 @@
                 Receive Parcel
             </a>
         </div>
-    </div>
         <fieldset>
             <legend>Company details</legend>
             <p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
index 1e28f7e94e..926ca36cfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -87,7 +87,7 @@
   <!-- /TMPL_IF --> <!-- bookfund -->
 
 <p>
-  <a href="<!-- TMPL_VAR name=scriptname -->?op=add_form">Add bookfund</a>
+  <a href="<!-- TMPL_VAR name="scriptname" -->?op=add_form">Add bookfund</a>
   <a href="aqbudget.pl">Show all budgets</a>
 </p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
index 243ec78eeb..8962a7fb20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
@@ -145,7 +145,7 @@
         <option value="&lt;=">&lt;=</option>
     <!-- /TMPL_IF -->
       </select>
-      <input type="text" name="filter_amount" value="<!-- TMPL_VAR NAME="filter_amount" -->" size="8"/>
+      <input type="text" name="filter_amount" value="<!-- TMPL_VAR NAME="filter_amount" -->" size="8" />
     </td>
     <td>
       <input type="submit" name="filter" value="Filter" />
@@ -269,7 +269,7 @@
         </th>
         <td>
           <input type="text" size="8" maxlength="10" id="enddate" name="enddate" value="<!-- TMPL_VAR Name="enddate" -->" />
-          <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="enddate_button" />
+          <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="enddate_button" alt="" />
           <script language="JavaScript" type="text/javascript">
             Calendar.setup(
               {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index 97c8ec1705..cd82848306 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -118,8 +118,8 @@
 <!-- /TMPL_LOOP -->
 </table>
 <div id="action">
-    <a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&tagfield=<!-- TMPL_VAR name="edit_tagfield" -->&authtypecode=<!-- TMPL_VAR name="edit_authtypecode" -->">Edit subfields</a>
-    <a href="auth_tag_structure.pl?searchfield=<!-- TMPl_VAR name="tagfield" -->&authtypecode=<!-- TMPL_VAR name="authtypecode"-->">Return to Auth Structure</a>
+    <a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;tagfield=<!-- TMPL_VAR name="edit_tagfield" -->&amp;authtypecode=<!-- TMPL_VAR name="edit_authtypecode" -->">Edit subfields</a>
+    <a href="auth_tag_structure.pl?searchfield=<!-- TMPl_VAR name="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode"-->">Return to Auth Structure</a>
 </div>
     <!-- TMPL_IF NAME="previous" -->
       <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
index 10a62e0eed..a78c95f0fd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
@@ -74,17 +74,17 @@ return false;
         <p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape="HTML" -->" size="40" maxlength="100" /></p>
         <p><label for="repeatable">Repeatable</label>
             <!-- TMPL_IF NAME="repeatable" -->
-                <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked />
+                <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked" />
             <!-- TMPL_ELSE -->
-                <input type="checkbox" name="repeatable" id="repeatable" value="1"/>
+                <input type="checkbox" name="repeatable" id="repeatable" value="1" />
             <!-- /TMPL_IF -->
             &nbsp;
         </p>
         <p><label for="mandatory">Mandatory</label>
             <!-- TMPL_IF NAME="mandatory" -->
-                <input type="checkbox" name="mandatory" id="mandatory" value="1" checked="checked />
+                <input type="checkbox" name="mandatory" id="mandatory" value="1" checked="checked" />
             <!-- TMPL_ELSE -->
-                <input type="checkbox" name="mandatory" id="mandatory" value="1"/>
+                <input type="checkbox" name="mandatory" id="mandatory" value="1" />
             <!-- /TMPL_IF -->
             &nbsp;
             </p>
@@ -106,7 +106,7 @@ return false;
     </tr>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
         <input type="hidden" name="op" value="delete_confirmed" />
-        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
+        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->" />
         <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
     <tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
     <tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
@@ -116,7 +116,7 @@ return false;
 
     Data deleted
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
+    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->" />
     <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
     <input type="submit" value="OK" class="submit" />
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
index ca1a07787f..fd7b6aaa3c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
@@ -75,7 +75,7 @@ function Check(f) {
 			<!-- TMPL_ELSE -->
 				<tr><td><label for="authtypecode">Authority type<label></td><td><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
 			<!-- /TMPL_IF -->
-		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
+		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" ESCAPE="HTML" -->" /></td></tr>
 		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
 		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
 	<input type="hidden" name="op" value="add_validate" />
@@ -134,7 +134,7 @@ function Check(f) {
 </table>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<input type="hidden" name="op" value="add_form" />
-	<input type="submit" value="Add authority type" title="Add authority type" alt="Add authority type" />
+	<input type="submit" value="Add authority type" />
 	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
 	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
index c20b6092fe..32cbf9faba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tmpl
@@ -70,7 +70,7 @@ function Check(f) {
             <p><label for="frameworkcode">Framework Code</label><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></p>
         <!-- /TMPL_IF -->
         <p><label for="description">Description</label>
-        <input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></p>
+        <input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" ESCAPE="HTML" -->" /></p>
         <p>	<input type="button" value="Submit" class="submit" onclick="Check(this.form)" /></p>
     </form>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index ce49c09c8e..670b462c2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -113,7 +113,7 @@
                             <br /><!-- TMPL_VAR name="branchaddress2" escape="HTML" --><!-- /TMPL_IF -->
                         <!-- TMPL_IF name="branchaddress3" -->
                             <br /><!-- TMPL_VAR name="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
-                        <!-- TMPL_IF name=branchphone -->
+                        <!-- TMPL_IF name="branchphone" -->
                             <br />Ph: <!-- TMPL_VAR name="branchphone" escape="HTML" --><!-- /TMPL_IF -->
                         <!-- TMPL_IF name="branchfax" -->
                             <br />Fax: <!-- TMPL_VAR name="branchfax" escape="HTML" --><!-- /TMPL_IF -->
@@ -137,16 +137,16 @@
                     <!-- TMPL_VAR NAME="branchprinter" -->
                 </td>
                 <td>
-                    <a href="<!-- TMPL_VAR name=action -->?op=edit&branchcode=<!-- TMPL_VAR name=value escape="HTML" -->">Edit</a>
+                    <a href="<!-- TMPL_VAR name="action" -->?op=edit&amp;branchcode=<!-- TMPL_VAR name="value" escape="HTML" -->">Edit</a>
                 </td>
                 <td>
-                    <a href="<!-- TMPL_VAR name=action -->?branchcode=<!-- TMPL_VAR name=value escape="HTML" -->&branchname=<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->&op=delete">Delete</a>
+                    <a href="<!-- TMPL_VAR name="action" -->?branchcode=<!-- TMPL_VAR name="value" escape="HTML" -->&amp;branchname=<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->&amp;op=delete">Delete</a>
                     </form>
                 </td>
             </tr>
         <!-- /TMPL_LOOP -->
     </table>
-<form action="<!-- TMPL_VAR name=action -->" method="post">
+<form action="<!-- TMPL_VAR name="action" -->" method="post">
         <p><input type="hidden" name="op" value="add" />
         <input type="submit" value="Add New Branch" /></p>
     </form>
@@ -167,15 +167,15 @@
         <td><!-- TMPL_VAR name="categorycode" --></td>
         <td><!-- TMPL_VAR name="codedescription" --></td>
         <td>
-            <form action="<!-- TMPL_VAR name=action -->" method="post">
+            <form action="<!-- TMPL_VAR name="action" -->" method="post">
             <input type="hidden" name="op" value="editcategory" />
-            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
             <input type="submit" value="Edit" />
             </form>
         </td>
         <td>
-            <form action="<!-- TMPL_VAR name=action -->" method="post">
-            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+            <form action="<!-- TMPL_VAR name="action" -->" method="post">
+            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
             <input type="hidden" name="op" value="delete_category" /><input type="submit" value="Delete" />
             </form>
         </td>
@@ -195,15 +195,15 @@
 
 <!-- TMPL_IF name="editcategory" -->
     
-    <form action="<!-- TMPL_VAR name=action -->" name="Aform" method="post">
-    <input type="hidden" name=op value="addcategory_validate" />
+    <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
+    <input type="hidden" name="op" value="addcategory_validate" />
     <table>
         <caption><!-- TMPL_VAR name="head" --></caption>
         <tr>
             <td>Category code</td>
             <td>
                 <!-- TMPL_IF name="categorycode" -->
-                    <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+                    <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
                     <!-- TMPL_VAR name="categorycode" -->
                 <!-- TMPL_ELSE -->
                     <input type="text" name="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
@@ -212,7 +212,7 @@
         </tr>
         <tr>
             <td>Name</td>
-            <td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name=categoryname escape="HTML" -->" />&nbsp;</td>
+            <td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name="categoryname" escape="HTML" -->" />&nbsp;</td>
         </tr>
         <tr>
             <td>Description</td>
@@ -224,9 +224,9 @@
 
 <!-- TMPL_IF name="delete_category" -->
     Confirm delete:
-    <form action="<!-- TMPL_VAR name=action -->" method="post">
+    <form action="<!-- TMPL_VAR name="action" -->" method="post">
         <input type="hidden" name="op" value="categorydelete_confirmed" />
-        <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+        <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
         <input type="submit" value="YES" />
     </form>
     <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
index 18677517fe..8bcef2f15e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME=add_form --><!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
@@ -10,7 +10,7 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
-<!-- TMPL_IF NAME=add_form -->
+<!-- TMPL_IF NAME="add_form" -->
 	<script language="JavaScript" type="text/javascript">
 	//
 	function isNotNull(f,noalert) {
@@ -187,7 +187,7 @@
 		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
                         <td><!-- TMPL_VAR NAME="categorycode" --></td>
                         <td>
-                            <a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="description" --></a>
+                            <a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="description" --></a>
                         </td>
                         <td>
                             <!-- TMPL_IF NAME="type_A" -->Adult<!-- /TMPL_IF -->
@@ -202,7 +202,7 @@
                         <td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
                         <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" value="Edit" /></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME=script_name -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" value="Delete" /></form></td>
+                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" value="Delete" /></form></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
index a9d212be13..45fe055a8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categoryitem.tmpl
@@ -70,90 +70,90 @@
         <!-- /TMPL_IF -->
 
         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate">
-        <input type="hidden" name="checked" value=0>
+        <input type="hidden" name="op" value="add_validate" />
+        <input type="hidden" name="checked" value="0" />
                         
         <table>  
         <!-- TMPL_IF NAME="categorycode" -->
                 <tr>
                         <td>Category code</td>
                         <td>
-                                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
+                                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" />
                         </td>
                 </tr>
         <!-- TMPL_ELSE -->
                 <tr>
                         <td>Category code</td>
                         <td>
-                                <input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)">
+                                <input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)" />
                         </td>
                 </tr>
         <!-- /TMPL_IF -->
                 <tr>
                         <td>Description</td>
                         <td>
-                                <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" -->">
+                                <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" -->" />
                                 &nbsp;
                         </td>
                 </tr>
                 <tr>
                         <td>Enrolment period</td>
                         <td>
-                                <input type="text" name="enrolmentperiod" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->">
+                                <input type="text" name="enrolmentperiod" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->" />
                         </td>
                 </tr>
                 <tr>
                         <td>Upperage limit</td>
                         <td>
-                                <input type="text" name="upperagelimit" value="<!-- TMPL_VAR NAME="upperagelimit" -->">
+                                <input type="text" name="upperagelimit" value="<!-- TMPL_VAR NAME="upperagelimit" -->" />
                         </td>
                 </tr>
                 <tr>
                         <td>Age Required</td>
                         <td>
-                                <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->">
+                                <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" />
                         </td>
                 </tr>
                 <tr>
                         <td>Fine type</td>
                         <td>
-                                <input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME="finetype" -->">
+                                <input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME="finetype" -->" />
                         </td>
                 </tr>
                 <tr>
                         <td>Bulk</td>
                         <td>
-                                <input type="text" name="bulk" value="<!-- TMPL_VAR NAME="bulk" -->">
+                                <input type="text" name="bulk" value="<!-- TMPL_VAR NAME="bulk" -->" />
                         </td>
                 </tr>
                 <tr>
                         <td>Enrolment fee</td>
                         <td>
-                                <input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->">
+                                <input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" />
                         </td>
                 </tr>
                 <tr>
                         <td>Overdue notice required</td>
                         <td>
-                                <input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->">
+                                <input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" />
                         </td>
                 </tr>
                 <tr>
                         <td>Issue limit</td>
                         <td>
-                                <input type="text" name="issuelimit" value="<!-- TMPL_VAR NAME="issuelimit" -->">
+                                <input type="text" name="issuelimit" value="<!-- TMPL_VAR NAME="issuelimit" -->" />
                         </td>
                 </tr>
                 <tr>
                         <td>Reserve fee</td>
                         <td>
-                                <input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->">
+                                <input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" />
                         </td>
                 </tr>
                 <tr>
                         <td>&nbsp;</td>
                         <td>
-                                <input type="button" value="OK" onclick="Check(this.form)">
+                                <input type="button" value="OK" onclick="Check(this.form)" />
                         </td>
                 </tr>
         </table>
@@ -162,7 +162,7 @@
 <!-- TMPL_IF NAME="add_validate" -->
         Data recorded
         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="submit" value="OK">
+                <input type="submit" value="OK" />
         </form>
 <!-- /TMPL_IF -->
 
@@ -177,9 +177,9 @@
                                 <!-- TMPL_VAR NAME="categorycode" -->
                         </td>
                 </tr>
-                <form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
-                        <input type="hidden" name="op" value="delete_confirmed">
-                        <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
+                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                        <input type="hidden" name="op" value="delete_confirmed" />
+                        <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" />
                 <tr>
                         <td>Description</td>
                         <td><!-- TMPL_VAR NAME="description" --></td>
@@ -225,9 +225,9 @@
                         <td colspan="2">This record is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</td>
                 </tr>
                <tr>
-                        <td colspan=2>
+                        <td colspan="2">
                                 </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                                <input type="submit" value="OK">
+                                <input type="submit" value="OK" />
                                 </form>
                         </td>
                 </tr>
@@ -236,17 +236,17 @@
                         <td colspan="2">CONFIRM DELETION</td>
                 </tr>
                 <tr>
-                        <td><input type="submit" value="YES"></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME=script_name -->" method="post"><input type="submit" value="NO"></form></td>
+                        <td><input type="submit" value="YES" /></form></td>
+                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" /></form></td>
                 </tr>
                 <!-- /TMPL_IF -->
 
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=delete_confirmed -->
+<!-- TMPL_IF NAME="delete_confirmed" -->
         data deleted
-        <form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
-        <input type="submit" value="OK">
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post" />
+        <input type="submit" value="OK" />
         </form>
 
 <!-- /TMPL_IF -->
@@ -258,8 +258,8 @@
         <!-- /TMPL_IF -->
 
         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME=searchfield -->">
-                <input type="reset" name="reset" value="clr">
+                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+                <input type="reset" name="reset" value="clr" />
         </form>
 
         <table>
@@ -297,8 +297,8 @@
 
         </table>
         <p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="hidden" name="op" value="add_form">
-                <input type="submit" value="Add Category"></a><br />
+                <input type="hidden" name="op" value="add_form" />
+                <input type="submit" value="Add Category" /></a><br />
         </form></p>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
index 94eea44f38..2d045b8a2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/charges.tmpl
@@ -21,13 +21,13 @@
 		</th>
 		<!-- TMPL_LOOP NAME="cell" -->
 			<td bgcolor="<!-- TMPL_VAR name="toggle" -->">
-				<input name="<!-- TMPL_VAR name="inputname" -->" value="<!-- TMPL_VAR name="inputvalue" -->" size="6" maxlength="10">
+				<input name="<!-- TMPL_VAR name="inputname" -->" value="<!-- TMPL_VAR name="inputvalue" -->" size="6" maxlength="10" />
 			</td>
 		<!-- /TMPL_LOOP -->
 	</TR>
 <!-- /TMPL_LOOP -->
 </table>
-<input type="submit" value="Submit Changes">
+<input type="submit" value="Submit Changes" />
 </form>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
index dd2ca2ea4e..d04c7570b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tmpl
@@ -109,7 +109,7 @@
     <!-- TMPL_IF NAME="frameworknull" -->
         <tr>
             <td>framework values</td>
-            <td>there is a null value in a frameworkcode. Check the following tables<br/>
+            <td>there is a null value in a frameworkcode. Check the following tables<br />
                 <li>select * from marc_subfield_structure where frameworkcode is NULL</li>
                 <li>select * from marc_tag_structure where frameworkcode is NULL</li>
                 <li>select * from marc_biblio where frameworkcode is NULL</li></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
index 15350d5d94..1e8f401749 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl
@@ -25,7 +25,7 @@
 	<!-- /TMPL_IF -->
 	<p>
 	<label>City name</label>
-	<input  type="text" name="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" escape=HTML -->">&nbsp;
+	<input  type="text" name="city_name" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="city_name" ESCAPE="HTML" -->">&nbsp;
 	</p>
 	<p>				
 	<label>City zipcode</label>
@@ -122,8 +122,8 @@
 
 	</table>
 	<p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form">
-		<input type="submit" class="button" value="Add a city"  alt="Add city"><br>
+		<input type="hidden" name="op" value="add_form" />
+		<input type="submit" class="button" value="Add a city"  alt="Add city" /><br />
 	</form></p>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index d4f6b53c6f..277994510d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -10,7 +10,7 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
-<!-- TMPL_IF NAME=add_form -->
+<!-- TMPL_IF NAME="add_form" -->
         <script>
         //
         function isNotNull(f,noalert) {
@@ -65,11 +65,11 @@
         }
         </SCRIPT>
 
-        <form action="<!-- TMPL_VAR NAME=script_name -->" name="Aform" method="post">
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
 
 	<table>
-	<caption><!-- TMPL_IF NAME=searchfield -->
+	<caption><!-- TMPL_IF NAME="searchfield" -->
 		Modify currency
 	<!-- TMPL_ELSE -->
 		Add currency
@@ -98,7 +98,7 @@
 		</tr>
         </table>
 		
-		<input type="button" value="OK" onClick="Check(this.form)" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" />
+		<input type="button" value="OK" onclick="Check(this.form)" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" />
         </form>
 
 <!-- /TMPL_IF -->
@@ -131,7 +131,7 @@
 					<input type="submit" value="OK" />
 				</form>
 		<!-- TMPL_ELSE -->
-     	<form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
+     	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 			<input type="hidden" name="op" value="delete_confirmed" />
 			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
 				<input type="submit" value="Delete this Currency" />
@@ -155,8 +155,8 @@
 	<!-- TMPL_IF NAME="searchfield" -->
 		You searched for <!-- TMPL_VAR NAME="searchfield" --></span>
 	<!-- /TMPL_IF -->	
-        <form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME=searchfield -->" />
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
                 <input type="submit" name="Search" value="Search" />
         </form>	
 	<div class="table"><table>
@@ -174,8 +174,9 @@
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-<form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
-        <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Currency" />
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="op" value="add_form" />
+		<input type="submit" value="Add Currency" />
         </form>
 
 	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index a94910a83c..b91268f044 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -67,8 +67,7 @@ Item Types Administration
           <label for="description">Description</label>
         </th>
 	<td>
-          <input type="text" id="description" name="description" size="48" maxlength="80"
-                value="<!-- TMPL_VAR name="description" escape="HTML" -->" />
+          <input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />
         </td>
       </tr>
       <tr>
@@ -85,7 +84,7 @@ Item Types Administration
               <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="KohaImageSrc" -->
-              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->" alt="">
+              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->" alt="" />
         <!-- TMPL_ELSE -->
               <br />
         <!-- /TMPL_IF -->
@@ -102,16 +101,10 @@ Item Types Administration
   <!-- /TMPL_IF -->
             remote image
             </label>
-            <input type="text"
-                   name="remoteImage"
-                   size="48"
-              maxlength="200"
-                  value="<!-- TMPL_VAR name="remote_image" -->"
-            onmousedown="document.getElementById('remote_image_check').checked = true;"
-            />
+            <input type="text" name="remoteImage" size="48" maxlength="200" value="<!-- TMPL_VAR name="remote_image" -->" onmousedown="document.getElementById('remote_image_check').checked = true;" />
             </label>
   <!-- TMPL_IF name="remote_image" -->
-            <img src="<!-- TMPL_VAR name="remote_image" -->" />
+            <img src="<!-- TMPL_VAR name="remote_image" -->" alt="" />
   <!-- /TMPL_IF -->
           </p>
           <hr />
@@ -141,10 +134,9 @@ Item Types Administration
           <input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="
   <!-- TMPL_IF name="renewalsallowed" -->
           <!-- TMPL_VAR NAME="renewalsallowed" -->
-  <!-- /TMPL_IF -->" value="1" /><!-- Display for NPL //<input type="hidden" name="rentalcharge" value="0" /> //Display for NPL -->
+  <!-- /TMPL_IF -->" value="1" />
         </td>
       </tr>
-<!-- Hide from NPL-->
       <tr>
         <th>
           <label for="rentalcharge">Rental charge</label>
@@ -152,7 +144,7 @@ Item Types Administration
         <td>
           <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" />
         </td>
-      </tr><!--  /Hide from NPL -->
+      </tr>
       <tr>
         <th>
           <label for="rentalcharge">Summary</label>
@@ -214,7 +206,7 @@ Item Types Administration
     <!-- TMPL_ELSE -->
   <tr class="highlight">
     <!-- /TMPL_IF -->
-    <td><img src="<!-- TMPL_VAR name="imageurl" -->" /></td>
+    <td><img src="<!-- TMPL_VAR name="imageurl" -->" alt="" /></td>
     <td>
       <a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->">
         <!-- TMPL_VAR name="itemtype" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index c82d626ca6..c53ed78166 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -155,7 +155,7 @@
     <input type="submit" value="Return to Marc Structure" />
 </form>
 <!-- TMPL_IF NAME="previous" -->
-    <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
+    <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" />
     </a><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="next" -->
     <!-- TMPL_VAR NAME="next" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
index 98e9bf4978..2b6117d969 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
@@ -64,12 +64,12 @@
 <!-- TMPL_IF NAME="add_form" -->
 <!-- ------------------------------------------------------------------------ -->
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate">
-	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+        <input type="hidden" name="op" value="add_validate" />
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
         <h2><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h2>
-	 <p><label>Tag</label><input id="tagfield" type="text" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" maxlength="3" size="3"/></p>    
-    <p><label for="liblibrarian">Label for lib</label><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="40" maxlength="100"></p>
-    <p><label for="libopac">Label for opac</label><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="40" maxlength="100"></p>
+	 <p><label>Tag</label><input id="tagfield" type="text" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" maxlength="3" size="3" /></p>    
+    <p><label for="liblibrarian">Label for lib</label><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" ESCAPE="HTML" -->" size="40" maxlength="100" /></p>
+    <p><label for="libopac">Label for opac</label><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" ESCAPE="HTML" -->" size="40" maxlength="100" /></p>
     <p><label for="repeatable">Repeatable</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
     <p><label for="mandatory">Mandatory</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
     <p><label for="authorised_value">Authorized value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
@@ -88,21 +88,21 @@
     <p>Tag: <!-- TMPL_VAR NAME="searchfield" --></p>
     <p>Description: <!-- TMPL_VAR NAME="liblibrarian" --></p>
     </table>
-    <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">	<input type="submit" value="Yes, Delete this Tag"></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do Not Delete"></form>
+    <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" value="Yes, Delete this Tag" /></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do Not Delete" /></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 <!-- ------------------------------------------------------------------------ -->
     <div class="details"><h3>Tag Deleted</h3>
-    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
-    <input type="submit" value="Return to MARC Tag Structure">
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+    <input type="submit" value="Return to MARC Tag Structure" />
     </form>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="framework_create" -->
 <!-- ------------------------------------------------------------------------ -->
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="framework_create_confirm">
-        <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+        <input type="hidden" name="op" value="framework_create_confirm" />
+        <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
         Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
         <select name="existingframeworkcode">
             <option value="">Default</option>
@@ -110,7 +110,7 @@
             <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
         <!-- /TMPL_LOOP -->
         </select>
-        <input type="submit" value="OK">
+        <input type="submit" value="OK" />
     </form>
 <!-- /TMPL_IF -->
 
@@ -132,8 +132,8 @@
     </p>
     <p>
         <label for="searchfield">Search for Tag</label>
-        <input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
-        <input type="submit" value="Search">
+        <input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+        <input type="submit" value="Search" />
     </p>
     <p>
         <!-- TMPL_IF Name="select_display"-->
@@ -199,11 +199,11 @@
     <!-- TMPL_IF NAME="isprevpage" -->
             <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">&lt;&lt; Previous</a>
         <!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-    <input type="hidden" name="op" value="add_form">
+    <input type="hidden" name="op" value="add_form" />
     <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form">
-	<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield"-->">
-    <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+        <input type="hidden" name="op" value="add_form" />
+	<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield"-->" />
+    <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
         <input type="submit" value="Add Tag" />
     </form>
         <!-- TMPL_IF NAME="nextpage" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
index f91b08a31e..5447d27433 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration &rsaquo;
-<!-- TMPL_IF NAME=add_form --><!-- TMPL_IF NAME="searchfield" -->Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Printer Added<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->Printer Deleted<!-- /TMPL_IF -->
@@ -10,7 +10,7 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
-<!-- TMPL_IF NAME=add_form -->
+<!-- TMPL_IF NAME="add_form" -->
         <script language="JavaScript" type="text/javascript">
         //
         function isNotNull(f,noalert) {
@@ -79,7 +79,7 @@
 		<tr>
 			<td>Printer Name</td>
 			<td>
-				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME=searchfield -->" /><!-- TMPL_VAR NAME="searchfield" -->
+				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
 			</td>
 		</tr>
 	<!-- TMPL_ELSE -->
@@ -153,7 +153,7 @@
 
 <!-- TMPL_IF NAME="else" -->
 <h2>Printer Admin</h2>
-	<!-- TMPL_IF NAME=searchfield -->
+	<!-- TMPL_IF NAME="searchfield" -->
 		You searched for <!-- TMPL_VAR NAME="searchfield" --></span>
 	<!-- /TMPL_IF -->
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
@@ -167,7 +167,7 @@
 			<th>Type</th>
 			<th>&nbsp;</th>
 		</tr>
-		<!-- TMPL_LOOP NAME=loop -->
+		<!-- TMPL_LOOP NAME="loop" -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="printername" --></td>
 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
index a9fc5b99ea..da88a2c2a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/roadtype.tmpl
@@ -12,9 +12,9 @@
 	<!-- /TMPL_IF -->
 
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-	<input type="hidden" name="op" value="add_validate">
-	<input type="hidden" name="checked" value="0">
-	<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->">
+	<input type="hidden" name="op" value="add_validate" />
+	<input type="hidden" name="checked" value="0" />
+	<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" />
 
 <!-- TMPL_IF NAME="roadtypeid" -->
 
@@ -28,13 +28,13 @@
 	<p>			
 	<label>Road type</label>
 		
-	<input  type="text" name="road_type" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="road_type" escape=HTML -->">
+	<input  type="text" name="road_type" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="road_type" ESCAPE="HTML" -->" />
 				
 	</p>
 	
 	<p>					  
 	<div >
-		<input class="button" type="button" onclick="Check(this.form)" value="OK">
+		<input class="button" type="button" onclick="Check(this.form)" value="OK" />
 	</div>	
 	</p>
 	</form>
@@ -49,8 +49,8 @@
 			</td>
 		</tr>
 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed">
-			<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->">        
+			<input type="hidden" name="op" value="delete_confirmed" />
+			<input type="hidden" name="roadtypeid" value="<!-- TMPL_VAR NAME="roadtypeid" -->" />
 		<tr>
 			<td>Rod type</td>
 			<td><!-- TMPL_VAR NAME="road_type" --></td>
@@ -60,9 +60,9 @@
 			<td colspan="2" align="center">Confirm deletion</td>
 		</tr>
 		<tr>
-			<td><input type="submit" value="YES"></form></td>
+			<td><input type="submit" value="YES" /></form></td>
 			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="submit" value="NO"></form></td>
+			<input type="submit" value="NO" /></form></td>
 		</tr>	
 	</table>
 <!-- /TMPL_IF -->
@@ -73,8 +73,8 @@
 		Search on  <!-- TMPL_VAR NAME="searchfield" -->
 	<!-- /TMPL_IF -->
 	<form action="<TMPL_VAR NAME="script_name">" method="post">
-		<input type="text" name="road_type" value="<!-- TMPL_VAR NAME="searchfield" -->">
-		<input type="submit" name="submit" value="OK" class="button">
+		<input type="text" name="road_type" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+		<input type="submit" name="submit" value="OK" class="button" />
 	</form>
 
 	<table>
@@ -97,8 +97,8 @@
 
 	</table>
 	<p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form">
-		<input type="submit" class="button" value="Add road type"  alt="Add road type"><br>
+		<input type="hidden" name="op" value="add_form" />
+		<input type="submit" class="button" value="Add road type" /><br />
 	</form></p>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
index 372fbfbe6e..c3720f0b70 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/thesaurus.tmpl
@@ -113,7 +113,7 @@
     <form action="/cgi-bin/koha/admin/thesaurus.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" value="New Category" /></form>
     
     <!-- TMPL_LOOP name="hierarchy_loop" -->
-        <a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
+        <a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&amp;search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
     <!-- /TMPL_LOOP -->
     
 <!-- TMPL_IF NAME="loop" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
index 9022de97b2..bc1d332129 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; System Administration &rsaquo; <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME=searchfield -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server Deleted<!-- /TMPL_IF --></title>
@@ -82,13 +82,13 @@
        
         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
-<!-- TMPL_IF NAME=searchfield -->
+<!-- TMPL_IF NAME="searchfield" -->
                 <h1>Modify Z39.50 Server</h1>
         <!-- TMPL_ELSE -->
                 <h1>Add Z39.50 Server</h1>
         <!-- /TMPL_IF -->                
         <table>
-        <!-- TMPL_IF NAME=searchfield -->
+        <!-- TMPL_IF NAME="searchfield" -->
                 <tr>
                         <th>Z39.50 Server</th>
                         <td>
@@ -145,7 +145,7 @@
 			</td>
 		</tr>
 				<tr>
-			<th>Syntax (z3950 can send<br>
+			<th>Syntax (z3950 can send<br />
 			 records in various format. Choose one)</th>
 			<td>
 				<select name="syntax">
@@ -154,7 +154,7 @@
 				</select>
 			</td>
 		</tr>
-        </table><input type="button" value="<!-- TMPL_IF NAME=searchfield -->Update Z39.50 Server<!-- TMPL_ELSE -->Add Z39.50 Server<!-- /TMPL_IF -->" onclick="Check(this.form)" />  <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" />
+        </table><input type="button" value="<!-- TMPL_IF NAME="searchfield" -->Update Z39.50 Server<!-- TMPL_ELSE -->Add Z39.50 Server<!-- /TMPL_IF -->" onclick="Check(this.form)" />  <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" />
         </form>
 <!-- /TMPL_IF -->
 
@@ -219,7 +219,7 @@
 </form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=else -->
+<!-- TMPL_IF NAME="else" -->
 <h3>Z39.50 Servers Admininistration</h3>
          <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
                 <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
@@ -240,7 +240,7 @@
 						<th>Syntax</th>
                         <th colspan="2">&nbsp;</th>
                 </tr>
-                <!-- TMPL_LOOP NAME=loop -->
+                <!-- TMPL_LOOP NAME="loop" -->
                <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
                         <td><!-- TMPL_VAR NAME="name" --></td>
                         <td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl
index aa2d12e89a..0b7722d57f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/auth_finder.tmpl
@@ -6,52 +6,52 @@
 <h1 class="authority">Authority search</h1>
 
 <form name="f" action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
-	<input type="hidden" name="op" value="do_search">
-	<input type="hidden" name="type" value="intranet">
-	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
+	<input type="hidden" name="op" value="do_search" />
+	<input type="hidden" name="type" value="intranet" />
+	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
 	<div id="bloc25">
 		<h2 class="authority">Search on</h2>
 		<p>
 			<label class="label100">Authority type</label>
 			<!-- TMPL_VAR NAME="authtypecode" -->
-			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->" />
 		</p>
 		<p>
           <label class="label100">Main entry ($a only)</label>
-          <input type="hidden" name="marclist" value="mainmainentry">
-          <input type="hidden" name="and_or" value="and">
-          <input type="hidden" name="excluding" value="">
+          <input type="hidden" name="marclist" value="mainmainentry" />
+          <input type="hidden" name="and_or" value="and" />
+          <input type="hidden" name="excluding" value="" />
           <select name="operator">
             <option value="contains">contains</option>
             <option value="start">starts by</option>
             <option value="is">is exactly</option>
           </select>
-          <input id="value_mainmainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="resultstring" -->">
+          <input id="value_mainmainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="resultstring" -->" />
 		</p>
         <p>
           <label for="value_mainentry">Main entry</label>
-          <input type="hidden" name="marclist" value="mainentry">
-          <input type="hidden" name="and_or" value="and">
-          <input type="hidden" name="excluding" value="">
+          <input type="hidden" name="marclist" value="mainentry" />
+          <input type="hidden" name="and_or" value="and" />
+          <input type="hidden" name="excluding" value="" />
           <select name="operator">
             <option value="contains">contains</option>
             <option value="start">starts by</option>
             <option value="is">is exactly</option>
           </select>
-          <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+          <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
         </p>
         <p>
           <label for="value_anywhere">Anywhere</label>
-          <input type="hidden" name="marclist" value="">
-          <input type="hidden" name="and_or" value="and">
-          <input type="hidden" name="excluding" value="">
+          <input type="hidden" name="marclist" value="" />
+          <input type="hidden" name="and_or" value="and" />
+          <input type="hidden" name="excluding" value="" />
           <select name="operator">
             <option value="contains">contains</option>
             <option value="start">starts by</option>
             <option value="is">is exactly</option>
           </select>
-          <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+          <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
         </p>
         <p>
           Sort by <select name="orderby">
@@ -59,7 +59,7 @@
 	    <option value="HeadingAsc">Heading Ascendant</option>
 	    <option value="HeadingDsc">Heading Descendant</option>
 	  </select>
-			<input type="submit" value="Start search" class="button authority">
+			<input type="submit" value="Start search" class="button" />
 		</p>
 	</div>
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
index ef06304306..2079d6bdde 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
@@ -9,9 +9,9 @@
   <legend>Authority search</legend>
 
   <form name="f" action="/cgi-bin/koha/authorities/authorities-home.pl" method="post">
-    <input type="hidden" name="op" value="do_search">
-    <input type="hidden" name="type" value="intranet">
-    <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
+    <input type="hidden" name="op" value="do_search" />
+    <input type="hidden" name="type" value="intranet" />
+    <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
 
     <table>
       <tr>
@@ -33,7 +33,7 @@
       <tr>
         <th>
           <label for="value_mainmainentry">Main entry ($a only)</label>
-          <input type="hidden" name="marclist" value="mainmainentry">
+          <input type="hidden" name="marclist" value="mainmainentry" />
         </th>
         <td>
           <select name="operator">
@@ -43,15 +43,15 @@
 	  </select>
         </td>
         <td>
-          <input id="value_mainmainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+          <input id="value_mainmainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
         </td>
       </tr>
       <tr>
         <th>
           <label for="value_mainentry">Main entry</label>
-          <input type="hidden" name="marclist" value="mainentry">
-          <input type="hidden" name="and_or" value="and">
-          <input type="hidden" name="excluding" value="">
+          <input type="hidden" name="marclist" value="mainentry" />
+          <input type="hidden" name="and_or" value="and" />
+          <input type="hidden" name="excluding" value="" />
         </th>
         <td>
           <select name="operator">
@@ -61,16 +61,16 @@
 	  </select>
         </td>
         <td>
-          <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+          <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" /> 
         </td>
       </tr>
 
       <tr>
         <th>
           <label for="value_anywhere">Anywhere</label>
-          <input type="hidden" name="marclist" value="">
-          <input type="hidden" name="and_or" value="and">
-          <input type="hidden" name="excluding" value="">
+          <input type="hidden" name="marclist" value="" />
+          <input type="hidden" name="and_or" value="and" />
+          <input type="hidden" name="excluding" value="" />
         </th>
         <td>
           <select name="operator">
@@ -80,7 +80,7 @@
           </select>
         </td>
         <td>
-          <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+          <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
         </td>
       </tr>
     </table>
@@ -120,7 +120,7 @@
     </table>
 
     <div id="action">
-      <input type="submit" value="Add" class="button authority">
+      <input type="submit" value="Add" class="button" />
     </div>
   </form>
 </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index 0ee7fefc5a..ba98ae0bf9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -12,26 +12,26 @@
   <h1>Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 <!-- /TMPL_IF -->  
   <form method="post" name="f">
-    <input type="hidden" name="op" value="add">
-    <input type="hidden" name="addfield_field" value="">
-    <input type="hidden" name="repeat_field" value="">
-    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-    <input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
+    <input type="hidden" name="op" value="add" />
+    <input type="hidden" name="addfield_field" value="" />
+    <input type="hidden" name="repeat_field" value="" />
+    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+    <input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->" />
 
     <div id="action">
 <!-- TMPL_IF name="authid" -->
-      <input type="button" value="Save" onClick="Check(this.form)" accesskey="w">
+      <input type="button" value="Save" onclick="Check(this.form)" accesskey="w" />
 <!-- TMPL_ELSE -->
-      <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w">
+      <input type="button" value="Add authority" onclick="Check(this.form)" accesskey="w" />
 <!-- /TMPL_IF -->
     </div>
 
 <!-- TMPL_IF name="duplicateauthid" -->
 	<div class="problem">
-		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
+		<p>Duplicate suspected with <a href="javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&amp;popup=1", "Duplicate Authority");" class="button"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
 		<p>You must either :</p>
 		<ul>
-			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
+			<p><input type="checkbox" value="1" name="confirm_not_duplicate" />confirm it's not a duplicate (and click on <input type="button" value="Add authority" onclick="Check(this.form)" accesskey="w" class="button" /> again)</p>
 			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
 		</ul>
 	</div>
@@ -40,16 +40,16 @@
 <!-- TMPL_LOOP NAME="0XX" -->
     <!-- TMPL_IF name="tag" -->
         <p class="tag">
-            <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
+            <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->" />
             <!-- TMPL_UNLESS name="hide_marc" -->
                 <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffffff;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
+                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffffff;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat" /> -
             <!-- TMPL_ELSE -->
-                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->" />
             <!-- /TMPL_UNLESS -->
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
             <!-- TMPL_IF name="repeatable" -->
-                <a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden"  value="" size="2" onchange="AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" >
+                <a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden" value="" size="2" onchange="AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" />
             <!-- /TMPL_IF -->
         </p>
     <!-- /TMPL_IF -->
@@ -67,10 +67,10 @@
                 <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield"> 
             <!-- /TMPL_UNLESS -->
             <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-                    <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
+                    <img <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')" />
+                    <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" disabled="disabled" readonly="readonly" tabindex="-1" />
                 <!-- TMPL_ELSE -->
-                    <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
+                    <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" />
                 <!-- /TMPL_UNLESS -->
                 <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
                     <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
@@ -82,11 +82,11 @@
                     <!-- TMPL_IF NAME="repeatable" -->
                         <a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
                     <!-- /TMPL_IF -->
-                    <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-                    <input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-                    <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-                    <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-                    <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
+                    <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
+                    <input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1" />
+                    <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
+                    <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
+                    <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->" />
                 </p>
         </div>
     <!-- /TMPL_LOOP -->
@@ -95,29 +95,29 @@
 </div>	
 		<div name="hidden" id="hidden" class="tab">
 		<!-- TMPL_LOOP NAME="hidden_loop" -->
-				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
-				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
+				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
+				<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" />
+				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
+				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
+				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->" />
 		<!-- /TMPL_LOOP -->
 		</div>
 		<!-- TMPL_IF name="oldauthnumtagfield" -->
-			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthnumtagfield" -->">
-			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthnumtagsubfield" -->">
-			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authid" -->">
-			<input type="hidden" name="mandatory" value="0">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
-			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthtypetagfield" -->">
-			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->">
-			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthnumtagfield" -->" />
+			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthnumtagsubfield" -->" />
+			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authid" -->" />
+			<input type="hidden" name="mandatory" value="0" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
+			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->" />
+			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthtypetagfield" -->" />
+			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->" />
+			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
 		<!-- /TMPL_IF -->
     <div id="action">
 <!-- TMPL_IF name="authid" -->
-      <input type="button" value="Save" onClick="Check(this.form)" accesskey="w">
+      <input type="button" value="Save" onclick="Check(this.form)" accesskey="w" />
 <!-- TMPL_ELSE -->
-      <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w">
+      <input type="button" value="Add authority" onclick="Check(this.form)" accesskey="w" />
 <!-- /TMPL_IF -->
     </div>
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
index 6c9f2dcf18..1483bef840 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
 <!-- TMPL_IF Name="displayhierarchy"-->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/hierarchy.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/hierarchy.css" />
 <script language="JavaScript" type="text/javascript">
 function showParents(mynumber) {
   var parents=document.getElementsByName(mynumber+'p')
@@ -46,7 +46,7 @@ function showChildren(mynumber) {
         <a href="detail.pl?authid=<!--TMPL_VAR Name="loopauthid" -->" title="Term"><!--TMPL_VAR Name="value" --></a>
     <!-- /TMPL_IF -->
     <!--TMPL_IF Name="ifchildren" -->
-      <sub><a class="parents" title="Narrower terms" href="JavaScript:showChildren('<!--TMPL_VAR Name="loopauthid" -->');">+</a></sub><br/>
+      <sub><a class="parents" title="Narrower terms" href="JavaScript:showChildren('<!--TMPL_VAR Name="loopauthid" -->');">+</a></sub><br />
       <!--TMPL_LOOP Name="loopchildren" -->
         <div name="<!--TMPL_VAR Name="loopauthid" -->c" class="child"> <a href="detail.pl?authid=<!--TMPL_VAR Name="childauthid" -->"><!--TMPL_VAR Name="childvalue" --></a></div>
       <!--/TMPL_LOOP-->
@@ -68,7 +68,7 @@ function showChildren(mynumber) {
 <a href="javascript:confirm_deletion()">Delete</a>
 <!-- /TMPL_UNLESS -->
 
-<a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button authority"><!-- TMPL_VAR name="count" --> biblios</a>
+<a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button"><!-- TMPL_VAR name="count" --> biblios</a>
 </div>
 
 <div id="authorities_detail_details">
@@ -87,12 +87,12 @@ function showChildren(mynumber) {
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
                             <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
              <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
index bf0ec302da..197b37086b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
@@ -5,55 +5,55 @@
     <h1 class="authority">Authority search results</h1>
     <div id="bloc25">
         <form name="f" method="post" action="auth_finder.pl">
-            <input type="hidden" name="op" value="do_search">
-            <input type="hidden" name="type" value="intranet">
-            <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-            <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+            <input type="hidden" name="op" value="do_search" />
+            <input type="hidden" name="type" value="intranet" />
+            <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+            <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->" />
             <div id="bloc25">
                 <h2 class="authority">Search on</h2>
                 <p>
                     <label class="label100">Authority type</label>
                     <!-- TMPL_VAR NAME="authtypecode" -->
-                    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+                    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
                 </p>
                 <p>
                     <label class="label100">Main entry ($a only)</label>
-                    <input type="hidden" name="marclist" value="mainmainentry">
-                    <input type="hidden" name="and_or" value="and">
-                    <input type="hidden" name="excluding" value="">
+                    <input type="hidden" name="marclist" value="mainmainentry" />
+                    <input type="hidden" name="and_or" value="and" />
+                    <input type="hidden" name="excluding" value="" />
                     <select name="operator">
                         <option value="contains">contains</option>
                         <option value="start">starts by</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value" value="<!-- TMPL_VAR name="mainmainstring" -->">
+                    <input type="text" name="value" value="<!-- TMPL_VAR name="mainmainstring" -->" />
                 </p>
                 <p>
                     <label class="label100">Main entry</label>
-                    <input type="hidden" name="marclist" value="mainentry">
-                    <input type="hidden" name="and_or" value="and">
-                    <input type="hidden" name="excluding" value="">
+                    <input type="hidden" name="marclist" value="mainentry" />
+                    <input type="hidden" name="and_or" value="and" />
+                    <input type="hidden" name="excluding" value="" />
                     <select name="operator">
                         <option value="contains">contains</option>
                         <option value="start">starts by</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value" value="<!-- TMPL_VAR name="mainstring" -->">
+                    <input type="text" name="value" value="<!-- TMPL_VAR name="mainstring" -->" />
                 </p>
                 <p>
                     <label class="label100">Anywhere</label>
-                    <input type="hidden" name="marclist" value="">
-                    <input type="hidden" name="and_or" value="and">
-                    <input type="hidden" name="excluding" value="">
-                    <select name="operator">
+                    <input type="hidden" name="marclist" value="" />
+                    <input type="hidden" name="and_or" value="and" />
+                    <input type="hidden" name="excluding" value="" />
+                    <select name="operator" >
                         <option value="contains">contains</option>
                         <option value="start">starts by</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value" value="<!-- TMPL_VAR name="anystring" -->">
+                    <input type="text" name="value" value="<!-- TMPL_VAR name="anystring" -->" />
                 </p>
                 <p>
-                <input type="submit" value="Start search" class="button authority">
+                <input type="submit" value="Start search" class="button" />
                 </p>
             </div>
         </form>
@@ -62,7 +62,7 @@
         <div id="resultnumber">
             <p>
                 <!-- TMPL_IF name="displayprev" -->
-                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&amp;<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->">
                         &lt;&lt;
                     </a>
                 <!-- /TMPL_IF -->
@@ -70,20 +70,20 @@
                     <!-- TMPL_IF name="highlight" -->
                         <!-- TMPL_VAR NAME="number" -->
                     <!-- TMPL_ELSE -->
-                        <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                        <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&amp;<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->">
                             <!-- TMPL_VAR NAME="number" --></a>
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
                 <!-- TMPL_IF name="displaynext" -->
-                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&amp;<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->">
                         &gt;&gt;</a>
                 <!-- /TMPL_IF -->
             </p>
             <p>
                 <!-- TMPL_IF name="total" -->
-                    &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
+                    &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br /><br />
                 <!-- TMPL_ELSE -->
-                    &nbsp;No results found.<br>
+                    &nbsp;No results found.<br />
                 <!-- /TMPL_IF -->
             </p>
         </div>
@@ -98,7 +98,7 @@
                     <td>&nbsp;</td>
                     <td>&nbsp;</td>
                     <td>
-                        <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->')" class="button authority">
+                        <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->')" class="button">
                             Clear
                         </a>
                     </td>
@@ -117,7 +117,7 @@
         <div id="resultnumber">
             <p>
                 <!-- TMPL_IF name="displayprev" -->
-                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&amp;<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranetamp;&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->">
                         &lt;&lt;
                     </a>
                 <!-- /TMPL_IF -->
@@ -125,12 +125,12 @@
                     <!-- TMPL_IF name="highlight" -->
                         <!-- TMPL_VAR NAME="number" -->
                     <!-- TMPL_ELSE -->
-                        <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                        <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&amp;<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->">
                             <!-- TMPL_VAR NAME="number" --></a>
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
                 <!-- TMPL_IF name="displaynext" -->
-                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->">
                         &gt;&gt;</a>
                 <!-- /TMPL_IF -->
             </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
index 7dc11feeae..ee015aaa7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
@@ -32,7 +32,7 @@
       <td><a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->"><!-- TMPL_VAR NAME="summary" --></a></td>
   <!-- TMPL_UNLESS name="isEDITORS" -->
       <td>
-        <a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a>
+        <a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button"><!-- TMPL_VAR NAME="used" --> biblio(s)</a>
       </td>
   <!-- /TMPL_UNLESS -->
       <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
index f63fc5b016..901d50b79e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
 
-<h1 class="catalogue">MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
+<h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
 
 <!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index de75880116..98ba0c1192 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -68,12 +68,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -98,12 +98,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -128,12 +128,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -158,12 +158,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -188,12 +188,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->"> alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -218,12 +218,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -248,12 +248,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -278,12 +278,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -308,12 +308,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -338,12 +338,12 @@
                     <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
                     <!-- TMPL_VAR NAME="marc_value" -->
                     <!-- TMPL_IF name="link" -->
-                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->" alt="Search on <!-- TMPL_VAR name="marc_value" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button">Auth</a>
                     <!-- /TMPL_IF -->
                 </p>
             <!-- /TMPL_LOOP -->
@@ -352,7 +352,7 @@
     </div>
     
     <div id="10XX" class="content_hidden">
-        <br/>
+        <br />
         <table class="noborder">
                 <tr>
                     <!-- TMPL_LOOP NAME="item_header_loop" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index 500af0b7b4..ed381effad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -20,7 +20,7 @@
         <legend>Select local databases</legend>
             <p>
                 <!-- TMPL_LOOP NAME="local_servers_loop" -->
-                <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->"><img width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR NAME="label" --></label>
+                <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->" /><label for="<!-- TMPL_VAR NAME="id" -->"><img width="16" height="16" alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /> <!-- TMPL_VAR NAME="label" --></label>
                 <!-- /TMPL_LOOP -->
             </p>
 </fieldset>
@@ -33,7 +33,7 @@
     <legend>Select remote databases:</legend>
         <p>
                 <!-- TMPL_LOOP NAME="outer_servers_loop" -->
-                <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->"/><label for="<!-- TMPL_VAR NAME="id" -->"><img alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->"/><!-- TMPL_VAR NAME="label" --></label>
+                <input type="checkbox" id="<!-- TMPL_VAR NAME="id" -->" name="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="checked" -->checked="<!-- TMPL_VAR NAME="checked" -->"<!-- /TMPL_IF --> value="<!-- TMPL_VAR NAME="value" -->" /><label for="<!-- TMPL_VAR NAME="id" -->"><img alt="<!-- TMPL_VAR NAME="id" -->" src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="icon" -->" /><!-- TMPL_VAR NAME="label" --></label>
                 <!-- /TMPL_LOOP -->
     </p>
     </fieldset>
@@ -48,15 +48,15 @@
 
         <!-- TMPL_IF NAME="expanded_options" -->
             <!-- TMPL_IF NAME="scan_index" -->
-                <p><label for='scan'>Scan Indexes</label><input type='checkbox' name='scan' id='scan' value='1'/></p>
+                <p><label for="scan">Scan Indexes</label><input type="checkbox" name="scan" id="scan" value="1" /></p>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
             <p>
         <!-- TMPL_IF NAME="expanded_options" -->
-            <select name='op'>
-                <option value='and' selected='selected'>and</option>
-                <option value='or'>or</option>
-                <option value='not'>not</option>
+            <select name="op">
+                <option value="and" selected="selected">and</option>
+                <option value="or">or</option>
+                <option value="not">not</option>
             </select>
         <!-- /TMPL_IF --> 
         <select name="idx">
@@ -86,7 +86,7 @@
     <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
 
         </select>
-        <input id="search_box" type="text" size="30" name="q" title="Enter search terms" value=""/>
+        <input id="search_box" type="text" size="30" name="q" title="Enter search terms" value="" />
         <!-- TMPL_IF NAME="expanded_options" -->
             <!-- TMPL_IF NAME="add_field" -->
                 <a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a>
@@ -102,7 +102,7 @@
         <tr>
       <!--TMPL_LOOP Name="itemtypeloop"-->
         <td><p>
-        <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF --><input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/>&nbsp;
+        <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF --><input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->" />&nbsp;
         <!--TMPL_VAR Name="description" --></p></td>
         <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
       <!--/TMPL_LOOP-->
@@ -117,19 +117,19 @@
     <legend>Limit type to: match any of the following</legend>
     <table class="itemtypes">
             <tr>
-                <td><input type="checkbox" id="mc-bks" name="limit" value="mc:t"/><label for="mc-bks" title="Books, Pamphlets, Technical reports, Manuscripts, Legal papers, Theses and dissertations"><img border="0" src="/intranet-tmpl/prog/img/AF.gif" alt="Books" />Books</label></td>
-                <td><input type="checkbox" id="mc-vis" name="limit" value="mc:v"/><label for="mc-vis" title="Motion pictures, Videorecordings, Filmstrips, Slides, Transparencies, Photos, Cards, Charts, Drawings"><img border="0" src="/intranet-tmpl/prog/img/AV Aids.gif" alt="Visual Materials" />Visual Materials</label></td>
-                <td><input type="checkbox" id="mc-sr" name="limit" value="mc-rtype:i"/><label for="mc-sr" title="Spoken, Books on CD and Cassette"><img border="0" src="/intranet-tmpl/prog/img/AF.gif" alt="Books on Tape" />Books on Tape</label></td>
+                <td><input type="checkbox" id="mc-bks" name="limit" value="mc:t" /><label for="mc-bks" title="Books, Pamphlets, Technical reports, Manuscripts, Legal papers, Theses and dissertations"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books" />Books</label></td>
+                <td><input type="checkbox" id="mc-vis" name="limit" value="mc:v" /><label for="mc-vis" title="Motion pictures, Videorecordings, Filmstrips, Slides, Transparencies, Photos, Cards, Charts, Drawings"><img border="0" src="/intranet-tmpl/prog/en/images/AV Aids.gif" alt="Visual Materials" />Visual Materials</label></td>
+                <td><input type="checkbox" id="mc-sr" name="limit" value="mc-rtype:i" /><label for="mc-sr" title="Spoken, Books on CD and Cassette"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Books on Tape" />Books on Tape</label></td>
             </tr>
             <tr>
-                <td><input type="checkbox" id="mc-cf" name="limit" value="mc:c"/><label for="mc-cf" title="Computer files, Data, Software"><img border="0" src="/intranet-tmpl/prog/img/CD-ROM software.gif" alt="Computer Files" />Computer Files</label></td>
-                <td><input type="checkbox" id="mc-lh" name="limit" value="mc-collection:LH"/><label for="mc-lh" title="Local History Materials"><img border="0" src="/intranet-tmpl/prog/img/Local history.gif" alt="Local History Materials" />Local History Materials</label></td>
-                <td><input type="checkbox" id="mc-map" name="limit" value="mc:a"/><label for="mc-map" title="Maps, Globes"><img border="0" src="/intranet-tmpl/prog/img/PF.gif " alt="Maps" />Maps</label></td>
+                <td><input type="checkbox" id="mc-cf" name="limit" value="mc:c" /><label for="mc-cf" title="Computer files, Data, Software"><img border="0" src="/intranet-tmpl/prog/en/images/CD-ROM software.gif" alt="Computer Files" />Computer Files</label></td>
+                <td><input type="checkbox" id="mc-lh" name="limit" value="mc-collection:LH" /><label for="mc-lh" title="Local History Materials"><img border="0" src="/intranet-tmpl/prog/en/images/Local history.gif" alt="Local History Materials" />Local History Materials</label></td>
+                <td><input type="checkbox" id="mc-map" name="limit" value="mc:a" /><label for="mc-map" title="Maps, Globes"><img border="0" src="/intranet-tmpl/prog/en/images/PF.gif " alt="Maps" />Maps</label></td>
             </tr>
             <tr>
-                <td><input type="checkbox" id="mc-mus" name="limit" value="mc-rtype:j"/><label for="mc-mus" title="Music"><img border="0" src="/intranet-tmpl/prog/img/CDM.gif" alt="Music" />Music</label></td>
-                <td><input type="checkbox" id="mc-kit" name="limit" value="mc-rtype:o"/><label for="mc-kit" title="Kits"><img border="0" src="/intranet-tmpl/prog/img/KIT.gif" alt="Kits" />Kits</label></td>
-                <td><input type="checkbox" id="mc-ref" name="limit" value="mc-collection:REF"/><label for="mc-ref" title="Reference"><img border="0" src="/intranet-tmpl/prog/img/REF.gif" alt="Reference" />Reference</label></td>
+                <td><input type="checkbox" id="mc-mus" name="limit" value="mc-rtype:j" /><label for="mc-mus" title="Music"><img border="0" src="/intranet-tmpl/prog/en/images/CDM.gif" alt="Music" />Music</label></td>
+                <td><input type="checkbox" id="mc-kit" name="limit" value="mc-rtype:o" /><label for="mc-kit" title="Kits"><img border="0" src="/intranet-tmpl/prog/en/images/KIT.gif" alt="Kits" />Kits</label></td>
+                <td><input type="checkbox" id="mc-ref" name="limit" value="mc-collection:REF" /><label for="mc-ref" title="Reference"><img border="0" src="/intranet-tmpl/prog/en/images/REF.gif" alt="Reference" />Reference</label></td>
                 
             </tr>
             
@@ -425,7 +425,7 @@
         </select>
         </p>
         <p>
-        <label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="limit" value="datedue:0000-00-00"/></p>
+        <label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="limit" value="datedue:0000-00-00" /></p>
     </fieldset>
 <!-- /AVAILABILITY LIMITS -->
 
@@ -434,42 +434,42 @@
     <p><select id="sort_by" name="sort_by">
         <option value="">Field-weighted, Relevance Ranked</option>
         <!--TMPL_IF Name="9523a"-->
-          <option value="1=9523 &gt;i" selected>Popularity (Most to Least)</option>
+          <option value="1=9523 &gt;i" selected="selected">Popularity (Most to Least)</option>
         <!--TMPL_ELSE -->
           <option value="1=9523 &gt;i">Popularity (Most to Least)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="9523d"-->
-          <option value="1=9523 &lt;i" selected>Popularity (Least to Most)</option>
+          <option value="1=9523 &lt;i" selected="selected">Popularity (Least to Most)</option>
         <!--TMPL_ELSE -->
           <option value="1=9523 &lt;i">Popularity (Least to Most)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="1003d"-->
-          <option value="1=1003 &lt;i" selected>Author (A-Z)</option>
+          <option value="1=1003 &lt;i" selected="selected">Author (A-Z)</option>
         <!--TMPL_ELSE -->
           <option value="1=1003 &lt;i">Author (A-Z)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="1003a"-->
-         <option value="1=1003 &gt;i" selected>Author (Z-A)</option>
+         <option value="1=1003 &gt;i" selected="selected">Author (Z-A)</option>
         <!--TMPL_ELSE -->
          <option value="1=1003 &gt;i">Author (Z-A)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="20d"-->
-          <option value="1=20 &lt;i" selected>Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+          <option value="1=20 &lt;i" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
         <!--TMPL_ELSE -->
           <option value="1=20 &lt;i">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="20a"-->
-          <option value="1=20 &gt;i" selected>Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+          <option value="1=20 &gt;i" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
         <!--TMPL_ELSE -->
           <option value="1=20 &gt;i">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="31a"-->
-          <option value="1=31 &gt;i" selected>Dates</option>
+          <option value="1=31 &gt;i" selected="selected">Dates</option>
         <!--TMPL_ELSE -->
           <option value="1=31 &gt;i">Dates</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="31a"-->
-          <option value="1=31 &gt;i" selected>&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
+          <option value="1=31 &gt;i" selected="selected">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
         <!--TMPL_ELSE -->
           <option value="1=31 &gt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
         <!--/TMPL_IF-->
@@ -479,22 +479,22 @@
           <option value="1=31 &lt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="32a"-->
-          <option value="1=32 &gt;i" selected>&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
+          <option value="1=32 &gt;i" selected="selected">&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
         <!--TMPL_ELSE -->
           <option value="1=32 &gt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="32d"-->
-          <option value="1=32 &lt;i" selected>&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
+          <option value="1=32 &lt;i" selected="selected">&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
         <!--TMPL_ELSE -->
           <option value="1=32 &lt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="4d"-->
-          <option value="1=4 &lt;i" selected>Title (A-Z)</option>
+          <option value="1=4 &lt;i" selected="selected">Title (A-Z)</option>
         <!--TMPL_ELSE -->
           <option value="1=4 &lt;i">Title (A-Z)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="4a"-->
-          <option value="1=4 &gt;i" selected>Title (Z-A)</option>
+          <option value="1=4 &gt;i" selected="selected">Title (Z-A)</option>
         <!--TMPL_ELSE -->
           <option value="1=4 &gt;i">Title (Z-A)</option>
         <!--/TMPL_IF-->
@@ -504,7 +504,7 @@
 <!-- RANK LIMITS -->
 <p></p>
 <!-- SEARCH BUTTONS -->
-            <p><input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search"/>
+            <p><input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
             <!-- TMPL_IF NAME="expanded_options" -->
             <a href="/cgi-bin/koha/catalogue/search.pl?expanded_options=0">[Fewer Options]</a>
             <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
index 87022deb9c..3a633a8085 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/dictionary.tmpl
@@ -12,17 +12,17 @@
 				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->" />
 				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->" /></form>
 
-<!-- TMPL_IF Name=search -->
+<!-- TMPL_IF Name="search" -->
 	<!-- TMPL_IF NAME="authresult" -->
 		
 			<!-- TMPL_IF NAME="displayprev" --> 
-					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
+					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL"-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF NAME="highlight" -->
 						<!-- TMPL_VAR NAME="number" -->
 					<!-- TMPL_ELSE --> 
-						<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
+						<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP --> 
 				<!-- TMPL_IF NAME="displaynext" -->
@@ -98,13 +98,13 @@
 			</table>
 		
 			<!-- TMPL_IF NAME="displayprev" --> 
-					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
+					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL"-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF NAME="highlight" -->
 						<!-- TMPL_VAR NAME="number" -->
 					<!-- TMPL_ELSE --> 
-						<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
+						<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP --> 
 				<!-- TMPL_IF NAME="displaynext" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index 1100bfd373..32ea8e7fae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -8,7 +8,7 @@
 <div id="catalogue_detail_biblio">
 	<div id="bloc25">
 	<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
-		<h2 class="catalogue">
+		<h2>
 			<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra">
 				<!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
 			</a>
@@ -31,41 +31,41 @@
 		<p><b>Size:</b> <!-- TMPL_VAR NAME="size" --></p>
 		<p><b>Notes:</b> <!-- TMPL_VAR NAME="bnotes" --></p>
 		<p><b>No. of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
-		<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modify</a> |
-               <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Delete</a> |
+		<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modify</a> |
+               <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Delete</a> |
                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Requests</a>
          <br />      
 	<!-- /TMPL_LOOP -->
 	</div>
 <!-- TMPL_LOOP NAME="ITEM_DATA" -->
 <div id="bloc25">
-	<h2 class="catalogue">BARCODE <!-- TMPL_VAR NAME="barcode" --></h2>
- 	<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=<!-- TMPL_VAR
-NAME="biblionumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modify</a> |
-        <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Delete</a>
+	<h2>BARCODE <!-- TMPL_VAR NAME="barcode" --></h2>
+ 	<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR
+NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modify</a> |
+        <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&amp;biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Delete</a>
 	<br />
-	<b>Home Library:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
-	<b>Current Library:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
-	<b>Last seen:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
-	<b>Last borrowed:</b> <!-- TMPL_VAR NAME="datelastborrowed" --><br>
-	<b>Item Status:</b> <!-- TMPL_IF NAME="issue" -->On issue to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- TMPL_ELSE -->Available <!-- /TMPL_IF --><br>
-	<!-- TMPL_IF NAME="issue" --><b>Date Due:</b> <!-- TMPL_VAR NAME="date_due" --><br><!-- /TMPL_IF -->
-	<b>Last Borrower 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
-	<b>Last Borrower 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
-	<b>Replacement Price:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
-	<b>Item lost:</b> <!-- TMPL_IF NAME="itemlost" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><br>
-	<b>Paid for:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
-	<b>Notes:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
-	<b>Renewals:</b> <!-- TMPL_VAR NAME="renewals" --><br>
+	<b>Home Library:</b> <!-- TMPL_VAR NAME="homebranch" --><br />
+	<b>Current Library:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br />
+	<b>Last seen:</b> <!-- TMPL_VAR NAME="datelastseen" --><br />
+	<b>Last borrowed:</b> <!-- TMPL_VAR NAME="datelastborrowed" --><br />
+	<b>Item Status:</b> <!-- TMPL_IF NAME="issue" -->On issue to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- TMPL_ELSE -->Available <!-- /TMPL_IF --><br />
+	<!-- TMPL_IF NAME="issue" --><b>Date Due:</b> <!-- TMPL_VAR NAME="date_due" --><br /><!-- /TMPL_IF -->
+	<b>Last Borrower 1:</b> <!-- TMPL_VAR NAME="card0" --><br />
+	<b>Last Borrower 2:</b> <!-- TMPL_VAR NAME="card1" --><br />
+	<b>Replacement Price:</b> <!-- TMPL_VAR NAME="replacementprice" --><br />
+	<b>Item lost:</b> <!-- TMPL_IF NAME="itemlost" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><br />
+	<b>Paid for:</b> <!-- TMPL_VAR NAME="paidfor" --><br />
+	<b>Notes:</b> <!-- TMPL_VAR NAME="itemnotes" --><br />
+	<b>Renewals:</b> <!-- TMPL_VAR NAME="renewals" --><br />
 	<b><a href="/cgi-bin/koha/acqui/orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">
 	Accession
-	Date:</a></b> <!-- TMPL_VAR NAME="dateaccessioned" --><br>
-	<b>Cancelled:</b> <!-- TMPL_IF NAME="wthdrawn" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><br>
+	Date:</a></b> <!-- TMPL_VAR NAME="dateaccessioned" --><br />
+	<b>Cancelled:</b> <!-- TMPL_IF NAME="wthdrawn" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><br />
 	<b><a
 	href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">Total
-	Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
-	<b>Group Number:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
-	<b>Biblio number:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
+	Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br />
+	<b>Group Number:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br />
+	<b>Biblio number:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br />
 	</h2>
 </div>
 <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index 6518861489..2d059c676b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -143,17 +143,17 @@
                     <form name="bulkedit" action="search.pl">
                         <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="searchdesc" -->" />
                         <input type="hidden" name="operation" value="bulkedit" />
-                        Search for Value :<input type="text" name="inputvalue" value=""/><br/>
+                        Search for Value :<input type="text" name="inputvalue" value="" /><br />
                         Subfield       <select name="tagsubfield">
                         <!--TMPL_LOOP Name="tagsubfields"-->
                             <option value="<!--TMPL_VAR Name="tagsubfield"-->"> <!--TMPL_VAR Name="tagsubfield"-->
                             <!-- --<TMPL_VAR Name="tagdesc">--<TMPL_VAR Name="subfielddesc">-->
                             </option>
                         <!--/TMPL_LOOP -->
-                        </select><br/>
-                        Change to : <input type="text" name="targetvalue" value=""/><br/>
-                        Test only : <input type="checkbox" name="test" value="1"/><br/>
-                        <input type="Submit" name="Edit" value="Edit"/>
+                        </select><br />
+                        Change to : <input type="text" name="targetvalue" value="" /><br />
+                        Test only : <input type="checkbox" name="test" value="1" /><br />
+                        <input type="Submit" name="Edit" value="Edit" />
                     </form>
                     </dd>
                     <!-- TMPL_IF NAME="bulkeditresults" -->
@@ -178,45 +178,45 @@
                     <!-- RE-SORT START -->
                     <p>
                     Re-sort results
-                    <select id="sort_by" name="sort_by" onChange="document.myform.submit();">
+                    <select id="sort_by" name="sort_by" onchange="document.myform.submit();">
                         <option value="">Field-weighted, Relevance Ranked</option>
         <!--TMPL_IF Name="9523a"-->
-          <option value="1=9523 &gt;i" selected>Popularity (Most to Least)</option>
+          <option value="1=9523 &gt;i" selected="selected">Popularity (Most to Least)</option>
         <!--TMPL_ELSE -->
           <option value="1=9523 &gt;i">Popularity (Most to Least)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="9523d"-->
-          <option value="1=9523 &lt;i" selected>Popularity (Least to Most)</option>
+          <option value="1=9523 &lt;i" selected="selected">Popularity (Least to Most)</option>
         <!--TMPL_ELSE -->
           <option value="1=9523 &lt;i">Popularity (Least to Most)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="1003d"-->
-          <option value="1=1003 &lt;i" selected>Author (A-Z)</option>
+          <option value="1=1003 &lt;i" selected="selected">Author (A-Z)</option>
         <!--TMPL_ELSE -->
           <option value="1=1003 &lt;i">Author (A-Z)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="1003a"-->
-         <option value="1=1003 &gt;i" selected>Author (Z-A)</option>
+         <option value="1=1003 &gt;i" selected="selected">Author (Z-A)</option>
         <!--TMPL_ELSE -->
          <option value="1=1003 &gt;i">Author (Z-A)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="20d"-->
-          <option value="1=20 &lt;i" selected>Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+          <option value="1=20 &lt;i" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
         <!--TMPL_ELSE -->
           <option value="1=20 &lt;i">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="20a"-->
-          <option value="1=20 &gt;i" selected>Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+          <option value="1=20 &gt;i" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
         <!--TMPL_ELSE -->
           <option value="1=20 &gt;i">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="31a"-->
-          <option value="1=31 &gt;i" selected>Dates</option>
+          <option value="1=31 &gt;i" selected="selected">Dates</option>
         <!--TMPL_ELSE -->
           <option value="1=31 &gt;i">Dates</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="31a"-->
-          <option value="1=31 &gt;i" selected>&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
+          <option value="1=31 &gt;i" selected="selected">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
         <!--TMPL_ELSE -->
           <option value="1=31 &gt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
         <!--/TMPL_IF-->
@@ -226,22 +226,22 @@
           <option value="1=31 &lt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="32a"-->
-          <option value="1=32 &gt;i" selected>&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
+          <option value="1=32 &gt;i" selected="selected">&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
         <!--TMPL_ELSE -->
           <option value="1=32 &gt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="32d"-->
-          <option value="1=32 &lt;i" selected>&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
+          <option value="1=32 &lt;i" selected="selected">&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
         <!--TMPL_ELSE -->
           <option value="1=32 &lt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="4d"-->
-          <option value="1=4 &lt;i" selected>Title (A-Z)</option>
+          <option value="1=4 &lt;i" selected="selected">Title (A-Z)</option>
         <!--TMPL_ELSE -->
           <option value="1=4 &lt;i">Title (A-Z)</option>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="4a"-->
-          <option value="1=4 &gt;i" selected>Title (Z-A)</option>
+          <option value="1=4 &gt;i" selected="selected">Title (Z-A)</option>
         <!--TMPL_ELSE -->
           <option value="1=4 &gt;i">Title (Z-A)</option>
         <!--/TMPL_IF-->
@@ -272,7 +272,7 @@
                                     </a>
                             <!-- TMPL_ELSE -->
                                 <!-- TMPL_IF name="imageurl" -->
-                                    <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->"/>
+                                    <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" />
                                 <!-- TMPL_ELSE -->
                                     <!-- TMPL_VAR name="description" -->
                                 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl
index 813dc012a4..67e29ee29a 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl
@@ -7,23 +7,23 @@
 
 <div id="catalogue_detail_biblio">
 
-<h1 class="catalogue">Subject search results</h1>
+<h1>Subject search results</h1>
 
-<div id="resultnumber"><p>Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --></b> records.<br></p></div>
+<div id="resultnumber"><p>Results <b><!-- TMPL_VAR NAME="startfrom" --></b> through <b><!-- TMPL_VAR NAME="endat" --> of <!-- TMPL_VAR NAME="numrecords" --></b> records.<br /></p></div>
 
 <table>
 <tr>
-		<th class="catalogue">Subject headings</th>
+		<th>Subject headings</th>
 	</tr>
 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
 	<tr>
 		<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
-			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME="subject" --></a>
+			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;subjectitems=<!-- TMPL_VAR NAME="subject2" ESCAPE="HTML" -->"><!-- TMPL_VAR NAME="subject" --></a>
 		</td>
 	</tr>
 <!-- /TMPL_LOOP -->
 </table>
-<p><a  class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a> <a class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a></p>
+<p><a  class="button" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a> <a class="button" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a></p>
 
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl
index 40c5492b94..fc41c623da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio-nomarc.tmpl
@@ -18,7 +18,7 @@ Please Specify a Title
 </tr>
 <tr><th scope="row"><label for="author">Author:</label></th><td><input name="author" id="author" type="text" size="40" /></td>
 </tr>
-<tr><th scope="row"><label for="seriestitle">Series Title:</label><br>
+<tr><th scope="row"><label for="seriestitle">Series Title:</label><br />
 <i>(if applicable)</i></th><td><input name="seriestitle" type="text" id="seriestitle" size="40" /></td>
 </tr>
 <tr><th scope="row"><label for="copyrightdate">Copyright Date:</label></th><td><input id="copyrightdate" name="copyrightdate" type="text" size="40" /></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index fdcd932b7f..0982002293 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -10,7 +10,7 @@
 <!--TMPL_IF Name="done"-->
     <script language="javascript" type="text/javascript">
         opener.document.forms['f'].biblionumber.value=<!--TMPL_VAR Name="biblionumber"-->;
-        opener.document.forms['f'].title.value='<!--TMPL_VAR Name="title" ESCAPE=HTML-->';
+        opener.document.forms['f'].title.value='<!--TMPL_VAR Name="title" ESCAPE="HTML"-->';
         window.close();
     </script>
 <!--TMPL_ELSE-->
@@ -60,7 +60,7 @@
     <!-- show duplicate warning on tab 0 only -->
         <!-- TMPL_IF name="duplicatebiblionumber" -->
                     <div class="error">
-                        <p class="problem">Is this a duplicate of <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
+                        <p class="problem">Is this a duplicate of <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&amp;popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
                         <p>You must either :</p>
                         <ul>
                             <li>If it <em>is</em> a duplicate, <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->">Edit Items</a> of the existing record.</li>
@@ -111,7 +111,7 @@
             <!-- /TMPL_UNLESS -->
 
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-	            <a onClick="ExpandField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'-->')"><!-- TMPL_VAR NAME="tag_lib" --></a>
+	            <a onclick="ExpandField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'-->')"><!-- TMPL_VAR NAME="tag_lib" --></a>
             <!-- /TMPL_UNLESS -->
             <!-- TMPL_IF name="repeatable" -->
                 <span class="buttonPlus" onclick="CloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'-->')">+</span>
@@ -129,7 +129,7 @@
                 <!-- /TMPL_UNLESS --> 
                 
                 <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->')"/>
+                    <img class="buttonUp" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->')" />
                         <input title="<!-- TMPL_VAR NAME='marc_lib_plain' -->"
                             style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text"
                             name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
@@ -137,11 +137,11 @@
                             size="1"
                             maxlength="1"
                             class="flat"
-                            tabindex=-1 />
+                            tabindex="-1" />
                 <!-- TMPL_ELSE -->
                     <input type="hidden"
                            name="tag_<!-- TMPL_VAR NAME='tag'-->_code_<!--  TMPL_VAR NAME='subfield'-->_<!-- TMPL_VAR NAME='index'-->_<!-- TMPL_VAR NAME='index_subfield'-->"
-                           value="<!-- TMPL_VAR NAME="subfield" -->"/>
+                           value="<!-- TMPL_VAR NAME="subfield" -->" />
                 <!-- /TMPL_UNLESS -->
             
                 <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index eaca002f35..fac1b0f1dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -16,7 +16,7 @@
 		<p>
         <label for="q">Search the catalog: </label>
         <input id="q" type="text"  size="25"   name="q" />
-        <input type="submit" value="search">
+        <input type="submit" value="search" />
         </p>
 	</form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl
index 618cf81313..53c837f99c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem-nomarc.tmpl
@@ -66,8 +66,7 @@ Sorry, that barcode is already in use<!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 </select></td></tr>
 </table>
-<input type="submit" name="existinggroup"
-value="Add New Item to Existing Group" />
+<input type="submit" name="existinggroup" value="Add New Item to Existing Group" />
 <table>
 <caption>OR Add to a new
 Group:</caption>
@@ -110,6 +109,6 @@ Group:</caption>
 <tr><th scope="row"><label for="notes">Notes:</label></th><td><textarea cols="30" rows="6" name="notes" id="notes"></textarea></td>
 </tr>
 </table>
-<input type="submit" name="newgroup" value="Add New Item to New Group">
+<input type="submit" name="newgroup" value="Add New Item to New Group" />
 </form>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
index dd2d21478b..066198330c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -69,12 +69,12 @@
         ERROR : Barcode already exists !
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="opisadd" -->
-    <input type="button" value="Add item"  onClick="Check(this.form)" accesskey="w" />
+    <input type="button" value="Add item"  onclick="Check(this.form)" accesskey="w" />
     <!-- TMPL_ELSE -->
     <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->" />
     <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="itemtagsubfield" -->" />
     <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
-    <input type="button" value="Save Changes" onClick="Check(this.form)" accesskey="w" />
+    <input type="button" value="Save Changes" onclick="Check(this.form)" accesskey="w" />
     <!-- /TMPL_IF -->
     </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl
index 2ca7340d9a..87cec6b4c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/thesaurus_popup.tmpl
@@ -4,32 +4,32 @@
 	</head>
 	<body>
 	<form name="f_pop" action="cataloguing/thesaurus_popup.pl" method="post">
-	<textarea name="result" rows=10 cols=60><!-- TMPL_VAR name="result" --></textarea></br>
-	<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="hidden" name="op" value="search">
-	<input type="submit" value="Search">
-	<input type="button" value="OK" onClick="javascript:report()">
+	<textarea name="result" rows="10" cols="60"><!-- TMPL_VAR name="result" --></textarea><br />
+	<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="hidden" name="op" value="search" />
+	<input type="submit" value="Search" />
+	<input type="button" value="OK" onclick="report();" />
 	</form>
 <!-- TMPL_IF name="search_string" -->
 	<form name="f2_pop" action="cataloguing/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" -->">
-	<input type="hidden" name="op" value="select">
-	<input type="hidden" name="result" value="<!-- TMPL_VAR name="result" -->">
-	<input type="submit" name="OK" value="OK">
+	<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="submit" name="OK" value="OK" />
 	</form>
 <!-- /TMPL_IF -->
 	<form name="f3_pop"  action="cataloguing/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="op" value="add">
-	insert a new authority : <input type="text" name="insert">
-	<input type="submit" name="NEW" value="NEW">
+	<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>
 		function report() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
index f61f672f48..4f6239789f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
@@ -6,7 +6,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <head>
 <title>KOHA:_Labs Thesis Selection plugin</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 
 <script language="JavaScript" type="text/javascript">
 <!-- Hide from old browsers
@@ -20,7 +20,7 @@ function Help() {
 // end hiding -->
 </script>
 
-<link rel="stylesheet" type="text/css" href="/intranet-tmpl/default/en/includes/common-style.css">
+<link rel="stylesheet" type="text/css" href="/intranet-tmpl/default/en/includes/common-style.css" />
 <style type="text/css">
 .catalogue {
 	background-color:#ad11ad;
@@ -38,11 +38,11 @@ a.catalogue:hover {
 
 <body>
 <div id="mainbloc">
-	<h1 class="catalogue">Laboratory Search</h1>
+	<h1>Laboratory Search</h1>
 	
 	<form name="f" method="post" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl">
 		<div class="bloc25">
-			<h2 class="catalogue">Search on</h2>
+			<h2>Search on</h2>
 			<p>
 				<input type="hidden" name="plugin_name" value="labs_theses.pl">
 				<input type="hidden" name="index" value="<!--TMPL_VAR Name="index" -->">
@@ -51,14 +51,14 @@ a.catalogue:hover {
 				<input type="hidden" name="cat_auth" value="<!--TMPL_VAR Name="cat_auth" -->" >
 				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35">
 				
-				<input type="submit" value="Start search" class="button catalogue">
+				<input type="submit" value="Start search" class="button">
 			</p>
 		</div>
 	</form>
 
 <!-- TMPL_IF Name="resultlist" -->
 	<div class="bloc25">
-	<h2 class="catalogue">Laboratory Search results</h2>
+	<h2>Laboratory Search results</h2>
 		<div id="resultnumber">
 			<p class="resultcount">
 			<!-- TMPL_IF NAME="total" -->
@@ -69,8 +69,8 @@ a.catalogue:hover {
 		<div id="resultlist">
 			<table>
 				<tr>
-					<th class="catalogue">Laboratory</th>
-					<th class="catalogue">Select</th>
+					<th>Laboratory</th>
+					<th>Select</th>
 				</tr>
 				<!-- TMPL_LOOP NAME="catresult" -->
 					<!-- TMPL_IF NAME="even" -->
@@ -82,8 +82,8 @@ a.catalogue:hover {
 						<!-- TMPL_VAR NAME="lib" -->
 						</td>
 						<td>
-							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="libjs" ESCAPE="URL" -->','<!-- TMPL_VAR NAME="authjs" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="index" ESCAPE="URL"  -->,0)" class="button catalogue">Select</a>
-							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="libjs" ESCAPE="URL" -->','<!-- TMPL_VAR NAME="authjs" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="index" ESCAPE="URL"  -->,1)" class="button catalogue">Sel&amp;close</a>
+							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="libjs" ESCAPE="URL" -->','<!-- TMPL_VAR NAME="authjs" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="index" ESCAPE="URL"  -->,0)" class="button">Select</a>
+							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="libjs" ESCAPE="URL" -->','<!-- TMPL_VAR NAME="authjs" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="index" ESCAPE="URL"  -->,1)" class="button">Sel&amp;close</a>
 						</td>
 					</tr>
 				<!-- /TMPL_LOOP -->
@@ -91,17 +91,17 @@ a.catalogue:hover {
 		</div>
 		<div id="resultnumber">
 			<p><!-- TMPL_IF NAME="displayprev" --> 
-					<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
+					<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL"-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF NAME="highlight" -->
 						<span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
 					<!-- TMPL_ELSE --> 
-						<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
+						<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE="URL" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP --> 
 				<!-- TMPL_IF NAME="displaynext" -->
-					<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
+					<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=labs_theses.pl&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;cat_auth=<!-- TMPL_VAR NAME="cat_auth" ESCAPE="URL"-->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 			</p>
 			<p class="resultcount">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl
index bebe07b300..3970d3d400 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl
@@ -5,18 +5,18 @@
 <head>
 <title>Gestion_des_index_MACLES</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css" />
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css" />
 </head>
 
-<body onload="javascript:Activate(0);load_macles(630);">
-<h1 class="catalogue">Gestion des index MACLES</h1>
-<form name="f_pop"> <!-- onSubmit="javascript:add_macles('630');"> -->
+<body onload="Activate(0);load_macles(630);">
+<h1>Gestion des index MACLES</h1>
+<form name="f_pop"> <!-- onsubmit="add_macles('630');"> -->
 
 <div class="tabbed">
 	<div class="tabs">
         <!--TMPL_LOOP name="BIGLOOP" -->
-            <a href="#" onclick="javascript:Activate('<!-- TMPL_VAR name="number"-->'); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+            <a href="#" onclick="Activate('<!-- TMPL_VAR name="number"-->'); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
         <!--/TMPL_LOOP -->
 	</div>
 
@@ -28,28 +28,28 @@
 <!-- TMPL_ELSE -->
     <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:visible">
 <!-- /TMPL_IF -->
-          <h2 class="catalogue"> <!--TMPL_VAR Name="hdr_tab"--></h2>
-	  <a href="#" class="button catalogue" onclick="JavaScript:add_macles('630');">Envoyer</a>
-          <!-- <input type="submit" class="button catalogue" value="Envoyer" /> -->
-          <a class="button catalogue" href="" onclick="javascript:load_macles(630);">R&eacute;initialiser</a>
-          <a class="button catalogue" href="javascript:uncheck_tab(<!-- TMPL_VAR name="number" -->)">d&eacute;selectionner onglet</a>
-          <input type="reset" class="button catalogue" value="d&eacute;selectionner tout" />
+          <h2> <!--TMPL_VAR Name="hdr_tab"--></h2>
+	  <a href="#" class="button" onclick="add_macles('630');">Envoyer</a>
+          <!-- <input type="submit" class="button" value="Envoyer" /> -->
+          <a class="button" href="" onclick="load_macles(630);">R&eacute;initialiser</a>
+          <a class="button" href="javascript:uncheck_tab(<!-- TMPL_VAR name="number" -->)">d&eacute;selectionner onglet</a>
+          <input type="reset" class="button" value="d&eacute;selectionner tout" />
         <!--TMPL_IF Name="Table"-->
           <table>
             <tr>
-              <th class="catalogue">Espace\Temps</th>
+              <th>Espace\Temps</th>
               <!--TMPL_LOOP Name="col_hdr"-->
-                <th class="catalogue" scope="col" id="<!--TMPL_VAR Name="colvalue"-->">  <!--TMPL_VAR Name="collib" ESCAPE=HTML--> <br /><input type="checkbox" name="<!--TMPL_VAR Name="colvalue"-->" OnClick="check_col('<!--TMPL_VAR Name="colvalue"-->')" />
+                <th scope="col" id="<!--TMPL_VAR Name="colvalue"-->">  <!--TMPL_VAR Name="collib" ESCAPE="HTML"--> <br /><input type="checkbox" name="<!--TMPL_VAR Name="colvalue"-->" onclick="check_col('<!--TMPL_VAR Name="colvalue"-->')" />
                 </th>
               <!--/TMPL_LOOP-->
             </tr>
             <!--TMPL_LOOP Name="lines"-->
             <tr>
-                <th class="catalogue" scope="row" id="<!--TMPL_VAR Name="rowvalue"-->">  <!--TMPL_VAR Name="rowlib" ESCAPE=HTML--> <br /><input type="checkbox" name="<!--TMPL_VAR Name="rowvalue"-->" OnClick="check_row('<!--TMPL_VAR Name="rowvalue"-->')" />
+                <th scope="row" id="<!--TMPL_VAR Name="rowvalue"-->">  <!--TMPL_VAR Name="rowlib" ESCAPE="HTML"--> <br /><input type="checkbox" name="<!--TMPL_VAR Name="rowvalue"-->" onclick="check_row('<!--TMPL_VAR Name="rowvalue"-->')" />
                 </th>
                 <!--TMPL_LOOP Name="cells"-->
                 <td headers="<!--TMPL_VAR Name="rowvalue"--> <!--TMPL_VAR Name="colvalue"-->">
-                  <span TITLE="<!--TMPL_LOOP Name="libs" --><!--TMPL_VAR Name="lib" ESCAPE=HTML--> - <!--/TMPL_LOOP-->">
+                  <span title="<!--TMPL_LOOP Name="libs" --><!--TMPL_VAR Name="lib" ESCAPE="HTML"--> - <!--/TMPL_LOOP-->">
                   <!--TMPL_VAR Name="celvalue"--> <br /><input type="checkbox" name="<!--TMPL_VAR Name="celvalue"-->" value="<!--TMPL_VAR Name="celvalue"-->" />
                   </span>
                 </td>
@@ -59,21 +59,21 @@
           </table>
         <!--/TMPL_IF-->
         <!--TMPL_IF Name="Lists" -->
-          <h2 class="catalogue">s&eacute;lection au moyen d'une liste de descripteurs</h2>
+          <h2>s&eacute;lection au moyen d'une liste de descripteurs</h2>
           <!--TMPL_LOOP name="Lists"-->
-            <h3 class="catalogue"><!--TMPL_VAR name="lib"--></h3>
-            <!--TMPL_LOOP name=liblist -->
-              <a href="#<!--TMPL_VAR Name="listvalue"-->" onclick="javascript:check_multiple(<!--TMPL_VAR Name="listvalue"-->)"> <!--TMPL_VAR name="listlib" escape=html--></a><br />
+            <h3><!--TMPL_VAR name="lib"--></h3>
+            <!--TMPL_LOOP name="liblist" -->
+              <a href="#<!--TMPL_VAR Name="listvalue"-->" onclick="check_multiple(<!--TMPL_VAR Name="listvalue"-->)"> <!--TMPL_VAR name="listlib" ESCAPE="HTML"--></a><br />
             <!--/TMPL_LOOP-->
           <!--/TMPL_LOOP-->
         <!--/TMPL_IF-->
         <!--TMPL_UNLESS Name="Table"-->
         <!-- Listes simples :Onglets 0 et 9-->
           <!--TMPL_LOOP Name="lines"-->
-            <h3><!--TMPL_VAR Name="rowvalue" ESCAPE=HTML-->&nbsp;-&nbsp;<!--TMPL_VAR Name="rowlib" ESCAPE=HTML-->&nbsp;<input type="checkbox" name="<!--TMPL_VAR Name="rowvalue"-->" OnClick="javascript:check_row('<!--TMPL_VAR Name="rowvalue"-->')" /></h3>
+            <h3><!--TMPL_VAR Name="rowvalue" ESCAPE="HTML"-->&nbsp;-&nbsp;<!--TMPL_VAR Name="rowlib" ESCAPE="HTML"-->&nbsp;<input type="checkbox" name="<!--TMPL_VAR Name="rowvalue"-->" onclick="check_row('<!--TMPL_VAR Name="rowvalue"-->')" /></h3>
             <!--TMPL_LOOP Name="cells"-->
-              <p><!--TMPL_VAR Name="celvalue" ESCAPE=HTML-->&nbsp;-&nbsp;<!--TMPL_LOOP Name="libs" -->
-                    <!--TMPL_VAR Name="lib" ESCAPE=HTML--> &nbsp;
+              <p><!--TMPL_VAR Name="celvalue" ESCAPE="HTML"-->&nbsp;-&nbsp;<!--TMPL_LOOP Name="libs" -->
+                    <!--TMPL_VAR Name="lib" ESCAPE="HTML"--> &nbsp;
                  <!--/TMPL_LOOP-->
                  <input type="checkbox" name="<!--TMPL_VAR Name="celvalue"-->" value="<!--TMPL_VAR Name="celvalue"-->" />
               </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
index 76ec2480f3..d3f52449b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
@@ -18,28 +18,28 @@
 		<td>
 			<select name="f5" size="1">
 			<!-- TMPL_IF name="f5a" -->
-				<option value=" " SELECTED>a- Increase in encoding level</option>
+				<option value=" " selected="selected">a- Increase in encoding level</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">a- Increase in encoding level</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>c- Corrected or revised</option>
+				<option value="c" selected="selected">c- Corrected or revised</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">c- Corrected or revised</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>d- Deleted</option>
+				<option value="d" selected="selected">d- Deleted</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">d- Deleted</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5n" -->
-				<option value="n" SELECTED>n- New</option>
+				<option value="n" selected="selected">n- New</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">n- New</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5p" -->
-				<option value="p" SELECTED>p- Increase in encoding level from prepublication</option>
+				<option value="p" selected="selected">p- Increase in encoding level from prepublication</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">p- Increase in encoding level from prepublication</option>
 			<!-- /TMPL_IF -->
@@ -51,67 +51,67 @@
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>a- Language material (monography)</option>
+				<option value="a" selected="selected">a- Language material (monography)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">a- Language material (monography)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>c- Notated music</option>
+				<option value="c" selected="selected">c- Notated music</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">c- Notated music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>d- Manuscript notated music</option>
+				<option value="d" selected="selected">d- Manuscript notated music</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">d- Manuscript notated music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" SELECTED>e- Cartographic material</option>
+				<option value="e" selected="selected">e- Cartographic material</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">e- Cartographic material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6f" -->
-				<option value="f" SELECTED>f - Manuscript cartographic material</option>
+				<option value="f" selected="selected">f - Manuscript cartographic material</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">f - Manuscript cartographic material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6g" -->
-				<option value="g" SELECTED>g - Projected medium</option>
+				<option value="g" selected="selected">g - Projected medium</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">g - Projected medium</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6i" -->
-				<option value="i" SELECTED>i - Nonmusical sound recording</option>
+				<option value="i" selected="selected">i - Nonmusical sound recording</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">i - Nonmusical sound recording</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6j" -->
-				<option value="j" SELECTED>j - Musical sound recording</option>
+				<option value="j" selected="selected">j - Musical sound recording</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">j - Musical sound recording</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6k" -->
-				<option value="k" SELECTED>k - Two-dimensional nonprojectable graphic</option>
+				<option value="k" selected="selected">k - Two-dimensional nonprojectable graphic</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">k - Two-dimensional nonprojectable graphic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6m" -->
-				<option value="m" SELECTED>m - Computer file</option>
+				<option value="m" selected="selected">m - Computer file</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">m - Computer file</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6o" -->
-				<option value="o" SELECTED>o - Kit</option>
+				<option value="o" selected="selected">o - Kit</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">o - Kit</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6r" -->
-				<option value="r" SELECTED>r - Three-dimensional artifact or naturally occurring object</option>
+				<option value="r" selected="selected">r - Three-dimensional artifact or naturally occurring object</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">r - Three-dimensional artifact or naturally occurring object</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6t" -->
-				<option value="t" SELECTED>t - Manuscript language material</option>
+				<option value="t" selected="selected">t - Manuscript language material</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">t - Manuscript language material</option>
 			<!-- /TMPL_IF -->
@@ -123,37 +123,37 @@
 		<td>
 			<select name="f7" size="1">
 				<!-- TMPL_IF name="f7a" -->
-					<option value="a" SELECTED>a- Monographic component part</option>
+					<option value="a" selected="selected">a- Monographic component part</option>
 				<!-- TMPL_ELSE -->
 					<option value="a">a- Monographic component part</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f7b" -->
-					<option value="b" SELECTED>b- Serial component part</option>
+					<option value="b" selected="selected">b- Serial component part</option>
 				<!-- TMPL_ELSE -->
 					<option value="b">a- Serial component part</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f7c" -->
-					<option value="c" SELECTED>c- Collection</option>
+					<option value="c" selected="selected">c- Collection</option>
 				<!-- TMPL_ELSE -->
 					<option value="c">c- Collection</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f7d" -->
-					<option value="d" SELECTED>d- Subunit</option>
+					<option value="d" selected="selected">d- Subunit</option>
 				<!-- TMPL_ELSE -->
 					<option value="d">d- Subunit</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f7i" -->
-					<option value="i" SELECTED>i- Integrating resource</option>
+					<option value="i" selected="selected">i- Integrating resource</option>
 				<!-- TMPL_ELSE -->
 					<option value="i">i- Integrating resource</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f7m" -->
-					<option value="m" SELECTED>m- Monograph/item</option>
+					<option value="m" selected="selected">m- Monograph/item</option>
 				<!-- TMPL_ELSE -->
 					<option value="m">m- Monograph/item</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f7s" -->
-					<option value="s" SELECTED>s- Serial</option>
+					<option value="s" selected="selected">s- Serial</option>
 				<!-- TMPL_ELSE -->
 					<option value="s">s- Serial</option>
 				<!-- /TMPL_IF -->
@@ -166,12 +166,12 @@
 		<td>
 			<select name="f8" size="1">
 				<!-- TMPL_IF name="f8 " -->
-					<option value=" " SELECTED>No specific type</option>
+					<option value=" " selected="selected">No specific type</option>
 				<!-- TMPL_ELSE -->
 					<option value=" ">No specific type</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f8a" -->
-					<option value="a" SELECTED>a- Archival</option>
+					<option value="a" selected="selected">a- Archival</option>
 				<!-- TMPL_ELSE -->
 					<option value="a">a- Archival</option>
 				<!-- /TMPL_IF -->
@@ -184,12 +184,12 @@
 		<td>
 			<select name="f9" size="1">
 				<!-- TMPL_IF name="f9 " -->
-					<option value=" " SELECTED>MARC-8</option>
+					<option value=" " selected="selected">MARC-8</option>
 				<!-- TMPL_ELSE -->
 					<option value=" ">MARC-8</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f9a" -->
-					<option value="a" SELECTED>a- UCS/Unicode</option>
+					<option value="a" selected="selected">a- UCS/Unicode</option>
 				<!-- TMPL_ELSE -->
 					<option value="a">a- UCS/Unicode</option>
 				<!-- /TMPL_IF -->
@@ -204,52 +204,52 @@
 		<td>
 			<select name="f17" size="1">
 				<!-- TMPL_IF name="f17 " -->
-					<option value=" " SELECTED>full level</option>
+					<option value=" " selected="selected">full level</option>
 				<!-- TMPL_ELSE -->
 					<option value=" ">Full level</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f171" -->
-					<option value="1" SELECTED>1- Full level, material not examined</option>
+					<option value="1" selected="selected">1- Full level, material not examined</option>
 				<!-- TMPL_ELSE -->
 					<option value="1">1- Full level, material not examined</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f172" -->
-					<option value="2" SELECTED>2 - Less-than-full level, material not examined</option>
+					<option value="2" selected="selected">2 - Less-than-full level, material not examined</option>
 				<!-- TMPL_ELSE -->
 					<option value="2">2 - Less-than-full level, material not examined</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f173" -->
-					<option value="3" SELECTED>3- Abbreviated level</option>
+					<option value="3" selected="selected">3- Abbreviated level</option>
 				<!-- TMPL_ELSE -->
 					<option value="3">3- Abbreviated level</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f174" -->
-					<option value="4" SELECTED>4- Core level</option>
+					<option value="4" selected="selected">4- Core level</option>
 				<!-- TMPL_ELSE -->
 					<option value="4">4- Core level</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f175" -->
-					<option value="5" SELECTED>5- Partial (preliminary) level</option>
+					<option value="5" selected="selected">5- Partial (preliminary) level</option>
 				<!-- TMPL_ELSE -->
 					<option value="5">5- Partial (preliminary) level</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f177" -->
-					<option value="7" SELECTED>7- Minimal level</option>
+					<option value="7" selected="selected">7- Minimal level</option>
 				<!-- TMPL_ELSE -->
 					<option value="7">7- Minimal level</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f178" -->
-					<option value="8" SELECTED>8- Prepublication level</option>
+					<option value="8" selected="selected">8- Prepublication level</option>
 				<!-- TMPL_ELSE -->
 					<option value="8">8- Prepublication level</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f17u" -->
-					<option value="u" SELECTED>u - Unknown</option>
+					<option value="u" selected="selected">u - Unknown</option>
 				<!-- TMPL_ELSE -->
 					<option value="u">u - Unknown</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f17z" -->
-					<option value="z" SELECTED>z- Not applicable</option>
+					<option value="z" selected="selected">z- Not applicable</option>
 				<!-- TMPL_ELSE -->
 					<option value="z">z- Not applicableFull level</option>
 				<!-- /TMPL_IF -->
@@ -262,22 +262,22 @@
 		<td>
 			<select name="f18" size="1">
 				<!-- TMPL_IF name="f18 " -->
-					<option value=" " SELECTED>Non-ISBD</option>
+					<option value=" " selected="selected">Non-ISBD</option>
 				<!-- TMPL_ELSE -->
 					<option value=" ">Non-ISBD</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f18a" -->
-					<option value="a" SELECTED>a- AACR 2</option>
+					<option value="a" selected="selected">a- AACR 2</option>
 				<!-- TMPL_ELSE -->
 					<option value="a">a- AACR 2</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f18i" -->
-					<option value="i" SELECTED>i- ISBD</option>
+					<option value="i" selected="selected">i- ISBD</option>
 				<!-- TMPL_ELSE -->
 					<option value="i">i- ISBD</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f18u" -->
-					<option value="u" SELECTED>u- Unknown</option>
+					<option value="u" selected="selected">u- Unknown</option>
 				<!-- TMPL_ELSE -->
 					<option value="u">u- Unknown</option>
 				<!-- /TMPL_IF -->
@@ -290,12 +290,12 @@
 		<td>
 			<select name="f19" size="1">
 				<!-- TMPL_IF name="f19 " -->
-					<option value=" " SELECTED>Related record not required</option>
+					<option value=" " selected="selected">Related record not required</option>
 				<!-- TMPL_ELSE -->
 					<option value=" ">Related record not required</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="f18r" -->
-					<option value="r" SELECTED>r- Related record required</option>
+					<option value="r" selected="selected">r- Related record required</option>
 				<!-- TMPL_ELSE -->
 					<option value="r">r- Related record required</option>
 				<!-- /TMPL_IF -->
@@ -303,11 +303,11 @@
 		</td>
 	</tr>
 	<tr>
-		<td>20-24 entry map & lengths</td>
+		<td>20-24 entry map and lengths</td>
 		<td>(auto-filled)</td>
 	<tr>
 
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
+	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
 </form>
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
index 72fc2690f1..60c85ad0cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
@@ -11,51 +11,51 @@
 <table>
     <tr>
         <td>Date d'enregistrement</td>
-        <td><input type="text" name="f1" maxlength=8 size=9 value="<!-- TMPL_VAR name="f1" -->"></td>
+        <td><input type="text" name="f1" maxlength="8" size="9" value="<!-- TMPL_VAR name="f1" -->"></td>
     </tr>
     <tr>
         <td>Code de date de publication </td>
         <td>
             <select name="f2" size="1">
             <!-- TMPL_IF name="f2 " -->
-                <option value=" " SELECTED>Valeur non requise</option>
+                <option value=" " selected="selected">Valeur non requise</option>
             <!-- TMPL_ELSE -->
                 <option value=" ">valeur non requise</option>
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f2a" -->
-                <option value="a" SELECTED>Periodique
+                <option value="a" selected="selected">Periodique
                 en cours</option>
             <!-- TMPL_ELSE -->
                 <option value="a">Periodique en cours</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f2b" -->
-                <option value="b" SELECTED>Periodique mort</option>
+                <option value="b" selected="selected">Periodique mort</option>
             <!-- TMPL_ELSE -->
                 <option value="b">Periodique mort</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f2c" -->
-                <option value="c" SELECTED>Periodique
+                <option value="c" selected="selected">Periodique
                 d'etat inconnu</option>
             <!-- TMPL_ELSE -->
                 <option value="c">Periodique d'etat inconnu</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f2d" -->
-                <option value="d" SELECTED>Monographie
+                <option value="d" selected="selected">Monographie
                 complete</option>
             <!-- TMPL_ELSE -->
                 <option value="d">Monographie
                 complete</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f2e" -->
-                <option value="e" SELECTED>reproduction</option>
+                <option value="e" selected="selected">reproduction</option>
             <!-- TMPL_ELSE -->
                 <option value="e">reproduction</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2f" -->
                 <option value="f"
-                SELECTED>monographie, date de
+                selected="selected">monographie, date de
                 publication incertaine</option>
             <!-- TMPL_ELSE -->
                 <option value="f">monographie, date de
@@ -64,7 +64,7 @@
 
             <!-- TMPL_IF name="f2g" -->
                 <option value="g"
-                SELECTED>monographie dont la
+                selected="selected">monographie dont la
                 publication s'etend sur plus d'un an</option>
             <!-- TMPL_ELSE -->
                 <option value="g">monographie dont la
@@ -73,7 +73,7 @@
     
             <!-- TMPL_IF name="f2h" -->
                 <option value="h"
-                SELECTED>monographie ayant a la fois
+                selected="selected">monographie ayant a la fois
                 une date reelle et une date de
                 copyright ou de privilege</option>
             <!-- TMPL_ELSE -->
@@ -84,7 +84,7 @@
     
             <!-- TMPL_IF name="f2i" -->
                 <option value="i"
-                SELECTED>monographie ayant a la fois
+                selected="selected">monographie ayant a la fois
                 une date d'edition ou de reedition et
                 une date de production</option>
             <!-- TMPL_ELSE -->
@@ -95,7 +95,7 @@
     
             <!-- TMPL_IF name="f2j" -->
                 <option value="j"
-                SELECTED>monographie avec date
+                selected="selected">monographie avec date
                 publication detaillee</option>
             <!-- TMPL_ELSE -->
                 <option value="j">monographie avec date
@@ -107,67 +107,67 @@
     </tr>
     <tr>
         <td>Premiere date de publication</td>
-        <td><input id="pubdate1" type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
+        <td><input id="pubdate1" type="text" name="f3" maxlength="4" size="5" value="<!-- TMPL_VAR name="f3" -->" /></td>
     </tr>
     <tr>
     <td>Deuxieme date de publication</td>
-    <td><input id="pubdate2" type="text" name="f4" maxlength=4 size=5 value="<!-- TMPL_VAR name="f4" -->"></td>
+    <td><input id="pubdate2" type="text" name="f4" maxlength="4" size="5" value="<!-- TMPL_VAR name="f4" -->" /></td>
     </tr>
     <tr>
         <td>Niveau intellectuel ou public destinataire 1</td>
         <td>
             <select name="f5" size="1">
             <!-- TMPL_IF name="f5|" -->
-                <option value="|" SELECTED>|- Caractère de remplissage</option>
+                <option value="|" selected="selected">|- Caractère de remplissage</option>
             <!-- TMPL_ELSE -->
                 <option value="|">|- Caractère de remplissage</option>
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f5a" -->
-                <option value="a" SELECTED>a- Jeunesse en
+                <option value="a" selected="selected">a- Jeunesse en
     general </option>
             <!-- TMPL_ELSE -->
                 <option value="a">a- Jeunesse en general</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5b" -->
                 <option value="b"
-    SELECTED>Pre-scolaire</option>
+    selected="selected">Pre-scolaire</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- Pre-scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5c" -->
-                <option value="c" SELECTED>c- scolaire</option>
+                <option value="c" selected="selected">c- scolaire</option>
             <!-- TMPL_ELSE -->
                 <option value="c">c- scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5d" -->
-                <option value="d" SELECTED>d- enfant</option>
+                <option value="d" selected="selected">d- enfant</option>
             <!-- TMPL_ELSE -->
                 <option value="d">d- enfant</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5e" -->
-                <option value="e" SELECTED>e- jeune adulte</option>
+                <option value="e" selected="selected">e- jeune adulte</option>
             <!-- TMPL_ELSE -->
                 <option value="e">e- jeune adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f5k" -->
                 <option value="k"
-                SELECTED>k- adulte, haut niveau</option>
+                selected="selected">k- adulte, haut niveau</option>
             <!-- TMPL_ELSE -->
                 <option value="k">k- adulte, haut niveau</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f5m" -->
                 <option value="m"
-                SELECTED>m- Adulte, grand public</option>
+                selected="selected">m- Adulte, grand public</option>
             <!-- TMPL_ELSE -->
                 <option value="m">m- Adulte, grand public</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f5u" -->
                 <option value="u"
-                SELECTED>u- inconnu</option>
+                selected="selected">u- inconnu</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- inconnu</option>
             <!-- /TMPL_IF -->
@@ -180,54 +180,54 @@
             <select name="f6" size="1">
             
             <!-- TMPL_IF name="f6|" -->
-            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            	<option value="|" selected="selected">|- Caractère de remplissage</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Caractère de remplissage</option>
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f6a" -->
-                <option value="a" SELECTED>a- Jeunesse en general </option>
+                <option value="a" selected="selected">a- Jeunesse en general </option>
             <!-- TMPL_ELSE -->
                 <option value="a">a- Jeunesse en general</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6b" -->
-                <option value="b"  SELECTED>b- Pre-scolaire</option>
+                <option value="b"  selected="selected">b- Pre-scolaire</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- Pre-scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6c" -->
-                <option value="c" SELECTED>c- scolaire</option>
+                <option value="c" selected="selected">c- scolaire</option>
             <!-- TMPL_ELSE -->
                 <option value="c">c- scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6d" -->
-                <option value="d" SELECTED>d- enfant</option>
+                <option value="d" selected="selected">d- enfant</option>
             <!-- TMPL_ELSE -->
                 <option value="d">d- enfant</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6e" -->
-                <option value="e" SELECTED>e- jeune adulte</option>
+                <option value="e" selected="selected">e- jeune adulte</option>
             <!-- TMPL_ELSE -->
                 <option value="e">e- jeune adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f6k" -->
                 <option value="k"
-                SELECTED>k- adulte, haut niveau</option>
+                selected="selected">k- adulte, haut niveau</option>
             <!-- TMPL_ELSE -->
                 <option value="k">k- adulte, haut niveau</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f6m" -->
                 <option value="m"
-                SELECTED>m- fiction ou vulg adulte</option>
+                selected="selected">m- fiction ou vulg adulte</option>
             <!-- TMPL_ELSE -->
                 <option value="m">m- fiction ou vulg adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f6u" -->
                 <option value="u"
-                SELECTED>u- inconnu</option>
+                selected="selected">u- inconnu</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- inconnu</option>
             <!-- /TMPL_IF -->
@@ -239,56 +239,56 @@
         <td>
             <select name="f7" size="1">
             <!-- TMPL_IF name="f7|" -->
-            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            	<option value="|" selected="selected">|- Caractère de remplissage</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Caractère de remplissage</option>
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f7a" -->
-                <option value="a" SELECTED>a- Jeunesse en
+                <option value="a" selected="selected">a- Jeunesse en
     general </option>
             <!-- TMPL_ELSE -->
                 <option value="a">a- Jeunesse en general</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7b" -->
                 <option value="b"
-    SELECTED>b- Pre-scolaire</option>
+    selected="selected">b- Pre-scolaire</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- Pre-scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7c" -->
-                <option value="c" SELECTED>c- scolaire</option>
+                <option value="c" selected="selected">c- scolaire</option>
             <!-- TMPL_ELSE -->
                 <option value="c">c- scolaire</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7d" -->
-                <option value="d" SELECTED>d- enfant</option>
+                <option value="d" selected="selected">d- enfant</option>
             <!-- TMPL_ELSE -->
                 <option value="d">d- enfant</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7e" -->
-                <option value="e" SELECTED>e- jeune adulte</option>
+                <option value="e" selected="selected">e- jeune adulte</option>
             <!-- TMPL_ELSE -->
                 <option value="e">e- jeune adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f7k" -->
                 <option value="k"
-                SELECTED>k- adulte, haut niveau</option>
+                selected="selected">k- adulte, haut niveau</option>
             <!-- TMPL_ELSE -->
                 <option value="k">k- adulte, haut niveau</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f7m" -->
                 <option value="m"
-                SELECTED>m- fiction ou vulg adulte</option>
+                selected="selected">m- fiction ou vulg adulte</option>
             <!-- TMPL_ELSE -->
                 <option value="m">m- fiction ou vulg adulte</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f7u" -->
                 <option value="u"
-                SELECTED>u- inconnu</option>
+                selected="selected">u- inconnu</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- inconnu</option>
             <!-- /TMPL_IF -->
@@ -301,34 +301,34 @@
             <select name="f8" size="1">
             
             <!-- TMPL_IF name="f8u" -->
-            	<option value="u" SELECTED>u- Date de publication inconnu</option>
+            	<option value="u" selected="selected">u- Date de publication inconnu</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- Date de publication inconnu</option>
             <!-- /TMPL_IF -->
        		<!-- TMPL_IF name="f8a" -->
-                <option value="a" SELECTED>a- Federal/national</option>
+                <option value="a" selected="selected">a- Federal/national</option>
             <!-- TMPL_ELSE -->
                 <option value="a">a- Federal/national</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8b" -->
-                <option value="b" SELECTED>b- etat/province</option>
+                <option value="b" selected="selected">b- etat/province</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- etat/province</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8c" -->
-                <option value="c" SELECTED>c- comté/departement</option>
+                <option value="c" selected="selected">c- comté/departement</option>
             <!-- TMPL_ELSE -->
                 <option value="c">c- comté/departement</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8d" -->
                 <option value="d"
-                SELECTED>d- local(municipal, etc.)</option>
+                selected="selected">d- local(municipal, etc.)</option>
             <!-- TMPL_ELSE -->
                 <option value="d">d- local(municipal, etc.)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8e" -->
                 <option value="e"
-                SELECTED>e- multi-local(inter-departmental,
+                selected="selected">e- multi-local(inter-departmental,
                 etc. sous le niveau national)</option>
             <!-- TMPL_ELSE -->
                 <option value="e">e- multi-local(inter-departmental,
@@ -337,14 +337,14 @@
     
             <!-- TMPL_IF name="f8f" -->
                 <option value="f"
-                SELECTED>f- Inter-gouvernemental</option>
+                selected="selected">f- Inter-gouvernemental</option>
             <!-- TMPL_ELSE -->
                 <option value="f">f- Inter-gouvernemental</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f8g" -->
                 <option value="g"
-                SELECTED>g- gouvernement en exil ou clandestin</option>
+                selected="selected">g- gouvernement en exil ou clandestin</option>
             <!-- TMPL_ELSE -->
                 <option value="g">g- gouvernement en exil
                 ou clandestin</option>
@@ -352,19 +352,19 @@
 
             <!-- TMPL_IF name="f8h" -->
                 <option value="h"
-                SELECTED>h- Niveau indetermine</option>
+                selected="selected">h- Niveau indetermine</option>
             <!-- TMPL_ELSE -->
                 <option value="h">h- Niveau indetermine</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8u" -->
                 <option value="u"
-                SELECTED>u- inconnu</option>
+                selected="selected">u- inconnu</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- inconnu</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8y" -->
                 <option value="y"
-                SELECTED>y- il ne s'agit pas d'une
+                selected="selected">y- il ne s'agit pas d'une
                 publication officielle</option>
             <!-- TMPL_ELSE -->
                 <option value="y">y- il ne s'agit pas
@@ -372,7 +372,7 @@
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8z" -->
                 <option value="z"
-                SELECTED>z- Autre instance officielle</option>
+                selected="selected">z- Autre instance officielle</option>
             <!-- TMPL_ELSE -->
                 <option value="z">z- Autre instance officielle</option>
             <!-- /TMPL_IF -->
@@ -386,12 +386,12 @@
             <select name="f9" size="1">
             
             <!-- TMPL_IF name="f90" -->
-                <option value="0" SELECTED>0- Notice non modifiee</option>
+                <option value="0" selected="selected">0- Notice non modifiee</option>
             <!-- TMPL_ELSE -->
                 <option value="0">0- Notice non modifiee</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f91" -->
-                <option value="1" SELECTED>1- notice modifiee</option>
+                <option value="1" selected="selected">1- notice modifiee</option>
             <!-- TMPL_ELSE -->
                 <option value="1">1- notice modifiee</option>
             <!-- /TMPL_IF -->
@@ -402,8 +402,7 @@
 
     <tr>
     <td>Langue de catalogage (obligatoire)</td>
-    <td><input type="text" name="f10" maxlength=3 size=4
-        value="<!-- TMPL_VAR name="f10" -->"></td>
+    <td><input type="text" name="f10" maxlength="3" size="4" value="<!-- TMPL_VAR name="f10" -->" /></td>
     </tr>
 
     <tr>
@@ -412,25 +411,25 @@
             <select name="f11" size="1">
             
             <!-- TMPL_IF name="f11a" -->
-                <option value="a" SELECTED>a- Norme ISO
+                <option value="a" selected="selected">a- Norme ISO
         pour la translitteration</option>
             <!-- TMPL_ELSE -->
                 <option value="a">a- Norme ISO
         pour la translitteration</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f11b" -->
-                <option value="b" SELECTED>b- autre</option>
+                <option value="b" selected="selected">b- autre</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- autre</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f11c" -->
                 <option value="c"
-        SELECTED>c- Translitterations multiples : ISO et autres regles</option>
+        selected="selected">c- Translitterations multiples : ISO et autres regles</option>
             <!-- TMPL_ELSE -->
                 <option value="c">c- Translitterations multiples : ISO et autres regles</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f11y" -->
-                <option value="y" SELECTED>y- Sans regles
+                <option value="y" selected="selected">y- Sans regles
         de translitteration</option>
             <!-- TMPL_ELSE -->
                 <option value="y">y- Sans regles
@@ -445,34 +444,33 @@
             <select name="f12" size="1">
             
             <!-- TMPL_IF name="f1201" -->
-                <option value="01" SELECTED>01- ISO 646,
+                <option value="01" selected="selected">01- ISO 646,
     version IRV (caracteres latins de base)</option>
             <!-- TMPL_ELSE -->
                 <option value="01">01- ISO 646,
     version IRV (caracteres latins de base)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1202" -->
-                <option value="02" SELECTED>02- Registre
+                <option value="02" selected="selected">02- Registre
     ISO #37 (caracteres cyrilliques de base)</option>
             <!-- TMPL_ELSE -->
                 <option value="02">02- Registre
     ISO #37 (caracteres cyrilliques de base)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1203" -->
-                <option value="03"
-        SELECTED>03- ISO 5426 (jeu de caractere latin etendu)</option>
+                <option value="03" selected="selected">03- ISO 5426 (jeu de caractere latin etendu)</option>
             <!-- TMPL_ELSE -->
                 <option value="03">03- ISO 5426 (jeu de caractere latin etendu)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1204" -->
-                <option value="04" SELECTED>04- ISO DIS
+                <option value="04" selected="selected">04- ISO DIS
     5427 (jeu de caracteres cyrilliques etendu)</option>
             <!-- TMPL_ELSE -->
                 <option value="04">04- ISO DIS
     5427 (jeu de caracteres cyrilliques etendu)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1205" -->
-                <option value="05" SELECTED>05- ISO  5428
+                <option value="05" selected="selected">05- ISO  5428
     (caracteres grecs)</option>
             <!-- TMPL_ELSE -->
                 <option value="05">05- ISO  5428
@@ -480,7 +478,7 @@
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f1206" -->
-                <option value="06" SELECTED>06- ISO 6438
+                <option value="06" selected="selected">06- ISO 6438
     (caracteres africains codes)</option>
             <!-- TMPL_ELSE -->
                 <option value="06">06- ISO 6438
@@ -488,7 +486,7 @@
             <!-- /TMPL_IF -->
             
              <!-- TMPL_IF name="f1207" -->
-                <option value="07" SELECTED>07- ISO 10586
+                <option value="07" selected="selected">07- ISO 10586
     (caracteres grégoriens)</option>
             <!-- TMPL_ELSE -->
                 <option value="07">07- ISO 10586
@@ -496,7 +494,7 @@
             <!-- /TMPL_IF -->
 
              <!-- TMPL_IF name="f1208" -->
-                <option value="08" SELECTED>08- ISO 8957
+                <option value="08" selected="selected">08- ISO 8957
     (caracteres hébreux) table 1</option>
             <!-- TMPL_ELSE -->
                 <option value="08">08- ISO 8957
@@ -504,7 +502,7 @@
             <!-- /TMPL_IF -->
 
              <!-- TMPL_IF name="f1209" -->
-                <option value="09" SELECTED>09- ISO 8957
+                <option value="09" selected="selected">09- ISO 8957
     (caracteres hébreux) table 2</option>
             <!-- TMPL_ELSE -->
                 <option value="09">09- ISO 8957
@@ -512,7 +510,7 @@
             <!-- /TMPL_IF -->
             
              <!-- TMPL_IF name="f1211 -->
-                <option value="11"  SELECTED>11- ISO 5426-2
+                <option value="11"  selected="selected">11- ISO 5426-2
     (caractères latins utilisés dans des langues européennes mineures ou une typographie ancienne)</option>
             <!-- TMPL_ELSE -->
                 <option value="11">11- ISO 6438
@@ -520,7 +518,7 @@
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f1250" -->
-                <option value="50" SELECTED>50- ISO 10646
+                <option value="50" selected="selected">50- ISO 10646
                     (UNICODE)
                 </option>
             <!-- TMPL_ELSE -->
@@ -538,20 +536,20 @@
             <select name="f13" size="1">
             
             <!-- TMPL_IF name="f13  " -->
-                    <option value="  " SELECTED>valeur non requise</option>
+                    <option value="  " selected="selected">valeur non requise</option>
             <!-- TMPL_ELSE -->
                     <option value="  ">valeur non requise</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f1301" -->
-                <option value="01" SELECTED>01- ISO 646,
+                <option value="01" selected="selected">01- ISO 646,
     version IRV (caracteres latins de base)</option>
             <!-- TMPL_ELSE -->
                 <option value="01">ISO 646,
     version IRV (caracteres latins de base)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1302" -->
-                <option value="02" SELECTED>02- Registre
+                <option value="02" selected="selected">02- Registre
     ISO #37 (caracteres cyrilliques de base)</option>
             <!-- TMPL_ELSE -->
                 <option value="02">02- Registre
@@ -559,33 +557,33 @@
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1303" -->
                 <option value="03"
-        SELECTED>03- ISO 5426 (jeu de caractere latin etendu)</option>
+        selected="selected">03- ISO 5426 (jeu de caractere latin etendu)</option>
             <!-- TMPL_ELSE -->
                 <option value="03">03- ISO 5426 (jeu de caractere latin etendu)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1304" -->
-                <option value="04" SELECTED>04- ISO DIS
+                <option value="04" selected="selected">04- ISO DIS
     5427 (jeu de caracteres cyrilliques etendu)</option>
             <!-- TMPL_ELSE -->
                 <option value="04">04- ISO DIS
     5427 (jeu de caracteres cyrilliques etendu)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1305" -->
-                <option value="05" SELECTED>05- ISO  5428
+                <option value="05" selected="selected">05- ISO  5428
     (caracteres grecs)</option>
             <!-- TMPL_ELSE -->
                 <option value="05">05- ISO  5428
     (caracteres grecs)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1306" -->
-                <option value="06" SELECTED>06- ISO 6438
+                <option value="06" selected="selected">06- ISO 6438
     (caracteres africains codes)</option>
             <!-- TMPL_ELSE -->
                 <option value="06">06- ISO 6438
     (caracteres africains codes)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1250" -->
-                <option value="50" SELECTED>50- ISO 10646
+                <option value="50" selected="selected">50- ISO 10646
                     (UNICODE)
                 </option>
             <!-- TMPL_ELSE -->
@@ -600,7 +598,7 @@
     <tr>
         <td>Jeu de caracteres additionnels</td>
         <td>
-            <input type="text" name="f14" maxlength=4 size=5 value="<!-- TMPL_VAR name="f14" -->">
+            <input type="text" name="f14" maxlength="4" size="5" value="<!-- TMPL_VAR name="f14" -->" />
         </td>
     </tr>
 
@@ -609,96 +607,96 @@
     <td>
     <select name="f15" size="1">
             <!-- TMPL_IF name="f15 " -->
-                    <option value=" " SELECTED>Valeur non requise</option>
+                    <option value=" " selected="selected">Valeur non requise</option>
             <!-- TMPL_ELSE -->
                     <option value=" ">valeur non requise</option>
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f15ba" -->
-                <option value="ba" SELECTED>ba- Latin</option>
+                <option value="ba" selected="selected">ba- Latin</option>
             <!-- TMPL_ELSE -->
                 <option value="ba">ba- Latin</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ca" -->
-                <option value="ca" SELECTED>ca- Cyrillique</option>
+                <option value="ca" selected="selected">ca- Cyrillique</option>
             <!-- TMPL_ELSE -->
                 <option value="ca">ca- Cyrillique</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f15da" -->
-                <option value="da" SELECTED>da- Japonais -
+                <option value="da" selected="selected">da- Japonais -
                 alphabet non precise</option>
             <!-- TMPL_ELSE -->
                 <option value="da">da- Japonais non precise</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f15db" -->
-                <option value="db" SELECTED>db- Japonais -
+                <option value="db" selected="selected">db- Japonais -
                 Kanji</option>
             <!-- TMPL_ELSE -->
                 <option value="db">db- Japonais - Kanji</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f15dc" -->
-                <option value="dc" SELECTED>dc- Japonais -
+                <option value="dc" selected="selected">dc- Japonais -
                 Kana</option>
             <!-- TMPL_ELSE -->
                 <option value="dc">dc- Japonais - Kana</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ea" -->
-                <option value="ea" SELECTED>ea- Chinois</option>
+                <option value="ea" selected="selected">ea- Chinois</option>
             <!-- TMPL_ELSE -->
                 <option value="ea">ea- Chinois</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15fa" -->
-                <option value="fa" SELECTED>fa- Arabe</option>
+                <option value="fa" selected="selected">fa- Arabe</option>
             <!-- TMPL_ELSE -->
                 <option value="fa">fa- Arabe</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ga" -->
-                <option value="ga" SELECTED>ga- Grec</option>
+                <option value="ga" selected="selected">ga- Grec</option>
             <!-- TMPL_ELSE -->
                 <option value="ga">ga- Grec</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ha" -->
-                <option value="ha" SELECTED>ha- Hebreu</option>
+                <option value="ha" selected="selected">ha- Hebreu</option>
             <!-- TMPL_ELSE -->
                 <option value="ha">ha- Hebreu</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ia" -->
-                <option value="ia" SELECTED>ia- Thai</option>
+                <option value="ia" selected="selected">ia- Thai</option>
             <!-- TMPL_ELSE -->
                 <option value="ia">ia- Thai</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ja" -->
-                <option value="ja" SELECTED>ja- Devanagari</option>
+                <option value="ja" selected="selected">ja- Devanagari</option>
             <!-- TMPL_ELSE -->
                 <option value="ja">ja- Devanagari</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15ka" -->
-                <option value="ka" SELECTED>ka- Coreen</option>
+                <option value="ka" selected="selected">ka- Coreen</option>
             <!-- TMPL_ELSE -->
                 <option value="ka">ka- Coreen</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15la" -->
-                <option value="la" SELECTED>la- Tamoul</option>
+                <option value="la" selected="selected">la- Tamoul</option>
             <!-- TMPL_ELSE -->
                 <option value="la">la- Tamoul</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f15zz" -->
-                <option value="zz" SELECTED>zz- autres</option>
+                <option value="zz" selected="selected">zz- autres</option>
             <!-- TMPL_ELSE -->
                 <option value="zz">zz- autres</option>
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f15ma" -->
-                <option value="ma" SELECTED>ma- grégorien</option>
+                <option value="ma" selected="selected">ma- grégorien</option>
             <!-- TMPL_ELSE -->
                 <option value="ma">ma- grégorien</option>
             <!-- /TMPL_IF -->
             
             <!-- TMPL_IF name="f15mb" -->
-                <option value="mb" SELECTED>mb- arménien</option>
+                <option value="mb" selected="selected">mb- arménien</option>
             <!-- TMPL_ELSE -->
                 <option value="mb">mb- arménien</option>
             <!-- /TMPL_IF -->                        
@@ -706,7 +704,7 @@
     </td>
     </tr>
     
-    <tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
+    <tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
 </form>
 <script type="text/javascript" language="javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
index 2450570086..883e5fbb3e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
@@ -14,96 +14,95 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	           <option value="|" SELECTED>|- Caractère de remplissage</option>
+            	           <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
             	           <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>valeur non requise</option>
+				<option value=" " selected="selected">valeur non requise</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>Illustrations</option>
+				<option value="a" selected="selected">Illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>Cartes</option>
+				<option value="b" selected="selected">Cartes</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Cartes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>Portraits</option>
+				<option value="c" selected="selected">Portraits</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Portraits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>cartes marines</option>
+				<option value="d" selected="selected">cartes marines</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">cartes marines</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>plans</option>
+				<option value="e" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">plans</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>Planches</option>
+				<option value="f" selected="selected">Planches</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Planches</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>Musique imprimee</option>
+				<option value="g" selected="selected">Musique imprimee</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Musique imprimee</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>fac-similes</option>
+				<option value="h" selected="selected">fac-similes</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">fac-similes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>armoiries</option>
+				<option value="i" selected="selected">armoiries</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">armoiries</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>Tables Genealogique</option>
+				<option value="j" selected="selected">Tables Genealogique</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Tables Genealogique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>Formulaires</option>
+				<option value="k" selected="selected">Formulaires</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Formulaires</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1l" -->
-				<option value="l" SELECTED>Specimens</option>
+				<option value="l" selected="selected">Specimens</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Specimens</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m"
-				SELECTED>Enregistrement sonore</option>
+				<option value="m" selected="selected">Enregistrement sonore</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Enregistrement sonore</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>Transparents</option>
+				<option value="n" selected="selected">Transparents</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Transparents</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1o" -->
-				<option value="o" SELECTED>Enluminures</option>
+				<option value="o" selected="selected">Enluminures</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Enluminures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1y" -->
-				<option value="y" SELECTED>Sans illustration</option>
+				<option value="y" selected="selected">Sans illustration</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">Sans illustrations</option>
 			<!-- /TMPL_IF -->
@@ -113,99 +112,98 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>valeur non requise</option>
+				<option value=" " selected="selected">valeur non requise</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>Illustrations</option>
+				<option value="a" selected="selected">Illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>Cartes</option>
+				<option value="b" selected="selected">Cartes</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Cartes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>Portraits</option>
+				<option value="c" selected="selected">Portraits</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Portraits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>cartes marines</option>
+				<option value="d" selected="selected">cartes marines</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">cartes marines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>plans</option>
+				<option value="e" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>plans</option>
+				<option value="e" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2f" -->
-				<option value="f" SELECTED>Planches</option>
+				<option value="f" selected="selected">Planches</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Planches</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>Musique imprimee</option>
+				<option value="g" selected="selected">Musique imprimee</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Musique imprimee</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>fac-similes</option>
+				<option value="h" selected="selected">fac-similes</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">fac-similes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>armoiries</option>
+				<option value="i" selected="selected">armoiries</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">armoiries</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2j" -->
-				<option value="j" SELECTED>Tables Genealogique</option>
+				<option value="j" selected="selected">Tables Genealogique</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Tables Genealogique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>Formulaires</option>
+				<option value="k" selected="selected">Formulaires</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Formulaires</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" SELECTED>Specimens</option>
+				<option value="l" selected="selected">Specimens</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Specimens</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
-				<option value="m"
-				SELECTED>Enregistrement sonore</option>
+				<option value="m" selected="selected">Enregistrement sonore</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Enregistrement sonore</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
-				<option value="n" SELECTED>Transparents</option>
+				<option value="n" selected="selected">Transparents</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Transparents</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2o" -->
-				<option value="o" SELECTED>Enluminures</option>
+				<option value="o" selected="selected">Enluminures</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Enluminures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
-				<option value="y" SELECTED>Sans illustration</option>
+				<option value="y" selected="selected">Sans illustration</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">Sans illustrations</option>
 			<!-- /TMPL_IF -->
@@ -215,99 +213,98 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>valeur non requise</option>
+				<option value=" " selected="selected">valeur non requise</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>Illustrations</option>
+				<option value="a" selected="selected">Illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>Cartes</option>
+				<option value="b" selected="selected">Cartes</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Cartes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>Portraits</option>
+				<option value="c" selected="selected">Portraits</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Portraits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" SELECTED>cartes marines</option>
+				<option value="d" selected="selected">cartes marines</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">cartes marines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" SELECTED>plans</option>
+				<option value="e" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" SELECTED>plans</option>
+				<option value="e" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3f" -->
-				<option value="f" SELECTED>Planches</option>
+				<option value="f" selected="selected">Planches</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Planches</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3g" -->
-				<option value="g" SELECTED>Musique imprimee</option>
+				<option value="g" selected="selected">Musique imprimee</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Musique imprimee</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3h" -->
-				<option value="h" SELECTED>fac-similes</option>
+				<option value="h" selected="selected">fac-similes</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">fac-similes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3i" -->
-				<option value="i" SELECTED>armoiries</option>
+				<option value="i" selected="selected">armoiries</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">armoiries</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3j" -->
-				<option value="j" SELECTED>Tables Genealogique</option>
+				<option value="j" selected="selected">Tables Genealogique</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Tables Genealogique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3k" -->
-				<option value="k" SELECTED>Formulaires</option>
+				<option value="k" selected="selected">Formulaires</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Formulaires</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3l" -->
-				<option value="l" SELECTED>Specimens</option>
+				<option value="l" selected="selected">Specimens</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Specimens</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3m" -->
-				<option value="m"
-				SELECTED>Enregistrement sonore</option>
+				<option value="m" selected="selected">Enregistrement sonore</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Enregistrement sonore</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3n" -->
-				<option value="n" SELECTED>Transparents</option>
+				<option value="n" selected="selected">Transparents</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Transparents</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3o" -->
-				<option value="o" SELECTED>Enluminures</option>
+				<option value="o" selected="selected">Enluminures</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Enluminures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3y" -->
-				<option value="y" SELECTED>Sans illustration</option>
+				<option value="y" selected="selected">Sans illustration</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">Sans illustrations</option>
 			<!-- /TMPL_IF -->
@@ -317,99 +314,98 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-            	<option value="|" SELECTED>|- Caractère de remplissage</option>
+            	<option value="|" selected="selected">|- Caractère de remplissage</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Caractère de remplissage</option>
             <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>valeur non requise</option>
+				<option value=" " selected="selected">valeur non requise</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>Illustrations</option>
+				<option value="a" selected="selected">Illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>Cartes</option>
+				<option value="b" selected="selected">Cartes</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Cartes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>Portraits</option>
+				<option value="c" selected="selected">Portraits</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Portraits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>cartes marines</option>
+				<option value="d" selected="selected">cartes marines</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">cartes marines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" SELECTED>plans</option>
+				<option value="e" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" SELECTED>plans</option>
+				<option value="e" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4f" -->
-				<option value="f" SELECTED>Planches</option>
+				<option value="f" selected="selected">Planches</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Planches</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4g" -->
-				<option value="g" SELECTED>Musique imprimee</option>
+				<option value="g" selected="selected">Musique imprimee</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Musique imprimee</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4h" -->
-				<option value="h" SELECTED>fac-similes</option>
+				<option value="h" selected="selected">fac-similes</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">fac-similes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4i" -->
-				<option value="i" SELECTED>armoiries</option>
+				<option value="i" selected="selected">armoiries</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">armoiries</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4j" -->
-				<option value="j" SELECTED>Tables Genealogique</option>
+				<option value="j" selected="selected">Tables Genealogique</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Tables Genealogique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4k" -->
-				<option value="k" SELECTED>Formulaires</option>
+				<option value="k" selected="selected">Formulaires</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Formulaires</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4l" -->
-				<option value="l" SELECTED>Specimens</option>
+				<option value="l" selected="selected">Specimens</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Specimens</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4m" -->
-				<option value="m"
-				SELECTED>Enregistrement sonore</option>
+				<option value="m" selected="selected">Enregistrement sonore</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Enregistrement sonore</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4n" -->
-				<option value="n" SELECTED>Transparents</option>
+				<option value="n" selected="selected">Transparents</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Transparents</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4o" -->
-				<option value="o" SELECTED>Enluminures</option>
+				<option value="o" selected="selected">Enluminures</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Enluminures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4y" -->
-				<option value="y" SELECTED>Sans illustration</option>
+				<option value="y" selected="selected">Sans illustration</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">Sans illustrations</option>
 			<!-- /TMPL_IF -->
@@ -420,133 +416,132 @@
 		<td>
 			<select name="f5" size="1">
                         <!-- TMPL_IF name="f5|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>valeur non requise</option>
+				<option value=" " selected="selected">valeur non requise</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>Bibliographie</option>
+				<option value="a" selected="selected">Bibliographie</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Bibliographie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>Catalogue</option>
+				<option value="b" selected="selected">Catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>index</option>
+				<option value="c" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>resume</option>
+				<option value="d" selected="selected">resume</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">resume</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5e" -->
-				<option value="e" SELECTED>Dictionnaire</option>
+				<option value="e" selected="selected">Dictionnaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Dictionnaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5f" -->
-				<option value="f" SELECTED>encyclopedie</option>
+				<option value="f" selected="selected">encyclopedie</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">encyclopedie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" SELECTED>Repertoire</option>
+				<option value="g" selected="selected">Repertoire</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Repertoire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" SELECTED>Description
+				<option value="h" selected="selected">Description
 				de projet</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Description de projet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5i" -->
-				<option value="i" SELECTED>statistiques</option>
+				<option value="i" selected="selected">statistiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">statistiques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5j" -->
-				<option value="j" SELECTED>Manuels
+				<option value="j" selected="selected">Manuels
 				d'enseignement programme</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Manuels
 				d'enseignement programme</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5k" -->
-				<option value="k" SELECTED>Brevet</option>
+				<option value="k" selected="selected">Brevet</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Brevet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5l" -->
-				<option value="l" SELECTED>norme</option>
+				<option value="l" selected="selected">norme</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">norme</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5m" -->
-				<option value="m"
-				SELECTED>Memoire ou these</option>
+				<option value="m" selected="selected">Memoire ou these</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Memoire ou these</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5n" -->
-				<option value="n" SELECTED>Lois et decrets</option>
+				<option value="n" selected="selected">Lois et decrets</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Lois et decrets</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5o" -->
-				<option value="o" SELECTED>Table numerique</option>
+				<option value="o" selected="selected">Table numerique</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Table numerique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5p" -->
-				<option value="p" SELECTED>Rapport technique</option>
+				<option value="p" selected="selected">Rapport technique</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Rapport techique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5q" -->
-				<option value="q" SELECTED>Sujet d'examen</option>
+				<option value="q" selected="selected">Sujet d'examen</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">Sujet d'examen</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5r" -->
-				<option value="r" SELECTED>Synthese bibliographique</option>
+				<option value="r" selected="selected">Synthese bibliographique</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">Synthese bibliographique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5s" -->
-				<option value="s" SELECTED>Traite</option>
+				<option value="s" selected="selected">Traite</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">Traite</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f5t" -->
-				<option value="t" SELECTED>Bande déssinée</option>
+				<option value="t" selected="selected">Bande déssinée</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">Bande déssinée</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5v" -->
-				<option value="v" SELECTED>Mémoires ou thèses reproduits</option>
+				<option value="v" selected="selected">Mémoires ou thèses reproduits</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">Mémoires ou thèses reproduits</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>Autres</option>
+				<option value="z" selected="selected">Autres</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autres</option>
 			<!-- /TMPL_IF -->
@@ -556,127 +551,126 @@
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>valeur non requise</option>
+				<option value=" " selected="selected">valeur non requise</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>Bibliographie</option>
+				<option value="a" selected="selected">Bibliographie</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Bibliographie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>Catalogue</option>
+				<option value="b" selected="selected">Catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>index</option>
+				<option value="c" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>resume</option>
+				<option value="d" selected="selected">resume</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">resume</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" SELECTED>Dictionnaire</option>
+				<option value="e" selected="selected">Dictionnaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Dictionnaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6f" -->
-				<option value="f" SELECTED>encyclopedie</option>
+				<option value="f" selected="selected">encyclopedie</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">encyclopedie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6g" -->
-				<option value="g" SELECTED>Repertoire</option>
+				<option value="g" selected="selected">Repertoire</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Repertoire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6h" -->
-				<option value="h" SELECTED>Description
+				<option value="h" selected="selected">Description
 				de projet</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Description de projet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6i" -->
-				<option value="i" SELECTED>statistiques</option>
+				<option value="i" selected="selected">statistiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">statistiques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6j" -->
-				<option value="j" SELECTED>Manuels
+				<option value="j" selected="selected">Manuels
 				d'enseignement programme</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Manuels
 				d'enseignement programme</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6k" -->
-				<option value="k" SELECTED>Brevet</option>
+				<option value="k" selected="selected">Brevet</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Brevet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6l" -->
-				<option value="l" SELECTED>norme</option>
+				<option value="l" selected="selected">norme</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">norme</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6m" -->
-				<option value="m"
-				SELECTED>Memoire ou these</option>
+				<option value="m" selected="selected">Memoire ou these</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Memoire ou these</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6n" -->
-				<option value="n" SELECTED>Lois et decrets</option>
+				<option value="n" selected="selected">Lois et decrets</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Lois et decrets</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6o" -->
-				<option value="o" SELECTED>Table numerique</option>
+				<option value="o" selected="selected">Table numerique</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Table numerique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6p" -->
-				<option value="p" SELECTED>Rapport technique</option>
+				<option value="p" selected="selected">Rapport technique</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Rapport techique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6q" -->
-				<option value="q" SELECTED>Sujet d'examen</option>
+				<option value="q" selected="selected">Sujet d'examen</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">Sujet d'examen</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6r" -->
-				<option value="r" SELECTED>Synthese bibliographique</option>
+				<option value="r" selected="selected">Synthese bibliographique</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">Synthese bibliographique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6s" -->
-				<option value="s" SELECTED>Traite</option>
+				<option value="s" selected="selected">Traite</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">Traite</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6t" -->
-				<option value="t" SELECTED>Bande dessinee</option>
+				<option value="t" selected="selected">Bande dessinee</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">Bande dessinee</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6z" -->
-				<option value="z" SELECTED>Autres</option>
+				<option value="z" selected="selected">Autres</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autres</option>
 			<!-- /TMPL_IF -->
@@ -685,126 +679,125 @@
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>valeur non requise</option>
+				<option value=" " selected="selected">valeur non requise</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">valeur non requise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>Bibliographie</option>
+				<option value="a" selected="selected">Bibliographie</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Bibliographie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>Catalogue</option>
+				<option value="b" selected="selected">Catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>index</option>
+				<option value="c" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>resume</option>
+				<option value="d" selected="selected">resume</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">resume</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7e" -->
-				<option value="e" SELECTED>Dictionnaire</option>
+				<option value="e" selected="selected">Dictionnaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Dictionnaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7f" -->
-				<option value="f" SELECTED>encyclopedie</option>
+				<option value="f" selected="selected">encyclopedie</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">encyclopedie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>Repertoire</option>
+				<option value="g" selected="selected">Repertoire</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Repertoire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>Description
+				<option value="h" selected="selected">Description
 				de projet</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Description de projet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" SELECTED>statistiques</option>
+				<option value="i" selected="selected">statistiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">statistiques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7j" -->
-				<option value="j" SELECTED>Manuels
+				<option value="j" selected="selected">Manuels
 				d'enseignement programme</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Manuels
 				d'enseignement programme</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" SELECTED>Brevet</option>
+				<option value="k" selected="selected">Brevet</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Brevet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7l" -->
-				<option value="l" SELECTED>norme</option>
+				<option value="l" selected="selected">norme</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">norme</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7m" -->
-				<option value="m"
-				SELECTED>Memoire ou these</option>
+				<option value="m" selected="selected">Memoire ou these</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Memoire ou these</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7n" -->
-				<option value="n" SELECTED>Lois et decrets</option>
+				<option value="n" selected="selected">Lois et decrets</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Lois et decrets</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7o" -->
-				<option value="o" SELECTED>Table numerique</option>
+				<option value="o" selected="selected">Table numerique</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Table numerique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7p" -->
-				<option value="p" SELECTED>Rapport technique</option>
+				<option value="p" selected="selected">Rapport technique</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Rapport techique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7q" -->
-				<option value="q" SELECTED>Sujet d'examen</option>
+				<option value="q" selected="selected">Sujet d'examen</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">Sujet d'examen</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7r" -->
-				<option value="r" SELECTED>Synthese bibliographique</option>
+				<option value="r" selected="selected">Synthese bibliographique</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">Synthese bibliographique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7s" -->
-				<option value="s" SELECTED>Traite</option>
+				<option value="s" selected="selected">Traite</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">Traite</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7t" -->
-				<option value="t" SELECTED>Bande dessinee</option>
+				<option value="t" selected="selected">Bande dessinee</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">Bande dessinee</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>Autres</option>
+				<option value="z" selected="selected">Autres</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autres</option>
 			<!-- /TMPL_IF -->
@@ -814,127 +807,126 @@
 		<td>
 			<select name="f8" size="1">
                         <!-- TMPL_IF name="f8|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
                         
                         <!-- TMPL_IF name="f8 " -->
-                            <option value=" " SELECTED>valeur non requise</option>
+                            <option value=" " selected="selected">valeur non requise</option>
                         <!-- TMPL_ELSE -->
                             <option value=" ">valeur non requise</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>Bibliographie</option>
+				<option value="a" selected="selected">Bibliographie</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Bibliographie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>Catalogue</option>
+				<option value="b" selected="selected">Catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>index</option>
+				<option value="c" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8d" -->
-				<option value="d" SELECTED>resume</option>
+				<option value="d" selected="selected">resume</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">resume</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8e" -->
-				<option value="e" SELECTED>Dictionnaire</option>
+				<option value="e" selected="selected">Dictionnaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Dictionnaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8f" -->
-				<option value="f" SELECTED>encyclopedie</option>
+				<option value="f" selected="selected">encyclopedie</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">encyclopedie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" SELECTED>Repertoire</option>
+				<option value="g" selected="selected">Repertoire</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Repertoire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8h" -->
-				<option value="h" SELECTED>Description
+				<option value="h" selected="selected">Description
 				de projet</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Description de projet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8i" -->
-				<option value="i" SELECTED>statistiques</option>
+				<option value="i" selected="selected">statistiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">statistiques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8j" -->
-				<option value="j" SELECTED>Manuels
+				<option value="j" selected="selected">Manuels
 				d'enseignement programme</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Manuels
 				d'enseignement programme</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8k" -->
-				<option value="k" SELECTED>Brevet</option>
+				<option value="k" selected="selected">Brevet</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Brevet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8l" -->
-				<option value="l" SELECTED>norme</option>
+				<option value="l" selected="selected">norme</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">norme</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8m" -->
-				<option value="m"
-				SELECTED>Memoire ou these</option>
+				<option value="m" selected="selected">Memoire ou these</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Memoire ou these</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8n" -->
-				<option value="n" SELECTED>Lois et decrets</option>
+				<option value="n" selected="selected">Lois et decrets</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Lois et decrets</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8o" -->
-				<option value="o" SELECTED>Table numerique</option>
+				<option value="o" selected="selected">Table numerique</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Table numerique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8p" -->
-				<option value="p" SELECTED>Rapport technique</option>
+				<option value="p" selected="selected">Rapport technique</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Rapport techique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8q" -->
-				<option value="q" SELECTED>Sujet d'examen</option>
+				<option value="q" selected="selected">Sujet d'examen</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">Sujet d'examen</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8r" -->
-				<option value="r" SELECTED>Synthese bibliographique</option>
+				<option value="r" selected="selected">Synthese bibliographique</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">Synthese bibliographique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8s" -->
-				<option value="s" SELECTED>Traite</option>
+				<option value="s" selected="selected">Traite</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">Traite</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8t" -->
-				<option value="t" SELECTED>Bande dessinee</option>
+				<option value="t" selected="selected">Bande dessinee</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">Bande dessinee</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>Autres</option>
+				<option value="z" selected="selected">Autres</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autres</option>
 			<!-- /TMPL_IF -->
@@ -946,19 +938,19 @@
                 <td>
                 <select name="f9" size="1">
                	<!-- TMPL_IF name="f1|" -->
-            		<option value="|" SELECTED>|- Caractère de remplissage</option>
+            		<option value="|" selected="selected">|- Caractère de remplissage</option>
 	            <!-- TMPL_ELSE -->
     	        	<option value="|">|- Caractère de remplissage</option>
         	    <!-- /TMPL_IF -->
         	    
 	            <!-- TMPL_IF name="f90" -->
-    	            <option value="0" SELECTED>0- Le document n'est pas un colloque ou un congres</option>
+    	            <option value="0" selected="selected">0- Le document n'est pas un colloque ou un congres</option>
         	    <!-- TMPL_ELSE -->
                     <option value="0">0- Le document n'est pas un colloque ou un congres</option>
                 <!-- /TMPL_IF -->
                 
                 <!-- TMPL_IF name="f91" -->
-                    <option value="1" SELECTED>1- Le document est un colloque	ou un congres</option>
+                    <option value="1" selected="selected">1- Le document est un colloque	ou un congres</option>
                 <!-- TMPL_ELSE -->
                     <option value="1">1- Le document est un colloque ou un congres</option>
                 <!-- /TMPL_IF -->
@@ -970,19 +962,19 @@
                 <td>
                 <select name="f10" size="1">
                 <!-- TMPL_IF name="f10|" -->
-                    <option value="|" SELECTED>|- Caractère de remplissage</option>
+                    <option value="|" selected="selected">|- Caractère de remplissage</option>
                 <!-- TMPL_ELSE -->
                     <option value="|">|- Caractère de remplissage</option>
                 <!-- /TMPL_IF -->
                         
                 <!-- TMPL_IF name="f100" -->
-                        <option value="0" SELECTED>Document pas constitue de melanges</option>
+                        <option value="0" selected="selected">Document pas constitue de melanges</option>
                 <!-- TMPL_ELSE -->
                         <option	value="0">Document pas constitue de melanges</option>
                 <!-- /TMPL_IF -->
                 
                 <!-- TMPL_IF name="f101" -->
-                        <option value="1" SELECTED>Le document est constitue de melanges</option>
+                        <option value="1" selected="selected">Le document est constitue de melanges</option>
                 <!-- TMPL_ELSE -->
                         <option value="1">Le document est constitue de melanges</option>
                 <!-- /TMPL_IF -->
@@ -992,7 +984,7 @@
                 <td>
                         <select name="f11" size="1">
                         <!-- TMPL_IF name="f11|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
@@ -1004,7 +996,7 @@
                         <!-- /TMPL_IF -->
                         
                         <!-- TMPL_IF name="f111" -->
-                                <option value="1" SELECTED>Le document contient un index</option>
+                                <option value="1" selected="selected">Le document contient un index</option>
                         <!-- TMPL_ELSE -->
                                 <option value="1">Le document contient un index</option>
                         <!-- /TMPL_IF -->
@@ -1014,59 +1006,59 @@
                 <td>
                         <select name="f12" size="1">
                         <!-- TMPL_IF name="f12|" -->
-                        <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12a" -->
-                                <option value="a" SELECTED>fiction, roman</option>
+                                <option value="a" selected="selected">fiction, roman</option>
                         <!-- TMPL_ELSE -->
                                 <option	value="a">fiction, roman</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f12b" -->
-                       <option value="b" SELECTED>Theatre, piece televisee</option>
+                       <option value="b" selected="selected">Theatre, piece televisee</option>
                         <!-- TMPL_ELSE -->
                        <option value="b">Theatre, piece televisee</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12c" -->
-                       <option value="c" SELECTED>Essais</option>
+                       <option value="c" selected="selected">Essais</option>
                         <!-- TMPL_ELSE -->
                        <option value="c">Essais</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12d" -->
-                       <option value="d" SELECTED>Humour, satire</option>
+                       <option value="d" selected="selected">Humour, satire</option>
                         <!-- TMPL_ELSE -->
                        <option value="d">Humour, satire</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12e" -->
-                       <option value="e" SELECTED>Lettres</option>
+                       <option value="e" selected="selected">Lettres</option>
                         <!-- TMPL_ELSE -->
                        <option value="e">Lettres</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12f" -->
-                       <option value="f" SELECTED>Nouvelles</option>
+                       <option value="f" selected="selected">Nouvelles</option>
                         <!-- TMPL_ELSE -->
                        <option value="f">Nouvelles</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12g" -->
-                       <option value="g" SELECTED>Poesie</option>
+                       <option value="g" selected="selected">Poesie</option>
                         <!-- TMPL_ELSE -->
                        <option value="g">Poesie</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12h" -->
-                       <option value="h" SELECTED>Discours, art oratoire</option>
+                       <option value="h" selected="selected">Discours, art oratoire</option>
                         <!-- TMPL_ELSE -->
                        <option value="h">Discours, art oratoire</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12y" -->
-                       <option value="y" SELECTED>Il ne s'agit pas
+                       <option value="y" selected="selected">Il ne s'agit pas
                        d'un texte litteraire</option>
                         <!-- TMPL_ELSE -->
                        <option value="y">Il ne s'agit pas d'un texte litteraire</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f12z" -->
-                       <option value="z" SELECTED>formes variees ou
+                       <option value="z" selected="selected">formes variees ou
                        autres formes litteraires</option>
                         <!-- TMPL_ELSE -->
                        <option value="z">formes variees ou
@@ -1080,49 +1072,44 @@
                         <select name="f13" size="1">
                         
                         <!-- TMPL_IF name="f13|" -->
-                        <option value="|" SELECTED>|- Caractère de remplissage</option>
+                        <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
                         
                         <!-- TMPL_IF name="f13y" -->
-                                <option value="y"
-				SELECTED>C'est pas une biographie</option>
+                                <option value="y" selected="selected">C'est pas une biographie</option>
                         <!-- TMPL_ELSE -->
                                 <option value="y">C'est pas une biographie</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f13a" -->
-                                <option value="a"
-				SELECTED>autobiographie (y compris correspondance...)</optio\
+                                <option value="a" selected="selected">autobiographie (y compris correspondance...)</optio\
 n>
                         <!-- TMPL_ELSE -->
                                 <option
 				value="a">autobiographie (y compris correspondance...)</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f13b" -->
-                                <option value="b"
-				SELECTED>Biographie individuelle</option>
+                                <option value="b" selected="selected">Biographie individuelle</option>
                         <!-- TMPL_ELSE -->
                                 <option value="b">Biographie individuelle</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f13c" -->
-                                <option value="c"
-				SELECTED>Biographie collective</option>
+                                <option value="c" selected="selected">Biographie collective</option>
                         <!-- TMPL_ELSE -->
                                 <option value="c">Biographie collective</option>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="f13d" -->
-                                <option value="d"
-				SELECTED>Contient des informations biographiques</option>
+                                <option value="d" selected="selected">Contient des informations biographiques</option>
                         <!-- TMPL_ELSE -->
                                 <option value="d">Contient des
                                 informations biographiques</option>
                         <!-- /TMPL_IF -->
         </tr>
 
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
+	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
 </form>
 <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl
index fd6ab0547a..b6761aa06f 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl
@@ -15,54 +15,54 @@
 			<select name="f1" size="1">
             
 			<!-- TMPL_IF name="f1r" -->
-				<option value="r" SELECTED>Impression normale</option>
+				<option value="r" selected="selected">Impression normale</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">Impression normale</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="d" SELECTED>Impression
+				<option value="d" selected="selected">Impression
 				en gros caractere</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Impression en gros caractere</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>Journal</option>
+				<option value="e" selected="selected">Journal</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Journal</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>Caractere braille et moon</option>
+				<option value="f" selected="selected">Caractere braille et moon</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Caractere braille et moon</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>Micro-impression</option>
+				<option value="g" selected="selected">Micro-impression</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Micro-impression</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>Manuscrit</option>
+				<option value="h" selected="selected">Manuscrit</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Manuscrit</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>Multimedia</option>
+				<option value="i" selected="selected">Multimedia</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Multimedia</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>Impression en reduction</option>
+				<option value="j" selected="selected">Impression en reduction</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Impression en reduction</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>Autres formes de presentation</option>
+				<option value="z" selected="selected">Autres formes de presentation</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autres formes de presentation</option>
 	
@@ -71,7 +71,7 @@
 		</td>
 	</tr>
 	
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
+	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
 </form>
 <script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl
index d8df360154..67fbf43f96 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl
@@ -14,29 +14,29 @@
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>Periodique</option>
+				<option value="a" selected="selected">Periodique</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Periodique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>Collection des monographies</option>
+				<option value="b" selected="selected">Collection des monographies</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Collection des monographies</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>Journal</option>
+				<option value="c" selected="selected">Journal</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Journal</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>autres</option>
+				<option value="z" selected="selected">autres</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">autres</option>
 			<!-- /TMPL_IF -->
@@ -49,105 +49,105 @@
 		<td>
 			<select name="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>Quotidien</option>
+				<option value="a" selected="selected">Quotidien</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Quotidien</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>Bihebdomadaire</option>
+				<option value="b" selected="selected">Bihebdomadaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Bihebdomadaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>Hebdomadaire</option>
+				<option value="c" selected="selected">Hebdomadaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Hebdomadaire</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>Toutes les deux semaines</option>
+				<option value="d" selected="selected">Toutes les deux semaines</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Toutes les deux semaines</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>Deux fois par mois</option>
+				<option value="e" selected="selected">Deux fois par mois</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Deux fois par mois</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2f" -->
-				<option value="f" SELECTED>Mensuel</option>
+				<option value="f" selected="selected">Mensuel</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Mensuel</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>Bimestriel</option>
+				<option value="g" selected="selected">Bimestriel</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Bimestriel</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>Trimestriel</option>
+				<option value="h" selected="selected">Trimestriel</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Trimestriel</option>
 			<!-- /TMPL_IF -->
 
  			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>Trois fois par an</option>
+				<option value="i" selected="selected">Trois fois par an</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Trois fois par an</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2j" -->
-				<option value="j" SELECTED>Semestriel</option>
+				<option value="j" selected="selected">Semestriel</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Semestriel</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>Annuel</option>
+				<option value="k" selected="selected">Annuel</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Annuel</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" SELECTED>Bisanuel</option>
+				<option value="l" selected="selected">Bisanuel</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Bisanuel</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
-				<option value="m" SELECTED>Triennal</option>
+				<option value="m" selected="selected">Triennal</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Triennal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
-				<option value="n" SELECTED>Trois fois par semaine</option>
+				<option value="n" selected="selected">Trois fois par semaine</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Trois fois par semaine</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2o" -->
-				<option value="o" SELECTED>Trois fois par mois</option>
+				<option value="o" selected="selected">Trois fois par mois</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Trois fois par mois</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>Inconnue</option>
+				<option value="u" selected="selected">Inconnue</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Inconnue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
-				<option value="y" SELECTED>Sans periodicite</option>
+				<option value="y" selected="selected">Sans periodicite</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">Sans periodicite</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>Autre</option>
+				<option value="i" selected="selected">Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Autre</option>
 			<!-- /TMPL_IF -->
@@ -159,31 +159,31 @@
 		<td>
 			<select name="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>Inconnu</option>
+				<option value="u" selected="selected">Inconnu</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>Regulier</option>
+				<option value="a" selected="selected">Regulier</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Regulier</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>Normalement irregulier</option>
+				<option value="b" selected="selected">Normalement irregulier</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Normalement irregulier</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3y" -->
-				<option value="y" SELECTED>Irregulier</option>
+				<option value="y" selected="selected">Irregulier</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">Irregulier</option>
 			<!-- /TMPL_IF -->
@@ -196,128 +196,128 @@
 		<td>
 			<select name="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
                     <!-- TMPL_IF name="f4 " -->
-                        <option value=" " SELECTED>valeur non requise</option>
+                        <option value=" " selected="selected">valeur non requise</option>
                         <!-- TMPL_ELSE -->
                         <option value=" ">valeur non requise</option>
                     <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>Bibliographie</option>
+				<option value="a" selected="selected">Bibliographie</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Bibliographie</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>Catalogue</option>
+				<option value="b" selected="selected">Catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Catalogue</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>Index</option>
+				<option value="c" selected="selected">Index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Index</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>Resume ou extraits</option>
+				<option value="d" selected="selected">Resume ou extraits</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Resume ou extraits</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" SELECTED>Dictionnaire</option>
+				<option value="e" selected="selected">Dictionnaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Dictionnaire</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4f" -->
-				<option value="f" SELECTED>Encyclopedie</option>
+				<option value="f" selected="selected">Encyclopedie</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Encyclopedie</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4g" -->
-				<option value="g" SELECTED>Repertoire</option>
+				<option value="g" selected="selected">Repertoire</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Repertoire</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4h" -->
-				<option value="h" SELECTED>Annuaire</option>
+				<option value="h" selected="selected">Annuaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Annuaire</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4i" -->
-				<option value="i" SELECTED>Statistiques</option>
+				<option value="i" selected="selected">Statistiques</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Statistiques</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4j" -->
-				<option value="j" SELECTED>Manuel d'enseignement programme</option>
+				<option value="j" selected="selected">Manuel d'enseignement programme</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Manuel d'enseignement programme</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4k" -->
-				<option value="k" SELECTED>Revue critique</option>
+				<option value="k" selected="selected">Revue critique</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Revue critique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4l" -->
-				<option value="l" SELECTED>Journal officiel</option>
+				<option value="l" selected="selected">Journal officiel</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Journal officiel</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4m" -->
-				<option value="m" SELECTED>Jurisprudence</option>
+				<option value="m" selected="selected">Jurisprudence</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Jurisprudence</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4n" -->
-				<option value="n" SELECTED>Article juridique</option>
+				<option value="n" selected="selected">Article juridique</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Article juridique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4o" -->
-				<option value="o" SELECTED>Procès et compte rendu judiciaire</option>
+				<option value="o" selected="selected">Procès et compte rendu judiciaire</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Procès et compte rendu judiciaire</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4p" -->
-				<option value="p" SELECTED>Biographie</option>
+				<option value="p" selected="selected">Biographie</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Biographie</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4r" -->
-				<option value="r" SELECTED>Synthese bibliographique</option>
+				<option value="r" selected="selected">Synthese bibliographique</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">Synthese bibliographique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4t" -->
-				<option value="t" SELECTED>Dessin humoristique ou B.D.</option>
+				<option value="t" selected="selected">Dessin humoristique ou B.D.</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">Dessin humoristique ou B.D.</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4z" -->
-				<option value="z" SELECTED>Autre forme de contenu</option>
+				<option value="z" selected="selected">Autre forme de contenu</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autre forme de contenu</option>
 			<!-- /TMPL_IF -->
@@ -328,7 +328,7 @@
         </tr>
    <tr>
                 <td>Nature du contenu</td>
-                <td><input type="text" name="f5" maxlength=3 size=4 value="<!-- TMPL_VAR name="f5" -->"></td>
+                <td><input type="text" name="f5" maxlength="3" size="4" value="<!-- TMPL_VAR name="f5" -->"></td>
 
 	</tr>
 	<tr>
@@ -336,18 +336,18 @@
 		<td>
 			<select name="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f60" -->
-				<option value="0" SELECTED>Il ne s'agit pas d'une publication de congres</option>
+				<option value="0" selected="selected">Il ne s'agit pas d'une publication de congres</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">Il ne s'agit pas d'une publication de congres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f61" -->
-				<option value="1" SELECTED>Il s'agit d'une publication de congres</option>
+				<option value="1" selected="selected">Il s'agit d'une publication de congres</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">Il s'agit d'une publication de congres</option>
 			<!-- /TMPL_IF -->
@@ -359,77 +359,77 @@
 		<td>
 			<select name="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>Dans le dernier fascicule - volante</option>
+				<option value="a" selected="selected">Dans le dernier fascicule - volante</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Dans le dernier fascicule - volante</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>Dans le dernier fascicule - reliee</option>
+				<option value="b" selected="selected">Dans le dernier fascicule - reliee</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Dans le dernier fascicule - reliee</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>Dans le premier fascicule du volume suivant - volante</option>
+				<option value="c" selected="selected">Dans le premier fascicule du volume suivant - volante</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Dans le premier fascicule du volume suivant - volante</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>Dans le premier fascicule du volume suivant - reliee</option>
+				<option value="d" selected="selected">Dans le premier fascicule du volume suivant - reliee</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Dans le premier fascicule du volume suivant - reliee</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f7e" -->
-				<option value="e" SELECTED>Editee separement - gratuitement, sur commande</option>
+				<option value="e" selected="selected">Editee separement - gratuitement, sur commande</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Editee separement - gratuitement, sur commande</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7f" -->
-				<option value="f" SELECTED>Editee separement - gratuitement, envoi automatique</option>
+				<option value="f" selected="selected">Editee separement - gratuitement, envoi automatique</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Editee separement - gratuitement, envoi automatique</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>Editee separement - sur commande, a titre onereux</option>
+				<option value="g" selected="selected">Editee separement - sur commande, a titre onereux</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Editee separement - sur commande, a titre onereux</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>Inconnue a la creation de la notice</option>
+				<option value="u" selected="selected">Inconnue a la creation de la notice</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Inconnue a la creation de la notice</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>Non applicable</option>
+				<option value="x" selected="selected">Non applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">Non applicable</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7y" -->
-				<option value="y" SELECTED>Pas de page de titre parue</option>
+				<option value="y" selected="selected">Pas de page de titre parue</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">Pas de page de titre parue</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>Autre</option>
+				<option value="z" selected="selected">Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autre</option>
 			<!-- /TMPL_IF -->
@@ -443,125 +443,125 @@
 		<td>
 			<select name="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>Chaque fascicule contient son propre index - volant</option>
+				<option value="a" selected="selected">Chaque fascicule contient son propre index - volant</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Chaque fascicule contient son propre index - volant</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>Dans le dernier fascicule - volant - pagination separee</option>
+				<option value="b" selected="selected">Dans le dernier fascicule - volant - pagination separee</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Dans le dernier fascicule - volant - pagination separee</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>Dans le dernier fascicule - volant - Non pagine</option>
+				<option value="c" selected="selected">Dans le dernier fascicule - volant - Non pagine</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Dans le dernier fascicule - volant - Non pagine</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f8d" -->
-				<option value="d" SELECTED>Dans le dernier fascicule - relie</option>
+				<option value="d" selected="selected">Dans le dernier fascicule - relie</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Dans le dernier fascicule - relie</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f8e" -->
-				<option value="b" SELECTED>Dans le dernier fascicule - volant - pagination separee</option>
+				<option value="b" selected="selected">Dans le dernier fascicule - volant - pagination separee</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Dans le dernier fascicule - volant - pagination separee</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8f" -->
-				<option value="f" SELECTED>Dans le dernier fascicule - volant - non pagine</option>
+				<option value="f" selected="selected">Dans le dernier fascicule - volant - non pagine</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Dans le dernier fascicule - volant - non pagine</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" SELECTED>dans le premier fascicule relié</option>
+				<option value="g" selected="selected">dans le premier fascicule relié</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">dans le premier fascicule relié/option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8h" -->
-				<option value="h" SELECTED>Edite separement - gratuit - envoit automatique</option>
+				<option value="h" selected="selected">Edite separement - gratuit - envoit automatique</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Edite separement - gratuit - envoit automatique</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8i" -->
-				<option value="i" SELECTED>Edite separement - gratuit sur demande</option>
+				<option value="i" selected="selected">Edite separement - gratuit sur demande</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Edite separement - gratuit sur demande</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8j" -->
-				<option value="j" SELECTED>Edite separement - reliure d'editeur - gratuit - envoit automatique</option>
+				<option value="j" selected="selected">Edite separement - reliure d'editeur - gratuit - envoit automatique</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Edite separement - reliure d'editeur - gratuit - envoit automatique</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8k" -->
-				<option value="k" SELECTED>Edite separement - reliure d'editeur - gratuit sur demande</option>
+				<option value="k" selected="selected">Edite separement - reliure d'editeur - gratuit sur demande</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Edite separement - reliure d'editeur - gratuit sur demande</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8l" -->
-				<option value="l" SELECTED>Edite separement - reliure d'editeur - commande a titre onereux</option>
+				<option value="l" selected="selected">Edite separement - reliure d'editeur - commande a titre onereux</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Edite separement - reliure d'editeur - commande a titre onereux</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8m" -->
-				<option value="m" SELECTED>Supplement ou sous-serie indexe dans la publication mere</option>
+				<option value="m" selected="selected">Supplement ou sous-serie indexe dans la publication mere</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Supplement ou sous-serie indexe dans la publication mere</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8u" -->
-				<option value="u" SELECTED>Inconnu</option>
+				<option value="u" selected="selected">Inconnu</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8x" -->
-				<option value="x" SELECTED>Non applicable</option>
+				<option value="x" selected="selected">Non applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">Non applicable</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8y" -->
-				<option value="y" SELECTED>index indisponible</option>
+				<option value="y" selected="selected">index indisponible</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">index indisponible</option>
 			<!-- /TMPL_IF -->
 				
 
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>Autre</option>
+				<option value="z" selected="selected">Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">Autre</option>
 			<!-- /TMPL_IF -->
@@ -573,18 +573,18 @@
 		<td>
 			<select name="f9" size="1">
 			<!-- TMPL_IF name="f9|" -->
-                            <option value="|" SELECTED>|- Caractère de remplissage</option>
+                            <option value="|" selected="selected">|- Caractère de remplissage</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Caractère de remplissage</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f90" -->
-				<option value="0" SELECTED>Pas d'index cumulatif ou de table des matieres</option>
+				<option value="0" selected="selected">Pas d'index cumulatif ou de table des matieres</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">Pas d'index cumulatif ou de table des matieres </option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f91" -->
-				<option value="1" SELECTED>Index cumulatif ou table des matieres</option>
+				<option value="1" selected="selected">Index cumulatif ou table des matieres</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">Index cumulatif ou table des matieres</option>
 			<!-- /TMPL_IF -->
@@ -592,7 +592,7 @@
 		</td>
 	</tr>
 
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
+	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
 </form>
 <script type="text/javascript">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
index ab808b004a..83c6273258 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Z39.50 Search Results</title>
-    <!-- TMPL_IF NAME="TemplateEncoding" --><meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME="TemplateEncoding" -->"><!-- TMPL_ELSE --><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="TemplateEncoding" --><meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME="TemplateEncoding" -->" /><!-- TMPL_ELSE --><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><!-- /TMPL_IF -->
 <link rel="shortcut icon" href="/intranet-tmpl/prog/en/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
     <!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/css/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/css/intranet.css);<!-- /TMPL_IF -->
@@ -15,10 +15,10 @@
 <div id="main-compact">
 
     <h2>Search for</h2>
-    <!-- TMPL_IF NAME='title'--><p>Title: <!-- TMPL_VAR NAME='title'--></p><!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME='author'--><p>Author: <!-- TMPL_VAR NAME='author'--></p><!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME='isbn'--><p>ISBN: <!-- TMPL_VAR NAME='isbn'--></p><!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME='issn'--><p>ISSN: <!-- TMPL_VAR NAME='issn'--></p><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="title"--><p>Title: <!-- TMPL_VAR NAME="title"--></p><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="author"--><p>Author: <!-- TMPL_VAR NAME="author"--></p><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="isbn"--><p>ISBN: <!-- TMPL_VAR NAME="isbn"--></p><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="issn"--><p>ISSN: <!-- TMPL_VAR NAME="issn"--></p><!-- /TMPL_IF -->
     
 <!-- TMPL_IF name="opsearch" -->
     <h2>on following servers</h2>
@@ -37,13 +37,13 @@
         <p>
         <label><!-- TMPL_VAR NAME="host" --></label>
             <!-- TMPL_IF name="checked" -->
-                <input type="checkbox" name="id" value="<!-- TMPL_VAR NAME="id" -->" checked />
+                <input type="checkbox" name="id" value="<!-- TMPL_VAR NAME="id" -->" checked="checked" />
             <!-- TMPL_ELSE -->
                 <input type="checkbox" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
             <!-- /TMPL_IF -->
         </p>
     <!-- /TMPL_LOOP -->
-    <input type="submit"  class="submit" value="Search internet" onclick="cursor :'wait'"/>
+    <input type="submit"  class="submit" value="Search internet" onclick="cursor :'wait'" />
     </form>
 <!-- TMPL_ELSE -->
     <h2>Results</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
index 56f266ebb7..c36b5d357c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tmpl
@@ -7,7 +7,7 @@
 <h1>
 <!-- TMPL_VAR Name="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR Name="author" -->)<!-- /TMPL_IF --></a></h1>
 <h2>Barcode <!-- TMPL_VAR Name="barcode" --></h2>
-<div class="tabitem"><form action="/cgi-bin/koha/catalogue/detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->"><input type="hidden" name="type" value="intra"><input type="submit" class="submit" value="Brief Display"></form> <form action="/cgi-bin/koha/catalogue/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->"><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->"> <input type="submit" class="submit" value="Item Details"></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber"> <input type="submit" value="Place Reserve" class="submit"></form><!-- /TMPL_IF --></div>
+<div class="tabitem"><form action="/cgi-bin/koha/catalogue/detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" /><input type="hidden" name="type" value="intra" /><input type="submit" class="submit" value="Brief Display" /></form> <form action="/cgi-bin/koha/catalogue/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /> <input type="submit" class="submit" value="Item Details" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber"> <input type="submit" value="Place Reserve" class="submit" /></form><!-- /TMPL_IF --></div>
 <div class="data">
 <table>
 		<tr><th>Home Library: </th><td> <!-- TMPL_VAR Name="homebranch" --> </td></tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
index bbddbb5835..66449dd3f2 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
@@ -14,7 +14,7 @@
     <ul>
         <li>
             You are working actually on the overdues for the location : <b><!-- TMPL_VAR NAME="location" --></b>
-    <input type="submit" name="changelocation" class="button" value="change location">
+    <input type="submit" name="changelocation" class="button" value="change location" />
         </li>
     </ul>
 </form>
@@ -27,7 +27,7 @@
             <option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
         <!-- /TMPL_LOOP -->
     </select>
-    <input type="submit" name="location" class="button" value="OK">
+    <input type="submit" name="location" class="button" value="OK" />
 </form>
 </p>
 <!-- /TMPL_IF -->
@@ -80,25 +80,25 @@
                     <td align="center">
                     <!-- TMPL_IF NAME="overdue1" -->
                         <!-- TMPL_IF NAME="borroweremail" -->
-                            <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=mail&location=<!-- TMPL_VAR NAME="location" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&notifyId=<!-- TMPL_VAR NAME="notify_id" -->">mail</a>
+                            <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=mail&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">mail</a>
                         <!-- TMPL_ELSE -->
                             mail
                         <!-- /TMPL_IF -->
                             &nbsp;|&nbsp;
-                            <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=phone&location=<!-- TMPL_VAR NAME="location" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&notifyId=<!-- TMPL_VAR NAME="notify_id" -->
+                            <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=phone&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->
                             ">phone</a>
                             &nbsp;|&nbsp;
-                            <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=letter&location=<!-- TMPL_VAR NAME="location" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
-                            &notifyId=<!-- TMPL_VAR NAME="notify_id" -->">letter</a>
+                            <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=letter&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
+                            &amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">letter</a>
                     <!-- /TMPL_IF -->
                     
                     <!-- TMPL_IF NAME="overdue2" -->
-                        <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=letter&location=<!-- TMPL_VAR NAME="location" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&notifyId=<!-- TMPL_VAR NAME="notify_id" -->">letter</a>
+                        <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=letter&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->&amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">letter</a>
                     <!-- /TMPL_IF -->
                     
                     <!-- TMPL_IF NAME="overdue3" -->
-                    <a href="branchoverdues.pl?action=add&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=lost&location=<!-- TMPL_VAR NAME="location" -->&overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
-                    &notifyId=<!-- TMPL_VAR NAME="notify_id" -->">Considered lost</a>
+                    <a href="branchoverdues.pl?action=add&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=lost&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;overduelevel=<!-- TMPL_VAR NAME="overdueLevel" -->
+                    &amp;notifyId=<!-- TMPL_VAR NAME="notify_id" -->">Considered lost</a>
                     <!-- /TMPL_IF -->
                     
                     </td>
@@ -161,7 +161,7 @@
                         </td>
                     
                         <td>
-                        <a href="branchoverdues.pl?action=remove&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&method=phone&location=<!-- TMPL_VAR NAME="location" -->&notify_date=<!-- TMPL_VAR NAME="notify_date" -->">cancel notification</a>
+                        <a href="branchoverdues.pl?action=remove&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;method=phone&amp;location=<!-- TMPL_VAR NAME="location" -->&amp;notify_date=<!-- TMPL_VAR NAME="notify_date" -->">cancel notification</a>
                         </td>
                     </tr>
                 <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
index ba90e2d4dc..fe5f0b6502 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tmpl
@@ -57,7 +57,7 @@
                             <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
                             <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
                             <input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobranchcd" -->" />
-                            <input type="hidden" name="barcode" value=<!-- TMPL_VAR Name="barcode" --> />
+                            <input type="hidden" name="barcode" value="<!-- TMPL_VAR Name="barcode" -->" />
                             <input type="hidden" name="request" value="KillReserved" />
                             <input type="submit" value="Cancel" />
                         </form>
@@ -68,7 +68,7 @@
                     <th>Ignore and return to transfers: </th>
                         <td>
                             <form method="post" name="mainform" id="mainform" action="branchtransfers.pl" />
-                                <input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR Name="tobranchcd" --> />
+                                <input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobranchcd" -->" />
                                 <input type="hidden" name="barcode" />
                                 <!-- TMPL_LOOP Name="trsfitemloop" -->
                                     <input type="hidden" name="bc-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
@@ -88,10 +88,10 @@
             <td>
                 <!-- TMPL_IF Name="reqmessage" -->
                     <!-- TMPL_IF Name="cancelled" -->
-                        Reserve Cancelled<br>
+                        Reserve Cancelled<br />
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF Name="setwaiting" -->
-                        Item should now be waiting at library: <!-- TMPL_VAR Name="reqbrchname" --><br>
+                        Item should now be waiting at library: <!-- TMPL_VAR Name="reqbrchname" --><br />
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_IF -->
                 <!-- TMPL_LOOP Name="errmsgloop" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 1b17f2d479..e39ac7b990 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -65,7 +65,7 @@
         
             <!-- TMPL_IF NAME="dbarred" -->
                 <p>
-                Restricted: Patron's account is restricted <a href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&destination=circ&status=0">Lift restriction</a>
+                Restricted: Patron's account is restricted <a href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&amp;destination=circ&amp;status=0">Lift restriction</a>
                 </p>
             <!-- /TMPL_IF -->
         
@@ -115,7 +115,7 @@
 
     <p>
     <label for="findborrower">Enter patron card number or partial name: </label>
-    <input id="findborrower" name="findborrower" type="text" size="40"/>
+    <input id="findborrower" name="findborrower" type="text" size="40" />
     </p>
 
     <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
@@ -205,8 +205,8 @@
 <!-- TMPL_IF NAME="message" -->
 <p>
 No patron matched <!-- TMPL_VAR name="message" -->
-<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>
-<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a>  
+<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A" />Add adult</a>
+<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C" />Add child</a>  
 </p>
 <!-- /TMPL_IF -->
 
@@ -228,8 +228,8 @@ No patron matched <!-- TMPL_VAR name="message" -->
 
     <p>
     Patron not found?
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>
-    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a>
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A" />Add adult</a>
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C" />Add child</a>
     or <a href="JavaScript:back();">try another search</a>
     </p>
 </fieldset>
@@ -586,7 +586,7 @@ No patron matched <!-- TMPL_VAR name="message" -->
         
         <label for="stickyduedate">
 	<!-- TMPL_IF NAME="stickyduedate" -->
-            <input type="checkbox" id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> checked />
+            <input type="checkbox" id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> checked="checked" />
             Remember due date for this patron
 <!-- TMPL_ELSE -->
             <input type="checkbox" id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> />
@@ -683,17 +683,17 @@ No patron matched <!-- TMPL_VAR name="message" -->
                         <!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
 
                         <!-- TMPL_IF name="waiting" -->
-                        <br/>
+                        <br />
                         <i>This hold is available</i>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="transfered" -->
-                        <br/>
+                        <br />
                         <i>This hold has been transfered from library : 
                         <!-- TMPL_VAR NAME="frombranch" --> the : <!-- TMPL_VAR NAME="datesent" --> </i>
                         <!-- /TMPL_IF -->
 
                         <!-- TMPL_IF name="nottransfered" -->
-                        <br/>
+                        <br />
                         <i>This hold hasn't been transfered yet from library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
                         <!-- /TMPL_IF -->
                     </td>
@@ -712,7 +712,7 @@ No patron matched <!-- TMPL_VAR name="message" -->
     <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
     <p>
     <span class="click" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page')">Print Page</span>
-    / <span class="click" onclick="javascript:window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip')">Print Slip</span>
+    / <span class="click" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip')">Print Slip</span>
     </p>
     
     <input type="hidden" value="circ" name="destination" />
@@ -756,16 +756,11 @@ No patron matched <!-- TMPL_VAR name="message" -->
         <td><!-- TMPL_VAR NAME="barcode" --></td>
         <td>
         <!-- TMPL_IF NAME="od" -->
-            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked"/>
+            <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" />
         <!-- TMPL_ELSE -->
             <input type="checkbox" name="items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
         <!-- /TMPL_IF -->
-        <input type="checkbox"
-                name="all_items[]"
-                value="<!-- TMPL_VAR NAME="itemnumber" -->"
-            checked="checked"
-                style="display: none;"
-        />
+        <input type="checkbox" name="all_items[]" value="<!-- TMPL_VAR NAME="itemnumber" -->" checked="checked" style="display: none;" />
         </td>
     </tr>
     <!-- /TMPL_LOOP --> <!-- todayissues -->
@@ -791,7 +786,7 @@ No patron matched <!-- TMPL_VAR name="message" -->
     <!-- /TMPL_IF -->
         <td>
         <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>
-        <br/><!-- TMPL_VAR NAME="author" --> - <!-- TMPL_VAR name="itemnotes" -->
+        <br /><!-- TMPL_VAR NAME="author" --> - <!-- TMPL_VAR name="itemnotes" -->
         </td>
         <td>
         <!-- TMPL_VAR NAME="dd" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index ba2c06847b..fc557b13dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
@@ -27,7 +27,7 @@
         name="from"
         value="<!-- TMPL_VAR NAME="from" -->" />
 <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" 
-        border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top" />
+        border="0" id="openCalendarFrom" style="cursor: pointer;" alt="" />
 <script language="JavaScript" type="text/javascript">
 function validate1(date) {
     var day = date.getDate();
@@ -58,7 +58,7 @@ Calendar.setup(
     End date:
 </label>
 <input size="10" id="to" name="to" value="<!-- TMPL_VAR NAME="to" -->" type="text" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif"
+<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt=""
         id="openCalendarTo"
         style="cursor: pointer;"
         valign="top" border="0" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 9a1323c6ef..68c0f0c3a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -14,7 +14,7 @@
     <tr>
         <th>Title : </th>
         <td>        	
-                <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a>
+                <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a>
         </td>
     </tr>
     <tr><th>Hold for: </th>
@@ -107,19 +107,19 @@
         <p><span class="problem">The document <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) Must be returned to his homebranch(<b><!-- TMPL_VAR NAME="homebranch" --></b>)</span></p>
             <form method="post" action="returns.pl">
                 <!-- TMPL_LOOP Name="inputloop" -->
-                    <input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
-                    <input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
-                    <input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+                    <input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->" />
+                    <input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->" />
+                    <input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
                 <!-- /TMPL_LOOP -->
-                <input type="hidden" name="barcode" value="0">
-                <input type="submit" value="OK">
+                <input type="hidden" name="barcode" value="0" />
+                <input type="submit" value="OK" />
             </form>
     <!-- /TMPL_IF -->
     
     <!-- TMPL_IF Name="diffbranch" -->
         <h3>Item Consigned:</h3>
         <table>
-        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
+        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></caption>
         <tr>
             <th>Patron:</th>
             <td><!-- TMPL_VAR Name="name" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
index 36ff848e69..5b4763317d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/stats.tmpl
@@ -30,7 +30,7 @@
     		</tr>
     		<!-- /TMPL_LOOP -->
     		</table>
-    		<p>Total paid: <!-- TMPL_VAR NAME="total" --><br>Total written off: <!-- TMPL_VAR NAME="totalw" --></p>
+    		<p>Total paid: <!-- TMPL_VAR NAME="total" --><br />Total written off: <!-- TMPL_VAR NAME="totalw" --></p>
     	<!-- TMPL_ELSE -->
     	<h3>No statistics to report</h3>
     	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
index e22f255b62..40a689c91c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
@@ -59,7 +59,7 @@
                 </tr>
             <!-- /TMPL_LOOP -->
             </table>
-            <br><br>
+            <br /><br />
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
     </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
index 2fcc2dbc8d..cdb9a9d569 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
@@ -5,7 +5,7 @@
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
 <div id="mainbloc">
-	<h1 class="circulation">Transfers made TO your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
+	<h1>Transfers made TO your library on : <!-- TMPL_VAR NAME="show_date" --></h1>
 	<!-- TMPL_IF name="branchesloop" -->
             <p>Your library is the destination for the following transfer(s)</p>
             <div id="resultlist">
@@ -13,14 +13,14 @@
                 <!-- TMPL_IF NAME="branchcode" -->
                 <table>
                 <tr>
-                        <th class="circulation" colspan="5">Coming from <!-- TMPL_VAR NAME="branchname" --> </th>
+                        <th colspan="5">Coming from <!-- TMPL_VAR NAME="branchname" --> </th>
                 </tr>
                 <tr>
-                    <th class="circulation">Date of transfer</th>
-                    <th class="circulation">Title</th>
-                    <th class="circulation">Reserved by </th>
-                    <th class="circulation">Localisation</th>
-                    <th class="circulation">Action</th>
+                    <th>Date of transfer</th>
+                    <th>Title</th>
+                    <th>Reserved by </th>
+                    <th>Localisation</th>
+                    <th>Action</th>
                 </tr>
                 <!-- TMPL_LOOP NAME="reserv" -->
                     <tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
@@ -61,7 +61,7 @@
                     </tr>
                 <!-- /TMPL_LOOP -->	
                 </table>
-                <br><br>
+                <br /><br />
                 <!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
             </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index 00d4cc8ecd..c832949758 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -7,25 +7,25 @@
 <h1>Circulation: Library Holds</h1>
 
 <div id="mainbloc">
-        <h2 class="circulation">Holds for your library on : <!-- TMPL_VAR NAME="show_date" --></h2>
+        <h2>Holds for your library on : <!-- TMPL_VAR NAME="show_date" --></h2>
         <!-- TMPL_IF NAME="messagetransfert" -->
                 <div>
                                 <h2>Hold find for(<!-- TMPL_VAR NAME="nextreservtitle" -->)must transfered</h2>
                         <p>This hold placed by : <b> <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please transfer this hold.
                         </p>
                         <form name="cancelReservewithtransfert" action="waitingreserves.pl" method="post">
-                                <input type="submit" class="button circulation">
+                                <input type="submit" class="button" />
                         </form>
                 </div>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="waiting" -->
                 <div id="bloc25">
-                                <h2 class="circulation">This hold is waiting</h2>
+                                <h2>This hold is waiting</h2>
                         <p>This hold (<!-- TMPL_VAR NAME="nextreservtitle" -->) was placed by <b> : <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b>,
                         Please retain this hold.
                         </p>
                         <form name="cancelReservewithwaiting" action="waitingreserves.pl" method="post">
-                                <input type="submit">
+                                <input type="submit" />
                         </form>
                 </div>
         <!-- /TMPL_IF -->
@@ -34,14 +34,14 @@
             <!-- TMPL_IF NAME="reserveloop" -->
                 <table>
                 <tr>
-                        <th class="circulation" colspan="5">Holds at your library</th>
+                        <th colspan="5">Holds at your library</th>
                 </tr>
                 <tr>
-                        <th class="circulation">Available since</th>
-                        <th class="circulation">Title</th>
-                        <th class="circulation">Patron</th>
-                        <th class="circulation">Localisation</th>
-                        <th class="circulation">Action</th>
+                        <th>Available since</th>
+                        <th>Title</th>
+                        <th>Patron</th>
+                        <th>Localisation</th>
+                        <th>Action</th>
                 </tr>
                         <!-- TMPL_LOOP NAME="reserveloop" -->
                                 <tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
@@ -62,14 +62,14 @@
                                         <td><p><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
                                         <td>
                                                 <form name="cancelReserve -->" action="waitingreserves.pl" method="post">
-                                                        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernum" -->">
-                                                        <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
-                                                        <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->">
-                                                        <input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->">
+                                                        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernum" -->" />
+                                                        <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+                                                        <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->" />
+                                                        <input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->" />
                                                         <!-- TMPL_IF NAME="dotransfer" -->
-                                                        <input type="submit" value="Cancel reserve and return to : <!-- TMPL_VAR NAME="homebranch" -->"> 
+                                                        <input type="submit" value="Cancel reserve and return to : <!-- TMPL_VAR NAME="homebranch" -->" /> 
                                                         <!-- TMPL_ELSE -->
-                                                        <input type="submit" value="Cancel reserve" >
+                                                        <input type="submit" value="Cancel reserve" />
                                                 <!-- /TMPL_IF -->
                                                 </form>
                                         </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl
index bf355f0111..0d9e7f6fd2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl
@@ -26,10 +26,10 @@
 <li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
 <li>
 <li><b>Example MARC21 Subject Headings Authority</b>
-<ul>Use field 035$a for your auth_header.authid and 035$8 for auth_header.authtypecode. Make sure your zebra authorities index these fields</ul>
-<ul>Use field 150 for your subject headings</ul>
-<ul>Use field 750$9 (add subfield if not present) for auth_header.linkid . Select <b>Is a linking field</b>. You may use any subfield for linking as $9 is not hardcoded
-<ul>When you add or modify an authority clicking on ... that will appear next to 750$9 will let you search any authority and link it to this record. You may repeat tag 750 and add as many linkages as you like</u>
+<ul><li>Use field 035$a for your auth_header.authid and 035$8 for auth_header.authtypecode. Make sure your zebra authorities index these fields</li>
+<li>Use field 150 for your subject headings</li>
+<li>Use field 750$9 (add subfield if not present) for auth_header.linkid . Select <b>Is a linking field</b>. You may use any subfield for linking as $9 is not hardcoded
+<li>When you add or modify an authority clicking on ... that will appear next to 750$9 will let you search any authority and link it to this record. You may repeat tag 750 and add as many linkages as you like</li></ul>
 </li>
 </ul>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
index 7754306a19..68540ddb76 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/marc_subfields_structure.tmpl
@@ -23,25 +23,25 @@
 ( ! means 'not visible' or in the case of Collapsed 'not
 Collapsed')
 <br /><br />
-  -9 => Future use<br/>
-  -8 =>  Flag<br/>
-  -7 =>  OPAC !Intranet !Editor  Collapsed<br/>
-  -6 =>  OPAC  Intranet !Editor !Collapsed<br/>
-  -5 =>  OPAC  Intranet !Editor  Collapsed<br/>
-  -4 =>  OPAC !Intranet !Editor !Collapsed<br/>
-  -3 =>  OPAC !Intranet  Editor  Collapsed<br/>
-  -2 =>  OPAC !Intranet  Editor !Collapsed<br/>
-  -1 =>  OPAC  Intranet  Editor  Collapsed<br/>
-   0 =>  OPAC  Intranet  Editor !Collapsed<br/>
-   1 => !OPAC  Intranet  Editor  Collapsed<br/>
-   2 => !OPAC !Intranet  Editor !Collapsed<br/>
-   3 => !OPAC !Intranet  Editor  Collapsed<br/>
-   4 => !OPAC  Intranet  Editor !Collapsed<br/>
-   5 => !OPAC !Intranet !Editor  Collapsed<br/>
-   6 => !OPAC  Intranet !Editor !Collapsed<br/>
-   7 => !OPAC  Intranet !Editor  Collapsed<br/>
-   8 => !OPAC !Intranet !Editor !Collapsed<br/>
-   9 => Future use<br/>
+  -9 => Future use<br />
+  -8 =>  Flag<br />
+  -7 =>  OPAC !Intranet !Editor  Collapsed<br />
+  -6 =>  OPAC  Intranet !Editor !Collapsed<br />
+  -5 =>  OPAC  Intranet !Editor  Collapsed<br />
+  -4 =>  OPAC !Intranet !Editor !Collapsed<br />
+  -3 =>  OPAC !Intranet  Editor  Collapsed<br />
+  -2 =>  OPAC !Intranet  Editor !Collapsed<br />
+  -1 =>  OPAC  Intranet  Editor  Collapsed<br />
+   0 =>  OPAC  Intranet  Editor !Collapsed<br />
+   1 => !OPAC  Intranet  Editor  Collapsed<br />
+   2 => !OPAC !Intranet  Editor !Collapsed<br />
+   3 => !OPAC !Intranet  Editor  Collapsed<br />
+   4 => !OPAC  Intranet  Editor !Collapsed<br />
+   5 => !OPAC !Intranet !Editor  Collapsed<br />
+   6 => !OPAC  Intranet !Editor !Collapsed<br />
+   7 => !OPAC  Intranet !Editor  Collapsed<br />
+   8 => !OPAC !Intranet !Editor !Collapsed<br />
+   9 => Future use<br />
 </code>
 <li>URL : if checked, the subfield is an URL, and can be clicked</li>
 <li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl
index 4ce7246b12..e3fba2208d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tmpl
@@ -29,15 +29,15 @@
 	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
 	<p>The UNIMARC (partial) definition for ISBD is </p><i>
 	<p>#700|&lt;label&gt;Titre/auteur&lt;/label&gt;|{700a}{701a}{702a}| ;
-		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
-		#230||{ ; 230a}|<br/>
-		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
-		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br/>
-		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br/>
-		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br/>
-		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br/>
-		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br/>
-		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br/>
+		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br />
+		#230||{ ; 230a}|<br />
+		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br />
+		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br />
+		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br />
+		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br />
+		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br />
+		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br />
+		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br />
 	</i></p>
 </li>
 
@@ -45,7 +45,7 @@
 
 <li><b>ldapserver and ldapinfos --</b> Koha 2.0 can use Perl LDAP (Lightweight Directory Access Protocol, see http://search.cpan.org/~gbarr/perl-ldap-0.3202/lib/Net/LDAP.pod) to manage user access and privileges. To avoid a useless Perl package for libraries without ldap, all what is related to LDAP has been moved to KohaInstall/modules/C4/Auth_with_ldap.pm. Ask your system administrator to set up LDAP with Auth_with_ldap.pm (perldoc Auth_with_ldap.pm for help). Those 2 parameters are useless in 2.2 and have should not appear on a new install.</li>
 
-<li><b>LibraryName --</b> The library name or message that will be shown on the main OPAC page. You may use HTML tags to format the name. Example: Welcome to <i>Koha<br/>Free Software ILS</i></li>
+<li><b>LibraryName --</b> The library name or message that will be shown on the main OPAC page. You may use HTML tags to format the name. Example: Welcome to <i>Koha<br />Free Software ILS</i></li>
 
 <li><b>marc --</b> Turn on MARC support. Set to "no" if you do not intend to use MARC records.</li>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl
index 4a11bdcac0..772b75ce2b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/bull/subscription-detail.tmpl
@@ -22,8 +22,8 @@
 			</ul>
 		<h2>Sample</h2>
 			Consider the formula <b>#{X}/{Y}</b>. The following XYZ settings :
-			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
-			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
+			<ul><li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
+			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li></ul>
 			will result in the following issues numbers :
 			<b>#2004/1,#2004/2,#2004/3,#2004/4,#2005/1,#2005/2,#2005/3,#2005/4,#2006/1
 		<p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tmpl
index 055e813afc..b71dc65115 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/nohelp.tmpl
@@ -4,9 +4,9 @@
 	<h1>Online Help</h1>
 	<p>Sorry, there is no help available for this topic</p>
 <form action="/cgi-bin/koha/edithelp.pl" method="post">
-<input type="hidden" name="referer" value="<!-- TMPL_VAR NAME="referer" -->">
-<input type="hidden" name="type" value="addnew">
-<input type="submit" name="submit" value="Add help">
+<input type="hidden" name="referer" value="<!-- TMPL_VAR NAME="referer" -->" />
+<input type="hidden" name="type" value="addnew" />
+<input type="submit" name="submit" value="Add help" />
 </form>
 	</div>
 	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl
index e1738385d0..601ac449ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tmpl
@@ -18,7 +18,7 @@ listed, please inform your systems administrator.</p>
 </select>
 </p>
 
-<p> Click Next to continue <input value="Next &gt;&gt;" type="submit"></p>
+<p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
 </form>
 <!--/TMPL_UNLESS-->
 <!--TMPL_IF Name="language"-->
@@ -29,16 +29,16 @@ listed, please inform your systems administrator.</p>
   <!--TMPL_LOOP Name="missing"-->
     <li><!--TMPL_VAR Name="name"-->
     <!--TMPL_IF Name="usagemail"-->
-      <br/> This module is used whenever Koha has to send email.
+      <br /> This module is used whenever Koha has to send email.
     <!--/TMPL_IF-->
     <!--TMPL_IF Name="usagebarcode"-->
-      <br/> This module is needed if you intend to print barcodes.
+      <br /> This module is needed if you intend to print barcodes.
     <!--/TMPL_IF-->
     <!--TMPL_IF Name="usagespine"-->
-      <br/> This module is needed if you intend to print spine labels.
+      <br /> This module is needed if you intend to print spine labels.
     <!--/TMPL_IF-->
     <!--TMPL_IF Name="usageLDAP"-->
-      <br/> This module is needed if you intend to use LDAP for authentication.
+      <br /> This module is needed if you intend to use LDAP for authentication.
     <!--/TMPL_IF-->
     </li>
   <!--/TMPL_LOOP-->
@@ -80,7 +80,7 @@ listed, please inform your systems administrator.</p>
 <p> All dependencies installed.
 </p>
 <input type="hidden" name="step" value="2" />
-<p>Please click next to continue <input value="Next &gt;&gt;" type="submit"></p>
+<p>Please click next to continue <input value="Next &gt;&gt;" type="submit" /></p>
 </form>
   <!--/TMPL_IF-->
 <!--/TMPL_IF-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl
index 6ffe676add..bb50ae2222 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tmpl
@@ -41,14 +41,14 @@
   <!--/TMPL_IF-->
   <!-- TMPL_IF NAME="error" --><!-- TMPL_ELSE -->
 <input type="hidden" name="step" value="3" />
-<p> Click Next to continue <input value="Next &gt;&gt;" type="submit"></p>
+<p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
 <!-- /TMPL_IF -->
 </form>
 <!--TMPL_ELSE-->
 <form name="checkinformation" type="post" action="install.pl">
 <input type="hidden" name="step" value="2" />
 <input type="hidden" name="checkmysql" value="1" />
-<p> Please click Next to continue if this information is correct <input value="Next &gt;&gt;" type="submit"></p>
+<p> Please click Next to continue if this information is correct <input value="Next &gt;&gt;" type="submit" /></p>
 </form>
 <!--/TMPL_IF-->
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl
index d7d88bdcce..5fc7bc954f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tmpl
@@ -90,7 +90,7 @@ function Hide(link) {
 
   <p><select name="fwklanguage" onchange="javascript:refresh(this.value)">
   <!--TMPL_LOOP Name="languagelist" -->
-  <!--TMPL_IF Name="checked"--><option value="<!--TMPL_VAR Name="dirname"-->" selected ><!--TMPL_VAR Name="languagedescription"--></option>
+  <!--TMPL_IF Name="checked"--><option value="<!--TMPL_VAR Name="dirname"-->" selected="selected"><!--TMPL_VAR Name="languagedescription"--></option>
   <!--TMPL_ELSE--><option value="<!--TMPL_VAR Name="dirname"-->"><!--TMPL_VAR Name="languagedescription"--></option>
   <!--/TMPL_IF-->
   <!--/TMPL_LOOP-->
@@ -103,8 +103,8 @@ function Hide(link) {
   <!--TMPL_LOOP Name="frameworks"-->
     <div style="border:1px;">
     <p>
-    <!--TMPL_IF Name="checked"--><input type="checkbox" Name="framework" value="<!--TMPL_VAR Name="fwkfile"-->" checked />
-    <!--TMPl_ELSE--><input type="checkbox" Name="framework" value="<!--TMPL_VAR Name="fwkfile"-->" />
+    <!--TMPL_IF Name="checked"--><input type="checkbox" name="framework" value="<!--TMPL_VAR Name="fwkfile"-->" checked="checked" />
+    <!--TMPl_ELSE--><input type="checkbox" name="framework" value="<!--TMPL_VAR Name="fwkfile"-->" />
     <!--/TMPL_IF-->
     <!--TMPL_VAR Name="fwkdescription"-->
     <em>(<!--TMPL_VAR Name="fwkname"-->)</em>
@@ -131,12 +131,12 @@ function Hide(link) {
   <p>
   <ul>
   <!--TMPL_LOOP Name="fwklist"-->
-    <li><!--TMPL_VAR Name="fwkname"--><!--TMPL_IF Name="error"--><br /><font color="red"><b></b><!--TMPL_VAR Name="error"--></font><!--/TMPL_IF--> </li>
+    <li><!--TMPL_VAR Name="fwkname"--><!--TMPL_IF Name="error"--><br /><span class="error"><!--TMPL_VAR Name="error"--></span><!--/TMPL_IF--> </li>
   <!--/TMPL_LOOP-->
   </ul>
   </p>
   <!--/TMPL_LOOP-->
-  <p>Installation complete.<br/>
+  <p>Installation complete.<br />
     <p>Click on Finish to complete and load the Koha Staff Interface.
     <form name="finish">
     <input type="hidden" name="step" value="3" />
@@ -159,7 +159,7 @@ function Hide(link) {
         </ul>
         <form action="install.pl">
         <input type="hidden" name="step" value="3" />
-        <p> Click Next to continue <input value="Next &gt;&gt;" type="submit"></p>
+  <p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
         </form>
     <!-- /TMPL_IF -->
 <!--/TMPL_IF-->
@@ -169,8 +169,8 @@ function Hide(link) {
   <p>Now we're ready to create the database tables and fill them with some default data.</p>
   <form action="install.pl">
   <input type="hidden" name="step" value="3" />
-  <input type="hidden" name="op" value="importdatastructure"/>
-  <p> Click Next to continue <input value="Next &gt;&gt;" type="submit"></p>
+  <input type="hidden" name="op" value="importdatastructure" />
+  <p> Click Next to continue <input value="Next &gt;&gt;" type="submit" /></p>
   </form>
 <!--/TMPL_IF-->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
index 0fea0072b3..46e46eef49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
@@ -16,48 +16,51 @@
 <h3>Template Settings</h3>
 <table>
 
-Template Code: <input type="text"  size="40" name="tmpl_code"><br>
-Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc" ></TEXTAREA><br>
+Template Code: <input type="text"  size="40" name="tmpl_code" /><br />
+Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc" ></textarea><br />
 
 <tr>
-        <td>Page Width:</td><td><input type="text"  size="4" name="page_width"></td>
-        <td>Page Height:</td><td><input type="text" size="4" name="page_height"></td>
+        <td>Page Width:</td><td><input type="text"  size="2" name="page_width" /></td>
+        <td>Page Height:</td><td><input type="text" size="2" name="page_height" /></td>
 </tr>
 <tr>
-        <td>Label Width:</td><td><input type="text"  size="4" name="label_width"></td>
-        <td>Label Height:</td><td><input type="text" size="4" name="label_height"></td>
+        <td>Label Width:</td><td><input type="text"  size="2" name="label_width" /></td>
+        <td>Label Height:</td><td><input type="text" size="2" name="label_height" /></td>
 </tr>
 <tr>
-        <td>Top Page Margin:</td><td><input type="text" size="4" name="topmargin"></td>
-        <td>Left Page Margin:</td><td><input type="text" size="4" name="leftmargin"></td>
+        <td>Top Page Margin:</td><td><input type="text" size="2" name="topmargin" /></td>
+        <td>Left Page Margin:</td><td><input type="text" size="2" name="leftmargin" /></td>
 </tr>
 <tr>
-        <td>Number of Columns:</td><td><input type="text" size="4" name="cols"></td>
-        <td>Number of Rows:</td><td><input type="text" size="4" name="rows"></td>
+        <td>Number of Columns:</td><td><input type="text" size="2" name="cols" /></td>
+        <td>Number of Rows:</td><td><input type="text" size="2" name="rows" /></td>
 </tr>
 <tr>
-        <td>Gap between Columns:</td><td><input type="text" size="4" name="colgap"></td>
-        <td>Gap between Rows:</td><td><input type="text" size="4" name="rowgap"></td>
+        <td>Gap between Columns:</td><td><input type="text" size="2" name="colgap" /></td>
+        <td>Gap between Rows:</td><td><input type="text" size="2" name="rowgap" /></td>
 </tr>
 </table>
 
 
-<br>
+<br />
 Units: <select name="units">
     <!-- TMPL_LOOP NAME="units" -->
         <option value="<!-- TMPL_VAR NAME="unit" -->"><!-- TMPL_VAR NAME="desc" --></option>
     <!-- /TMPL_LOOP -->
 </select>
 
-<br>
-<br>
-Font Size: <input type="textbox" name="fontsize"  SIZE="2"  
-		value="">
-<br>
-<br>
-        <input type="submit" value="Create Template">
-        <input type="reset" value="Reset">
-  <input type="hidden" name=op value="create">
+<br />
+<br />
+Font Size: <input type="textbox" name="fontsize"  size="1" value="" />
+<br />
+<br />
+Active: <input type="checkbox" name="active" />
+
+        <input type="hidden" name="op" value="create" />
+<br />
+<br />
+        <input type="submit" value="Save" />
+        <input type="reset" value="Reset" />
 </form>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
index c955f22344..f4f886d6d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tmpl
@@ -15,29 +15,29 @@
 <h3>Template Settings</h3>
 <table>
 
-Template ID: <!-- TMPL_VAR NAME="tmpl_id" --> <br>
-Template Code: <input type="text"  size="40" name="tmpl_code" value="<!-- TMPL_VAR NAME="tmpl_code" -->"><br>
-Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc" ><!-- TMPL_VAR NAME="tmpl_desc" --></TEXTAREA><br>
+Template ID: <!-- TMPL_VAR NAME="tmpl_id" --> <br />
+Template Code: <input type="text"  size="40" name="tmpl_code" value="<!-- TMPL_VAR NAME="tmpl_code" -->" /><br />
+Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc"><!-- TMPL_VAR NAME="tmpl_desc" --></textarea><br />
 
 <tr>
-        <td>Page Width:</td><td><input type="text"  size="4" name="page_width"  value="<!-- TMPL_VAR NAME="page_width" -->"></td>
-        <td>Page Height:</td><td><input type="text" size="4" name="page_height"  value="<!-- TMPL_VAR NAME="page_height" -->"></td>
+        <td>Page Width:</td><td><input type="text"  size="4" name="page_width"  value="<!-- TMPL_VAR NAME="page_width" -->" /></td>
+        <td>Page Height:</td><td><input type="text" size="4" name="page_height"  value="<!-- TMPL_VAR NAME="page_height" -->" /></td>
 </tr>
 <tr>
-        <td>Label Width:</td><td><input type="text"  size="4" name="label_width"  value="<!-- TMPL_VAR NAME="label_width" -->"></td>
-        <td>Label Height:</td><td><input type="text" size="4" name="label_height"  value="<!-- TMPL_VAR NAME="label_height" -->"></td>
+        <td>Label Width:</td><td><input type="text"  size="4" name="label_width"  value="<!-- TMPL_VAR NAME="label_width" -->" /></td>
+        <td>Label Height:</td><td><input type="text" size="4" name="label_height"  value="<!-- TMPL_VAR NAME="label_height" -->" /></td>
 </tr>
 <tr>
-        <td>Top Page Margin:</td><td><input type="text" size="4" name="topmargin"  value="<!-- TMPL_VAR NAME="topmargin" -->"></td>
-        <td>Left Page Margin:</td><td><input type="text" size="4" name="leftmargin"  value="<!-- TMPL_VAR NAME="leftmargin" -->"></td>
+        <td>Top Page Margin:</td><td><input type="text" size="4" name="topmargin"  value="<!-- TMPL_VAR NAME="topmargin" -->" /></td>
+        <td>Left Page Margin:</td><td><input type="text" size="4" name="leftmargin"  value="<!-- TMPL_VAR NAME="leftmargin" -->" /></td>
 </tr>
 <tr>
-        <td>Number of Columns:</td><td><input type="text" size="4" name="cols"  value="<!-- TMPL_VAR NAME="cols" -->"></td>
-        <td>Number of Rows:</td><td><input type="text" size="4" name="rows"  value="<!-- TMPL_VAR NAME="rows" -->"></td>
+        <td>Number of Columns:</td><td><input type="text" size="4" name="cols"  value="<!-- TMPL_VAR NAME="cols" -->" /></td>
+        <td>Number of Rows:</td><td><input type="text" size="4" name="rows"  value="<!-- TMPL_VAR NAME="rows" -->" /></td>
 </tr>
 <tr>
-        <td>Gap between Columns:</td><td><input type="text" size="4" name="colgap"  value="<!-- TMPL_VAR NAME="colgap" -->"></td>
-        <td>Gap between Rows:</td><td><input type="text" size="4" name="rowgap"  value="<!-- TMPL_VAR NAME="rowgap" -->"></td>
+        <td>Gap between Columns:</td><td><input type="text" size="4" name="colgap"  value="<!-- TMPL_VAR NAME="colgap" -->" /></td>
+        <td>Gap between Rows:</td><td><input type="text" size="4" name="rowgap"  value="<!-- TMPL_VAR NAME="rowgap" -->" /></td>
 
 
 
@@ -46,24 +46,32 @@ Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_d
 
 Units: <select name="units">
     <!-- TMPL_LOOP NAME="units" -->
-        <option value="<!-- TMPL_VAR NAME="unit" -->"
-            <!-- TMPL_IF NAME="selected" --> selected  <!-- /TMPL_IF -->
-        ><!-- TMPL_VAR NAME="desc" --></option>
+        <!-- TMPL_IF NAME="selected" -->
+            <option value="<!-- TMPL_VAR NAME="unit" -->" selected="selected">
+        <!-- TMPL_ELSE -->
+            <option value="<!-- TMPL_VAR NAME="unit" -->">
+        <!-- /TMPL_IF --><!-- TMPL_VAR NAME="desc" --></option>
     <!-- /TMPL_LOOP -->
 </select>
 
-<br>
-<br>
-Font Size: <input type="textbox" name="fontsize"  SIZE="1"
-        value="<!-- TMPL_VAR NAME="fontsize" -->">
-<br>
-<br>
-
-
-        <input type="submit" value="Save">
-        <input type="reset" value="Reset">
-        <input type="hidden" value="<!-- TMPL_VAR NAME="tmpl_id" -->" name="tmpl_id"
-
+<br />
+<br />
+Font Size: <input type="textbox" name="fontsize"  size="1" value="<!-- TMPL_VAR NAME="fontsize" -->" />
+<br />
+<br />
+
+
+Active: 
+<!-- TMPL_IF NAME="active" -->
+<input type="checkbox" name="active" checked="checked" />
+<!-- TMPL_ELSE -->
+<input type="checkbox" name="active" />
+<!-- /TMPL_IF -->
+        <input type="hidden" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->" />
+<p>
+<p>
+        <input type="submit" value="Save" />
+        <input type="reset" value="Reset" />
 </p>
 </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl
index 5a4ae79545..9f157cff1a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tmpl
@@ -119,9 +119,9 @@ table.print-preview {
 <body>
 
 <div class="noprint">
-        <h3 class="bull">Print Preview<br>
-        Barcodetype:<!-- TMPL_VAR NAME="barcodetype_opt" --><br>
-        Papertype:<!-- TMPL_VAR NAME="papertype_opt" --><br>
+        <h3 class="bull">Print Preview<br />
+        Barcodetype:<!-- TMPL_VAR NAME="barcodetype_opt" --><br />
+        Papertype:<!-- TMPL_VAR NAME="papertype_opt" --><br />
         Field Options: <!-- TMPL_IF NAME="author_opt" -->Author <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="itemtype_opt" -->itemtype <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="title_opt" -->title <!-- /TMPL_IF -->
@@ -154,7 +154,7 @@ table.print-preview {
         <td class="circ-label-8511">
                 <img src="/intranet-tmpl/barcodes/<!-- TMPL_VAR NAME="barcodetype_opt" -->-<!-- TMPL_VAR NAME="barcode" -->.png">
  <!-- TMPL_IF NAME="barcodeerror" -->
-                <div class="noprint">'<!-- TMPL_VAR NAME="barcode" -->'<br>
+                <div class="noprint">'<!-- TMPL_VAR NAME="barcode" -->'<br />
         not '<!-- TMPL_VAR NAME="barcodetype_opt" -->' format.</div>
         <!-- /TMPL_IF -->
         </td>
@@ -162,7 +162,7 @@ table.print-preview {
         <td class="circ-label-8511">
                 <img src="/intranet-tmpl/barcodes/<!-- TMPL_VAR NAME="barcodetype_opt" -->-<!-- TMPL_VAR NAME="barcode" -->.png">
         <!-- TMPL_IF NAME="barcodeerror" -->
-                <div class="noprint">'<!-- TMPL_VAR NAME="barcode" -->'<br>
+                <div class="noprint">'<!-- TMPL_VAR NAME="barcode" -->'<br />
         not '<!-- TMPL_VAR NAME="barcodetype_opt" -->' format.</div>
         <!-- /TMPL_IF -->
         </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl
index 873d1e3ef3..e19876d118 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl
@@ -2,47 +2,47 @@
 <title>Koha &rsaquo; Catalog Maintenance</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<!-- TMPL_IF NAME=allsub-p -->
+<!-- TMPL_IF NAME="allsub-p" -->
 <table>
 <caption>Results</caption>
 <!-- TMPL_LOOP NAME="loop" -->
-<tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
+<tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" ESCAPE="URL" -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME="sub2" ESCAPE="URL" -->');window1.focus()"><!-- TMPL_VAR NAME="subject" ESCAPE="HTML" --></a></td></tr>
 <!-- /TMPL_LOOP -->
 </table>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME=modsub-p -->
+<!-- TMPL_IF NAME="modsub-p" -->
 <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
 This will change the subject headings on <strong>all</strong> the records this subject is applied to.
 <table>
 <caption>Subject Heading Global Update</caption>
-<tr><th scope="row"><label for="sub">Subject:</label></th><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
-<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
+<tr><th scope="row"><label for="sub">Subject:</label></th><td><input type="text" value="<!-- TMPL_VAR NAME="sub" ESCAPE="HTML" -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
+<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" ESCAPE="HTML" -->" /></td></tr>
 </table>
 <input type="submit" value="Modify" />
 </form>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME=upsub-p -->
-Successfully modified <!-- TMPL_VAR NAME="oldsub" escape=html -->
-is now <!-- TMPL_VAR NAME="sub" escape=html -->
+<!-- TMPL_IF NAME="upsub-p" -->
+Successfully modified <!-- TMPL_VAR NAME="oldsub" ESCAPE="HTML" -->
+is now <!-- TMPL_VAR NAME="sub" ESCAPE="HTML" -->
 <!-- <![ IGNORE [
-<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
+<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br />
 <a href=nowhere onclick="self.close()">Close this window</a>
 ]]> -->
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME=undel-p -->
+<!-- TMPL_IF NAME="undel-p" -->
 <table>
 <thead>
 <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
 <!-- TMPL_LOOP NAME="loop" -->
 <tr>
-<td><!-- TMPL_VAR NAME="title" escape=html --></td>
-<td><!-- TMPL_VAR NAME="author" escape=html --></td>
+<td><!-- TMPL_VAR NAME="title" ESCAPE="HTML" --></td>
+<td><!-- TMPL_VAR NAME="author" ESCAPE="HTML" --></td>
 <td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR NAME="undelete" escape="url" -->">Undelete</a></td>
 </tr>
 <!-- /TMPL_LOOP -->
@@ -50,31 +50,31 @@ is now <!-- TMPL_VAR NAME="sub" escape=html -->
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME=finun-p -->
+<!-- TMPL_IF NAME="finun-p" -->
 <h3>Succesfully undeleted</h3>
 <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME=fixitemtype-p -->
+<!-- TMPL_IF NAME="fixitemtype-p" -->
 <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
 <table>
-<tr><th scope="row"><label for="itemtype">Itemtype:</label></th><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
+<tr><th scope="row"><label for="itemtype">Itemtype:</label></th><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" ESCAPE="HTML">" />
 <input type="hidden" name="type" value="updatetype" />
-<input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
+<input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" ESCAPE="HTML">" /></td></tr>
 </table>
 <input type="submit" value="Change" />
 </form>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME=updatetype-p -->
+<!-- TMPL_IF NAME="updatetype-p" -->
 <h3>Updated successfully</h3>
 <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME=mainmenu-p -->
+<!-- TMPL_IF NAME="mainmenu-p" -->
 
 <h1>Catalog Maintenance</h1>
 <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
index c0fed54366..a6ca03072d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
@@ -11,38 +11,38 @@
 		<p>
 		
 			<label>Patron category</label>		
-			<input  type="text" name="description" size="20"  value="<!-- TMPL_VAR NAME="description" -->" >
+			<input  type="text" name="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
 		</p>
 		<p>
 			
 			<label>Organisation name</label>
-			<input  style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+			<input  style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
 		</p>
 		
 	<!-- TMPL_ELSE -->	
 
 		<p>
 			<label>Patron category</label>
-			<input  type="text" name="description" size="20"  value="<!-- TMPL_VAR NAME="description" -->" >
+			<input  type="text" name="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
 			</p>
 		<p>
 			<label>Title</label>
-			<input  type="text" name="title" size="20"  value="<!-- TMPL_VAR NAME="title" -->" >
+			<input  type="text" name="title" size="20" value="<!-- TMPL_VAR NAME="title" -->" />
 			
 		</p>
 		<p>
 			<label>Surname</label>
-			<input  style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+			<input  style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
 		</p>
 			
 		<p>	
 			
 			<label>Firstname</label>
-			<input  style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
+			<input  style="text-transform:capitalize;" type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
 		</p>
 		<p>
 			<label>Date of birth </label>
-			<input  type="text" name="dateofbirth" size="20"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+			<input  type="text" name="dateofbirth" size="20" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
 		</p>		
 		
 		
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
index 0f4bdac66d..0c25e0ad4f 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
@@ -3,12 +3,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <h1>Search for guarantor</h1>
 	<form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
-		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->"> Ordered by
+		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->" /> Ordered by
 		<select name="orderby">
 			<option value="surname,firstname">Surname</option>
 			<option value="cardnumber">Cardnumber</option>
 		</select>
-		<input type="submit" class="button" value="Search">
+		<input type="submit" class="button" value="Search" />
 	</form>
 </div>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
index 13f3662255..9f01757df4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
@@ -20,7 +20,7 @@
 <p>
 	<label>New UserID:</label>
 	<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
-	<input name="newuserid" size="20" value="<!-- TMPL_VAR NAME=userid -->" />
+	<input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
 </p>
 <p>
 	<label>New Password:</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl
index 9a237e7d05..54a55594b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl
@@ -35,7 +35,7 @@
      <td><form action="member-search-results.pl" method="get"><input type="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
       <td><!-- TMPL_VAR NAME="cardnumber" --></td>
       <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
-      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
+      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></td>
     </tr>
   <!-- /TMPL_LOOP -->
   </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index 47bfe42bf5..2e09debbbe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -70,7 +70,7 @@
     <!-- /TMPL_IF -->
     <td><!-- TMPL_VAR NAME="cardnumber" --></td>
     <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a>
-    <!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city -->
+    <!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" -->
     </td>
     <td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td>
     <td><!-- TMPL_VAR NAME="odissue" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl
index 05c43b55dd..17dd292041 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl
@@ -26,9 +26,9 @@
 				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->">Yes</a> 
 				&nbsp;&nbsp;&nbsp; No, it is not
 				<!-- TMPL_IF NAME="checked"-->
-					<input type="checkbox" checked name="answernodouble" >
+					<input type="checkbox" checked name="answernodouble" />
 				<!-- TMPL_ELSE -->
-					<input type="checkbox" name="answernodouble" >
+					<input type="checkbox" name="answernodouble" />
 				<!-- /TMPL_IF -->
 			</div>
 		</form>
@@ -56,44 +56,44 @@
 	<!-- TMPL_IF NAME="step_1"-->
 <form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
 <!-- 		field always hidden in different form (1,2,3) -->
-	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-	<input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
-	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-	<input type="hidden" name="type" value="borrowers">
-	<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-	<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-	<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+	<input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2" />
+	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+	<input type="hidden" name="type" value="borrowers" />
+	<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+	<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+	<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->" />
+	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
 	<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 	<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 	
 <!-- 	from form 2 -->
-	<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-	<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-	<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-	<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">	
-	<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
-	<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">	
-	<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-	<input type="hidden" name="B_address"  value="<!-- TMPL_VAR NAME="B_address" -->">
-	<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-	<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">	
-	<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
-	<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-	<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
-	<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 
-	<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
+	<input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
+	<input type="hidden" name="address" value="<!-- TMPL_VAR NAME="address" -->" />
+	<input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->" />
+	<input type="hidden" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" /> 	
+	<input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->" />
+	<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->" /> 	
+	<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+	<input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->" />
+	<input type="hidden" name="B_zipcode" value="<!-- TMPL_VAR NAME="B_zipcode" -->" />
+	<input type="hidden" name="B_city" value="<!-- TMPL_VAR NAME="B_city" -->" /> 	
+	<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" />
+	<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
+	<input type="hidden" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" />	
+	<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" /> 
+	<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" />
 	<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
 	
 <!-- 	from form 3	 -->
-	<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-	<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+	<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
+	<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
 	<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
 	<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-	<input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-	<input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
+	<input type="hidden" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
+	<input type="hidden" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />	
 	<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
 	<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
 	<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
@@ -102,19 +102,19 @@
 	
 	<!-- / CHECKBOX from form 3 Warning -->
 	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
+		<input type="hidden" name="op" value="add" />
 	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
+		<input type="hidden" name="op" value="modify" />
 	<!-- /TMPL_IF -->
 	<fieldset id="memberentry_identity">
 		<legend>Patron identity</legend>
 		<p>
 		<!-- TMPL_IF NAME="female" -->
-		<input type="radio" name="sex" value="F" checked>Female
-		<input type="radio" name="sex" value="M">Male
+		<input type="radio" name="sex" value="F" checked="checked" />Female
+		<input type="radio" name="sex" value="M" />Male
 		<!-- TMPL_ELSE -->
-		<input type="radio" name="sex" value="F">Female
-		<input type="radio" name="sex" value="M" checked>Male
+		<input type="radio" name="sex" value="F" />Female
+		<input type="radio" name="sex" value="M" checked="checked" />Male
 		<!-- /TMPL_IF -->
 		</p>
 		<!-- TMPL_IF NAME="mandatorycardnumber" -->
@@ -123,7 +123,7 @@
 			<label>
 		<!-- /TMPL_IF--> 
 		Card number</label>
-		<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
+		<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
 		<p>
 		<!-- TMPL_IF NAME="mandatorytitle" -->
 			<label style="font-weight:bold">
@@ -142,9 +142,9 @@
 		<!-- /TMPL_IF-->
 		Surname</label>
 		<!-- TMPL_IF NAME="uppercasesurnames" -->
-		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<input style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
 		<!-- TMPL_ELSE -->
-		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
 		<!-- /TMPL_IF -->
 		</p>
 		<p>
@@ -154,7 +154,7 @@
 		<label>
 		<!-- /TMPL_IF-->
 		Firstname</label>
-		<input style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
+		<input style="text-transform:capitalize;" type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorydateofbirth" -->
@@ -163,8 +163,8 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Date of birth</label>
-			<input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-            <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="dateofbirth_button" />
+			<input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+            <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="dateofbirth_button" alt="" />
       <script language="JavaScript" type="text/javascript">
         Calendar.setup(
           {
@@ -182,7 +182,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Initials</label>
-			<input type="text" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">	
+			<input type="text" name="initials" size="20" value="<!-- TMPL_VAR NAME="initials" -->" />	
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryothernames" -->
@@ -191,7 +191,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Other name</label>
-			<input style="text-transform:uppercase;" type="text" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
+			<input style="text-transform:uppercase;" type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" />
 		</p>
 	</fieldset>
 	<fieldset id="memberentry_identity">
@@ -226,7 +226,7 @@
 			<!--TMPL_IF NAME="CGIsort1" -->	
 				<!-- TMPL_VAR NAME="CGIsort1" -->
 			<!--TMPL_ELSE-->
-				<input  type="text" name="sort1" size="20"  value="<!-- TMPL_VAR NAME="sort1" -->" >
+				<input  type="text" name="sort1" size="20" value="<!-- TMPL_VAR NAME="sort1" -->" />
 			<!-- /TMPL_IF -->		
 		</p>
 		<p>
@@ -239,12 +239,12 @@
 		<!--TMPL_IF NAME="CGIsort2" -->	
 			<!-- TMPL_VAR NAME="CGIsort2" -->
 		<!--TMPL_ELSE-->
-			<input  type="text" name="sort2" size="20"  value="<!-- TMPL_VAR NAME="sort2" -->" >
+			<input  type="text" name="sort2" size="20" value="<!-- TMPL_VAR NAME="sort2" -->"/ >
 		<!-- /TMPL_IF -->	
 		</p>
 	</fieldset>
 	<div>
-		<input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);">
+		<input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);" />
 	</div>
 </form>
 <!-- ************************ STEP_1 *********************** -->
@@ -253,46 +253,46 @@
 <!-- TMPL_IF NAME="step_2"-->
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 	<!-- 		field always hidden in different form (1,2,3) -->
-	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-	<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|B_address|B_zipcode|B_city|phone|phonepro|mobile|email|emailpro|fax">
-	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-	<input type="hidden" name="type" value="borrowers">
-	<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-	<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-	<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+	<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|B_address|B_zipcode|B_city|phone|phonepro|mobile|email|emailpro|fax" />
+	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+	<input type="hidden" name="type" value="borrowers" />
+	<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+	<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+	<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->" />
+	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
 	<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 	<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
 	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
 <!-- 	from form 1	 -->
-	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
-	<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
-	<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
-	<input type="hidden" name="cardnumber"  value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	<input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-	<input type="hidden" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">
-	<input type="hidden" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-	<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-	<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" >	
-	<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-	<input type="hidden" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" >
-	<input type="hidden" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" >
+	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+	<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
+	<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
+	<input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+	<input type="hidden" name="dateofbirth" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+	<input type="hidden" name="initials" size="20" value="<!-- TMPL_VAR NAME="initials" -->" />
+	<input type="hidden" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" />
+	<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" />
+	<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" />	
+	<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->" />
+	<input type="hidden" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
+	<input type="hidden" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
 	<!-- 	from form 3	 -->
-	<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-	<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+	<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
+	<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
 	<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
 	<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-	<input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-	<input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
+	<input type="hidden" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
+	<input type="hidden" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />	
 	<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
 	<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
 	<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />	
 	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
+		<input type="hidden" name="op" value="add" />
 	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
+		<input type="hidden" name="op" value="modify" />
 	<!-- /TMPL_IF -->
 	<fieldset id="memberentry_address">
 		<legend>Address</legend>
@@ -314,7 +314,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Street number</label>
-			<input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
+			<input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
 		</p>
 		<!-- TMPL_IF NAME="road_cgipopup" -->
 			<p>
@@ -334,7 +334,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Address</label>
-			<input type="text" name="address" size="35" value="<!-- TMPL_VAR NAME="address" -->">
+			<input type="text" name="address" size="35" value="<!-- TMPL_VAR NAME="address" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryaddress2" -->
@@ -343,7 +343,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Address 2</label>
-			<input type="text" name="address2" size="35" value="<!-- TMPL_VAR NAME="address2" -->">
+			<input type="text" name="address2" size="35" value="<!-- TMPL_VAR NAME="address2" -->" />
 		</p>
 		<p>	
 			<!-- TMPL_IF NAME="mandatoryzipcode" -->
@@ -352,7 +352,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Zipcode</label>
-			<input type="text" maxlength="5" name="zipcode" size="5" value="<!-- TMPL_VAR NAME="zipcode" -->">
+			<input type="text" maxlength="5" name="zipcode" size="5" value="<!-- TMPL_VAR NAME="zipcode" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycity" -->
@@ -361,7 +361,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			City</label>
-			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
+			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->" />
 		</p>
 		</fieldset>
 		<fieldset>
@@ -373,7 +373,7 @@
 					<label>
 				<!-- /TMPL_IF-->
 				Address</label>
-				<input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->">
+				<input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->" />
 			</p>
 			<p>
 				<!-- TMPL_IF NAME="mandatoryB_zipcode" -->
@@ -382,7 +382,7 @@
 					<label>
 				<!-- /TMPL_IF-->
 				Zipcode</label>
-				<input type="text" name="B_zipcode" maxlength="5" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
+				<input type="text" name="B_zipcode" maxlength="5" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->" />
 			</p>
 			<p>
 				<!-- TMPL_IF NAME="mandatoryB_city" -->
@@ -391,7 +391,7 @@
 					<label>
 				<!-- /TMPL_IF-->
 				City</label>
-				<input type="text" style="text-transform:uppercase;" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->">
+				<input type="text" style="text-transform:uppercase;" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->" />
 			</p>
 		</fieldset>
 	</fieldset>
@@ -404,7 +404,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Phone (home)</label>
-			<input type="text"  name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
+			<input type="text"  name="phone" value="<!-- TMPL_VAR NAME="phone" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryphonepro" -->
@@ -413,7 +413,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Phone (prof)</label>
-			<input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
+			<input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorymobile" -->
@@ -422,7 +422,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Phone (cell)</label>
-			<input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" >
+			<input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryemail" -->
@@ -431,7 +431,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			E-mail (home)</label>
-			<input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" >	
+			<input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" />	
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryemailpro" -->	
@@ -440,7 +440,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			E-mail (prof)</label>
-			<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
+			<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryfax" -->
@@ -449,7 +449,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Fax</label>
-			<input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >
+			<input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" />
 		</p>
 	</fieldset>
 	<!-- TMPL_IF NAME="memberofinstution" -->
@@ -468,8 +468,8 @@
 	<!-- /TMPL_IF -->
 
 	<div>
-		<input type="button" class="borrowers_button" name="step1" value="Previous step" onclick="check_form_borrowers(0);">	
-		<INPUT type="button" class="borrowers_button" name="step3" onclick="check_form_borrowers(2)" value="Next step">
+		<input type="button" class="borrowers_button" name="step1" value="Previous step" onclick="check_form_borrowers(0);" />	
+		<input type="button" class="borrowers_button" name="step3" onclick="check_form_borrowers(2)" value="Next step" />
 	</div>
 </p>
 </form>
@@ -478,55 +478,55 @@
 <!-- TMPL_IF NAME="step_3"-->
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 	<!-- 		field always hidden in different form (1,2,3) -->
-	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-	<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
-	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-	<input type="hidden" name="type" value="borrowers">
-	<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-	<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-	<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+	<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password" />
+	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+	<input type="hidden" name="type" value="borrowers" />
+	<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+	<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+	<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->" />
+	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
 	<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 	<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
 	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
 <!-- 	from form 1	 -->
-	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
-	<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
-	<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
-	<input type="hidden" name="cardnumber"  value="<!-- TMPL_VAR NAME="cardnumber" -->">
-	<input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-	<input type="hidden" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">
-	<input type="hidden" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-	<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-	<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" >	
-	<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-	<input type="hidden" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" >
-	<input type="hidden" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" >
+	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+	<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
+	<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
+	<input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+	<input type="hidden" name="dateofbirth" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+	<input type="hidden" name="initials" size="20" value="<!-- TMPL_VAR NAME="initials" -->" />
+	<input type="hidden" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" />
+	<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" />
+	<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" />	
+	<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->" />
+	<input type="hidden" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
+	<input type="hidden" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
 
 <!-- 	from form 2 -->
-	<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-	<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-	<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-	<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">	
-	<input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
-	<input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">	
-	<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-	<input type="hidden" name="B_address"  value="<!-- TMPL_VAR NAME="B_address" -->">
-	<input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-	<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">	
-	<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
-	<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-	<input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >	
-	<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 
-	<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-	<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-	<input type="hidden" name="organisations" value="<!-- TMPL_VAR NAME="organisations" -->" >	
+	<input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
+	<input type="hidden" name="address" value="<!-- TMPL_VAR NAME="address" -->" />
+	<input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->" />
+	<input type="hidden" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" />	
+	<input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->" />
+	<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->" />
+	<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+	<input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->" />
+	<input type="hidden" name="B_zipcode" value="<!-- TMPL_VAR NAME="B_zipcode" -->" />
+	<input type="hidden" name="B_city" value="<!-- TMPL_VAR NAME="B_city" -->" /> 	
+	<input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" />
+	<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
+	<input type="hidden" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" />	
+	<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" /> 
+	<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" />
+	<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
+	<input type="hidden" name="organisations" value="<!-- TMPL_VAR NAME="organisations" -->" />	
 	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
+		<input type="hidden" name="op" value="add" />
 	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
+		<input type="hidden" name="op" value="modify" />
 	<!-- /TMPL_IF -->
 	<fieldset id="memberentry_subscription">
 	<legend>Library set-up</legend>
@@ -537,7 +537,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+			<input type="text" name="dateenrolled"  maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -546,8 +546,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Expiry date</label>
-			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+			<input type="text" name="dateexpiry" maxlength="10"  size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryopacnote" -->
@@ -556,7 +555,7 @@
 				<label>
 			<!-- /TMPL_IF-->	
 			OPAC note</label>
-			<textarea  name="opacnote" cols="40" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
+			<textarea  name="opacnote" cols="40" rows="2"><!-- TMPL_VAR NAME="opacnote" --></textarea>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
@@ -565,7 +564,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Library note</label>
-			<textarea name="borrowernotes" cols="40" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+			<textarea name="borrowernotes" cols="40" rows="2"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
 		</p>
 	</fieldset>
 	<fieldset id="memberentry_userid">
@@ -577,7 +576,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			OPAC Login</label>
-			<input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
+			<input type="text" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorypassword" -->
@@ -587,12 +586,12 @@
 			<!-- /TMPL_IF-->
 			Password</label>
 			<!--TMPL_IF NAME="opadd"-->
-				<input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
+				<input type="text" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />
 			<!--TMPL_ELSE-->
 				<!--TMPL_IF NAME="password"-->
-					<input type="text" name="password" size="20"  value="****">
+					<input type="text" name="password" size="20" value="****" />
 				<!--TMPL_ELSE-->
-					<input type="text" name="password" size="20"  value="">
+					<input type="text" name="password" size="20" value="" />
 				<!--/TMPL_IF-->
 			<!--/TMPL_IF-->
 		</p>
@@ -602,19 +601,19 @@
 			<!-- TMPL_LOOP NAME="flagloop" -->
 			<p>
 				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
+				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" --> />Yes
+				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" --> />No
 			</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_UNLESS -->	
 		<p>
 		</fieldset>
 		<div>
-			<input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">	
+			<input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);" />	
 			<!-- TMPL_IF NAME="opadd" -->
-				<input type="button" name="step4" onclick="unique();" value="Add member">
+				<input type="button" name="step4" onclick="unique();" value="Add member" />
 			<!-- TMPL_ELSE -->
-				<input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
+				<input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member" />
 			<!--/TMPL_IF -->
 		</div>
 		</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl
index bb934ca8ac..5ea86714aa 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl
@@ -53,55 +53,55 @@
 <!-- TMPL_IF NAME="step_1"-->
 		<form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
 		<!-- 		field always hidden in different form (1,2,3) -->		
-			<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-			<input type="hidden" name="FormFieldList" value="cardnumber|title|surname|firstname|dateofbirth|initials|othernames|select_city|sort1|sort2">
-			<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-			<input type="hidden" name="type" value="borrowers">
-			<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-			<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-			<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-			<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+			<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+			<input type="hidden" name="FormFieldList" value="cardnumber|title|surname|firstname|dateofbirth|initials|othernames|select_city|sort1|sort2" />
+			<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+			<input type="hidden" name="type" value="borrowers" />
+			<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+			<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+			<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->" />
+			<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
 			<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 			<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-			<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
+			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+			<input type="hidden" name="nodouble" value="<!-- TMPL_VAR NAME="nodouble" -->" />
 	
 			<!-- 		input from form 2 -->
-			<input type="hidden" name="contacttitle" size="20" value="<!-- TMPL_VAR NAME="contacttitle" -->">
-			<input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->">
-			<input type="hidden" name="contactfirstname" value="<!-- TMPL_VAR NAME="contactfirstname" -->">		
-			<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
-			<input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->">
-			<input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->">
-			<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-			<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
-			<input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->">
-			<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->">
-			<input type="hidden" name="relationship" value="<!-- TMPL_VAR NAME="relationship" -->"> 
-			<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
-			<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-			<input type="hidden" name="mobile" size="10" value="<!-- TMPL_VAR NAME="mobile" -->" >	
-			<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-			<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-			<input type="hidden" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
-			<input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" >
-			<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
+			<input type="hidden" name="contacttitle" size="20" value="<!-- TMPL_VAR NAME="contacttitle" -->" />
+			<input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->" />
+			<input type="hidden" name="contactfirstname" value="<!-- TMPL_VAR NAME="contactfirstname" -->" />
+			<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+			<input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
+			<input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->" />
+			<input type="hidden" name="address" value="<!-- TMPL_VAR NAME="address" -->" />
+			<input type="hidden" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" />
+			<input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->" />
+			<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->" />
+			<input type="hidden" name="relationship" value="<!-- TMPL_VAR NAME="relationship" -->" /> 
+			<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" />
+			<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
+			<input type="hidden" name="mobile" size="10" value="<!-- TMPL_VAR NAME="mobile" -->" />	
+			<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" />
+			<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
+			<input type="hidden" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" />	
+			<input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" />
+			<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" />	
 
 			<!-- 		input from form3		 -->
-			<input type="hidden" name="dateenrolled" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-			<input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+			<input type="hidden" name="dateenrolled" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
+			<input type="hidden" name="dateexpiry" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
 			<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
 			<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-			<input type="hidden" name="userid"  value="<!-- TMPL_VAR NAME="userid" -->">
-			<input type="hidden" name="password"  value="<!-- TMPL_VAR NAME="password" -->">	
+			<input type="hidden" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
+			<input type="hidden" name="password" value="<!-- TMPL_VAR NAME="password" -->" />
 			<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
 			<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
 			<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />	
 
 	<!-- TMPL_IF NAME="opadd" -->
-		<input type="hidden" name="op" value="add">
+		<input type="hidden" name="op" value="add" />
 	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="modify">
+		<input type="hidden" name="op" value="modify" />
 	<!-- /TMPL_IF -->
 		<!-- TMPL_VAR NAME="member" -->
 			<p>
@@ -111,17 +111,17 @@
 				<label>
 				<!-- /TMPL_IF-->
 				Card number</label>
-				 <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
+				 <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
 			</p>	
 	<fieldset id="memberentry_identity">
 		<legend>Patron identity</legend>
 		<p>
 		<!-- TMPL_IF NAME="female" -->
-		<input type="radio" name="sex" value="F" checked>Female
-		<input type="radio" name="sex" value="M">Male
+		<input type="radio" name="sex" value="F" checked="checked" />Female
+		<input type="radio" name="sex" value="M" />Male
 		<!-- TMPL_ELSE -->
-		<input type="radio" name="sex" value="F">Female
-		<input type="radio" name="sex" value="M" checked>Male
+		<input type="radio" name="sex" value="F" />Female
+		<input type="radio" name="sex" value="M" checked="checked" />Male
 		<!-- /TMPL_IF -->
 		</p>
 		<p>
@@ -141,9 +141,9 @@
 		<!-- /TMPL_IF-->
 		Surname</label>
 		<! --TMPL_IF NAME="uppercasesurnames" -->                                
-		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<input style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
         <!-- TMPL_ELSE -->                       
-		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >   
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />   
         <!-- /TMPL_IF --> 
 		</p>
 		<p>
@@ -153,7 +153,7 @@
 		<label>
 		<!-- /TMPL_IF-->
 		Firstname</label>
-		<input style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
+		<input style="text-transform:capitalize;" type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorydateofbirth" -->
@@ -162,8 +162,8 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Date of birth</label>
-			<input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-            <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="dateofbirth_button" />
+			<input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="dateofbirth_button" alt="" />
             <script language="JavaScript" type="text/javascript">
             Calendar.setup(
             {
@@ -181,7 +181,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Initials</label>
-			<input type="text" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">	
+			<input type="text" name="initials" size="20" value="<!-- TMPL_VAR NAME="initials" -->" />	
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryothernames" -->
@@ -190,18 +190,18 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Other name</label>
-			<input style="text-transform:uppercase;" type="text" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
+			<input style="text-transform:uppercase;" type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" />
 		</p>
 	
 	<p>
-	<input name="guarantordelete" type="button" value="Delete Guarantor" onClick="javascript:document.form.guarantorid.value='';document.form.guarantorinfo.value='',document.form.guarantorsearch.value='Find guarantor';">
+	<input name="guarantordelete" type="button" value="Delete Guarantor" onclick="document.form.guarantorid.value='';document.form.guarantorinfo.value='',document.form.guarantorsearch.value='Find guarantor';" />
 	<!-- TMPL_IF NAME="guarantorid"-->	
 		
-		<input name="guarantorsearch" type="button" value="Modify Guarantor" onClick="javascript:Dopopguarantor('guarantor_search.pl');">
+		<input name="guarantorsearch" type="button" value="Modify Guarantor" onclick="Dopopguarantor('guarantor_search.pl');" />
 	<!-- TMPL_ELSE -->
-		<input name="guarantorsearch" type="button" value="Find guarantor" onClick="javascript:Dopopguarantor('guarantor_search.pl');">
+		<input name="guarantorsearch" type="button" value="Find guarantor" onclick="Dopopguarantor('guarantor_search.pl');" />
 	<!-- /TMPL_IF -->
-	<input name="guarantorinfo" type="text"  size="20"  value="<!-- TMPL_VAR NAME="guarantorinfo" -->" disabled readOnly >
+	<input name="guarantorinfo" type="text"  size="20" value="<!-- TMPL_VAR NAME="guarantorinfo" -->" disabled="disabled" readonly="readonly" />
 	</p>
 	</fieldset>
 	<fieldset id="memberentry_identity">
@@ -237,7 +237,7 @@
 			<!--TMPL_IF NAME="CGIsort1" -->	
 				<!-- TMPL_VAR NAME="CGIsort1" -->
 			<!--TMPL_ELSE-->
-				<input  type="text" name="sort1" size="20"  value="<!-- TMPL_VAR NAME="sort1" -->" >
+				<input  type="text" name="sort1" size="20" value="<!-- TMPL_VAR NAME="sort1" -->" />
 			<!-- /TMPL_IF -->		
 		</p>
 		<p>
@@ -250,12 +250,12 @@
 		<!--TMPL_IF NAME="CGIsort2" -->	
 			<!-- TMPL_VAR NAME="CGIsort2" -->
 		<!--TMPL_ELSE-->
-			<input  type="text" name="sort2" size="20"  value="<!-- TMPL_VAR NAME="sort2" -->" >
+			<input  type="text" name="sort2" size="20" value="<!-- TMPL_VAR NAME="sort2" -->" />
 		<!-- /TMPL_IF -->	
 		</p>
 	</fieldset>
 	<div>
-		<input type="button" name="next_step" value="Next Step" onclick="if(document.form.guarantorinfo.value){check_form_borrowers(1)} else{alert(_('You must define a guarantor'));};">
+		<input type="button" name="next_step" value="Next Step" onclick="if(document.form.guarantorinfo.value){check_form_borrowers(1)} else{alert(_('You must define a guarantor'));};" />
 	</div>
 </form>
 <!-- ************************ STEP_1 *********************** -->
@@ -264,48 +264,48 @@
 <!-- TMPL_IF NAME="step_2"-->
 	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 <!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|contacttitle|city|contactname|contactfirstname|phone|phonepro|mobile|email|emailpro|B_email|B_phone|relationship|fax">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|contacttitle|city|contactname|contactfirstname|phone|phonepro|mobile|email|emailpro|B_email|B_phone|relationship|fax" />
+		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+		<input type="hidden" name="type" value="borrowers" />
+		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+		<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->" />
+		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
 		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"   value="<!-- TMPL_VAR NAME="nodouble" -->"/>
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+		<input type="hidden" name="nodouble"   value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
 <!-- 		input from form 1 		-->
-		<input type="hidden" name="title" size="10" value="<!-- TMPL_VAR NAME="title" -->">
-		<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
-		<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="dateofbirth" size="20"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		<input type="hidden" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">
-		<input type="hidden" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-		<input type="hidden" name="categorycode" size="10" value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">	
-		<input type="hidden" name="sort1"  value="<!-- TMPL_VAR NAME="sort1" -->">
-		<input type="hidden" name="sort2"  value="<!-- TMPL_VAR NAME="sort2" -->">
-		<input name="guarantorinfo" type="hidden"  size="20"  value="<!-- TMPL_VAR NAME="guarantorinfo" -->" readOnly >
+		<input type="hidden" name="title" size="10" value="<!-- TMPL_VAR NAME="title" -->" />
+		<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
+		<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
+		<input type="hidden" name="dateofbirth" size="20" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+		<input type="hidden" name="initials" size="20" value="<!-- TMPL_VAR NAME="initials" -->" />
+		<input type="hidden" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" />
+		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" />
+		<input type="hidden" name="categorycode" size="10" value="<!-- TMPL_VAR NAME="categorycode" -->" />
+		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->" />	
+		<input type="hidden" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
+		<input type="hidden" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
+		<input name="guarantorinfo" type="hidden"  size="20" value="<!-- TMPL_VAR NAME="guarantorinfo" -->" readonly="readonly" />
 
 <!-- 		input from form3		 -->
-		<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-		<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+		<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
+		<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
 		<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
 		<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-		<input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-		<input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
+		<input type="hidden" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
+		<input type="hidden" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />
 		<input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
 		<input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
 		<input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
 
 		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
+			<input type="hidden" name="op" value="add" />
 		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
+			<input type="hidden" name="op" value="modify" />
 		<!-- /TMPL_IF -->
 		
 		<!-- TMPL_VAR NAME="member" -->
@@ -316,7 +316,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Card number</label>
-			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
+			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
 		</p>
 		<fieldset>
 		<legend>Guarantor</legend>
@@ -341,7 +341,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Surname</label>	
-			<input type="text" style="text-transform:uppercase;" name="contactname" size="20" value="<!-- TMPL_VAR NAME="contactname" -->">
+			<input type="text" style="text-transform:uppercase;" name="contactname" size="20" value="<!-- TMPL_VAR NAME="contactname" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycontactfirstname" -->
@@ -350,7 +350,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Firstname</label>	
-			<input type="text" style="text-transform:capitalize;" name="contactfirstname" size="20" value="<!-- TMPL_VAR NAME="contactfirstname" -->">
+			<input type="text" style="text-transform:capitalize;" name="contactfirstname" size="20" value="<!-- TMPL_VAR NAME="contactfirstname" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorybranchcode" -->
@@ -368,7 +368,7 @@
 				<label>
 			<!-- /TMPL_IF-->	
 			Street number</label> 
-			<input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
+			<input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
 		</p>
 			<!-- TMPL_IF NAME="road_cgipopup" -->
 				<p>
@@ -388,7 +388,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Address</label> 
-			<input type="text" name="address" size="35" value="<!-- TMPL_VAR NAME="address" -->">
+			<input type="text" name="address" size="35" value="<!-- TMPL_VAR NAME="address" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryaddress2" -->	
@@ -397,7 +397,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Address 2</label>
-			<input type="text" name="address2" size="35" value="<!-- TMPL_VAR NAME="address2" -->">
+			<input type="text" name="address2" size="35" value="<!-- TMPL_VAR NAME="address2" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryzipcode" -->
@@ -406,7 +406,7 @@
 				<label>
 			<!-- /TMPL_IF-->	
 			Zipcode</label>
-			<input type="text" maxlength="5" name="zipcode" size="10" value="<!-- TMPL_VAR NAME="zipcode" -->">
+			<input type="text" maxlength="5" name="zipcode" size="10" value="<!-- TMPL_VAR NAME="zipcode" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycity" -->
@@ -415,7 +415,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			City</label>
-			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
+			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryrelationship" -->
@@ -441,7 +441,7 @@
 			<label>
 		<!-- /TMPL_IF-->
 		Phone (home)</label>
-		<input type="text" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
+		<input type="text" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" />
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatoryphonepro" -->
@@ -450,7 +450,7 @@
 			<label>
 		<!-- /TMPL_IF-->
 		Phone (prof)</label>
-		<input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
+		<input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatorymobile" -->
@@ -459,7 +459,7 @@
 			<label>
 		<!-- /TMPL_IF-->
 		Phone (cell)</label>
-		<input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" >
+		<input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" />
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatoryemail" -->
@@ -468,7 +468,7 @@
 			<label>
 		<!-- /TMPL_IF-->
 		E-mail (home)</label>
-		<input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" >	
+		<input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" />	
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatoryemailpro" -->
@@ -477,7 +477,7 @@
 			<label>
 		<!-- /TMPL_IF-->
 		E-mail (prof)</label>
-		<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >		
+		<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />		
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatoryfax" -->
@@ -486,7 +486,7 @@
 			<label>
 		<!-- /TMPL_IF-->
 		fax</label>
-		<input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
+		<input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" />	
 	</p>
 	<h2>Borrower</h2>
 	<p>	
@@ -496,19 +496,19 @@
 			<label>
 		<!-- /TMPL_IF-->
 		E-mail (home)</label>
-		<input type="text" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
+		<input type="text" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" />	
 		<!-- TMPL_IF NAME="mandatoryB_phone" -->
 			<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
 		Phone (cell)</label>	
-		<input type="text" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" >			
+		<input type="text" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" />			
 	</p>
 	</fieldset>
 	<div>
-		<input type="button" name="step1" value="Previous step" onclick="check_form_borrowers(0);">
-		<input type="button" name="step3" onclick="check_form_borrowers(3)" value="Next step">
+		<input type="button" name="step1" value="Previous step" onclick="check_form_borrowers(0);" />
+		<input type="button" name="step3" onclick="check_form_borrowers(3)" value="Next step" />
 	</div>
 </form>
 
@@ -516,57 +516,57 @@
 <!-- TMPL_IF NAME="step_3"-->
 	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 <!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
-		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-		<input type="hidden" name="type" value="borrowers">
-		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-		<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->">
-		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+		<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password" />
+		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+		<input type="hidden" name="type" value="borrowers" />
+		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+		<input type="hidden" name="guarantorid"   value="<!-- TMPL_VAR NAME="guarantorid" -->" />
+		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
 		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 		<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+		<input type="hidden" name="nodouble" value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
 <!-- 		input from form 1 		-->
-		<input type="hidden" name="title" size="10" value="<!-- TMPL_VAR NAME="title" -->">
-		<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
-		<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" >
-		<input type="hidden" name="dateofbirth" size="20"  value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-		<input type="hidden" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">
-		<input type="hidden" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
-		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" >
-		<input type="hidden" name="categorycode" size="10" value="<!-- TMPL_VAR NAME="categorycode" -->">
-		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">	
-		<input type="hidden" name="sort1"  value="<!-- TMPL_VAR NAME="sort1" -->">
-		<input type="hidden" name="sort2"  value="<!-- TMPL_VAR NAME="sort2" -->">
-		<input name="guarantorinfo" type="hidden"  size="20"  value="<!-- TMPL_VAR NAME="guarantorinfo" -->" readOnly >
+		<input type="hidden" name="title" size="10" value="<!-- TMPL_VAR NAME="title" -->" />
+		<input style="text-transform:capitalize;" type="hidden" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
+		<input style="text-transform:uppercase;" type="hidden" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
+		<input type="hidden" name="dateofbirth" size="20" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+		<input type="hidden" name="initials" size="20" value="<!-- TMPL_VAR NAME="initials" -->" />
+		<input type="hidden" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" />
+		<input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" />
+		<input type="hidden" name="categorycode" size="10" value="<!-- TMPL_VAR NAME="categorycode" -->" />
+		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->" />	
+		<input type="hidden" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
+		<input type="hidden" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
+		<input name="guarantorinfo" type="hidden"  size="20" value="<!-- TMPL_VAR NAME="guarantorinfo" -->" readonly="readonly" />
 <!-- 		input from form 2 -->
-		<input type="hidden" name="contacttitle" size="20" value="<!-- TMPL_VAR NAME="contacttitle" -->">
-		<input type="hidden" name="contactname" size="35" value="<!-- TMPL_VAR NAME="contactname" -->">
-		<input type="hidden" name="contactfirstname" size="5" value="<!-- TMPL_VAR NAME="contactfirstname" -->">		
-		<input type="hidden" name="branchcode" size="20" value="<!-- TMPL_VAR NAME="branchcode" -->">
-		<input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-		<input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-		<input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-		<input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
-		<input type="hidden" name="zipcode" size="20" value="<!-- TMPL_VAR NAME="zipcode" -->">
-		<input type="hidden" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
-		<input type="hidden" name="relationship" size="20" value="<!-- TMPL_VAR NAME="relationship" -->"> 
-		<input type="hidden" name="phone" size="10"  value="<!-- TMPL_VAR NAME="phone" -->" >
-		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-		<input type="hidden" name="mobile" size="10" value="<!-- TMPL_VAR NAME="mobile" -->" >	
-		<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<input type="hidden" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
-		<input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" >
-		<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
+		<input type="hidden" name="contacttitle" size="20" value="<!-- TMPL_VAR NAME="contacttitle" -->" />
+		<input type="hidden" name="contactname" size="35" value="<!-- TMPL_VAR NAME="contactname" -->" />
+		<input type="hidden" name="contactfirstname" size="5" value="<!-- TMPL_VAR NAME="contactfirstname" -->" />		
+		<input type="hidden" name="branchcode" size="20" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+		<input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
+		<input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->" />
+		<input type="hidden" name="address" value="<!-- TMPL_VAR NAME="address" -->" />
+		<input type="hidden" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" />
+		<input type="hidden" name="zipcode" size="20" value="<!-- TMPL_VAR NAME="zipcode" -->" />
+		<input type="hidden" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->" />
+		<input type="hidden" name="relationship" size="20" value="<!-- TMPL_VAR NAME="relationship" -->" /> 
+		<input type="hidden" name="phone" size="10" value="<!-- TMPL_VAR NAME="phone" -->" />
+		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
+		<input type="hidden" name="mobile" size="10" value="<!-- TMPL_VAR NAME="mobile" -->" />	
+		<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" />
+		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
+		<input type="hidden" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" />	
+		<input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" />
+		<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" />	
 		
 		<!-- TMPL_IF NAME="opadd" -->
-			<input type="hidden" name="op" value="add">
+			<input type="hidden" name="op" value="add" />
 		<!-- TMPL_ELSE -->
-			<input type="hidden" name="op" value="modify">
+			<input type="hidden" name="op" value="modify" />
 		<!-- /TMPL_IF -->
 		<p>
 			<!-- TMPL_IF NAME="mandatorycardnumber" -->
@@ -575,7 +575,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			 Card number</label>
-			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
+			<input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
 		</p>
 	<fieldset id="memberentry_subscription">
 	<legend>Library set-up</legend>
@@ -586,7 +586,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+			<input type="text" name="dateenrolled"  maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -595,8 +595,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Expiry date</label>
-			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+			<input type="text" name="dateexpiry" maxlength="10"  size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryopacnote" -->
@@ -605,7 +604,7 @@
 				<label>
 			<!-- /TMPL_IF-->	
 			OPAC note</label>
-			<textarea  name="opacnote" cols="40" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
+			<textarea  name="opacnote" cols="40" rows="2"><!-- TMPL_VAR NAME="opacnote" --></textarea>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
@@ -614,7 +613,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Library note</label>
-			<textarea name="borrowernotes" cols="40" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+			<textarea name="borrowernotes" cols="40" rows="2"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
 		</p>
 	</fieldset>
 	<fieldset id="memberentry_userid">
@@ -626,7 +625,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			OPAC Login</label>
-			<input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
+			<input type="text" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorypassword" -->
@@ -636,12 +635,12 @@
 			<!-- /TMPL_IF-->
 			Password</label>
 			<!--TMPL_IF NAME="opadd"-->
-				<input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
+				<input type="text" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />
 			<!--TMPL_ELSE-->
 				<!--TMPL_IF NAME="password"-->
-					<input type="text" name="password" size="20"  value="****">
+					<input type="text" name="password" size="20" value="****" />
 				<!--TMPL_ELSE-->
-					<input type="text" name="password" size="20"  value="">
+					<input type="text" name="password" size="20" value="" />
 				<!--/TMPL_IF-->
 			<!--/TMPL_IF-->
 		</p>
@@ -651,19 +650,19 @@
 			<!-- TMPL_LOOP NAME="flagloop" -->
 			<p>
 				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
-				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
+				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" --> />Yes
+				<input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" --> />No
 			</p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_UNLESS -->	
 		<p>
 		</fieldset>
 		<div>
-			<input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">	
+			<input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);" />	
 			<!-- TMPL_IF NAME="opadd" -->
-				<input type="button" name="step4" onclick="unique();" value="Add member">
+				<input type="button" name="step4" onclick="unique();" value="Add member" />
 			<!-- TMPL_ELSE -->
-				<input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
+				<input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member" />
 			<!--/TMPL_IF -->
 		</div>
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl
index 888de62368..8a06f36079 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl
@@ -26,7 +26,7 @@
                             Duplicate ?	
                             <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->" class="borrowers_button">Yes</a> 
                             &nbsp;&nbsp;&nbsp; No, it is not
-                            <input type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" >
+                            <input type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" />
                         </div>
                     </form>
                         </p>
@@ -48,46 +48,46 @@
 <!-- TMPL_IF NAME="step_1"-->
 <form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
         <!-- field always hidden in different form (1,2,3) -->
-                <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-                <input type="hidden" name="FormFieldList" value="cardnumber|surname|contactname|contactfirstname|select_city">
-                <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-                <input type="hidden" name="type" value="borrowers">
-                <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-                <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-                <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-                <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+                <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+                <input type="hidden" name="FormFieldList" value="cardnumber|surname|contactname|contactfirstname|select_city" />
+                <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+                <input type="hidden" name="type" value="borrowers" />
+                <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+                <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+                <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->" />
+                <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
                 <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
                 <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-                <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+                <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
                 <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
 <!-- 		from form 2 -->
-                <input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-                <input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-                <input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-                <input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">	
-                <input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">	
-                <input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">
-                <input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-                <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-                <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
+                <input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
+                <input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->" />
+                <input type="hidden" name="address" value="<!-- TMPL_VAR NAME="address" -->" />
+                <input type="hidden" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" />	
+                <input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->" />	
+                <input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->" />
+                <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+                <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
+                <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
                 <textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
                 <input type="hidden" name="fax"   value="<!-- TMPL_VAR NAME="fax" -->" />
 
 <!-- 		from form 3	 -->
-                <input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-                <input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+                <input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
+                <input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
                 <textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
                 <textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-                <input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-                <input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
+                <input type="hidden" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
+                <input type="hidden" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />	
                 <input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
                 <input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
                 <input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
         <!-- TMPL_IF NAME="opadd" -->
-                <input type="hidden" name="op" value="add">
+                <input type="hidden" name="op" value="add" />
         <!-- TMPL_ELSE -->
-                <input type="hidden" name="op" value="modify">
+                <input type="hidden" name="op" value="modify" />
         <!-- /TMPL_IF -->
         <p>
                 <!-- TMPL_IF NAME="mandatorycardnumber" -->
@@ -96,7 +96,7 @@
                 <label>
                 <!-- /TMPL_IF-->
                 Card number</label>
-                        <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
+                        <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
         </p>	
         <fieldset id="memberentry_identity">
                 <legend>Organisation identity</legend>
@@ -107,7 +107,7 @@
                         <label>
                         <!-- /TMPL_IF-->
                         Organisation name</label>
-                        <input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >	
+                        <input style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />	
                 </p>
                 <p>
                     <!-- TMPL_IF NAME="catcodepopup" -->
@@ -138,7 +138,7 @@
                                 <label>
                         <!-- /TMPL_IF-->
                         Surname</label>
-                        <input style="text-transform:uppercase;" type="text" name="contactname" size="20"  value="<!-- TMPL_VAR NAME="contactname" -->" >
+                        <input style="text-transform:uppercase;" type="text" name="contactname" size="20" value="<!-- TMPL_VAR NAME="contactname" -->" />
                 </p>
                 <p>
                         <!-- TMPL_IF NAME="mandatorycontactfirstname" -->
@@ -147,11 +147,11 @@
                                 <label>
                         <!-- /TMPL_IF-->
                         Firstname</label>
-                        <input style="text-transform:capitalize;" type="text" name="contactfirstname" size="20"  value="<!-- TMPL_VAR NAME="contactfirstname" -->">
+                        <input style="text-transform:capitalize;" type="text" name="contactfirstname" size="20" value="<!-- TMPL_VAR NAME="contactfirstname" -->" />
                 </p>
         </fieldset>
                 <div>
-                        <input type="button" name="step2" value="Next step" onclick="check_form_borrowers('2');">
+                        <input type="button" name="step2" value="Next step" onclick="check_form_borrowers('2');" />
                 </div>
                 </p>
 
@@ -162,41 +162,41 @@
 <!-- TMPL_IF NAME="step_2"-->
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
                 <!-- 		field always hidden in different form (1,2,3) -->
-                <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-                <input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|phonepro|emailpro|fax|contactnote">
-                <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-                <input type="hidden" name="type" value="borrowers">
-                <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-                <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-                <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-                <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+                <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+                <input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|phonepro|emailpro|fax|contactnote" />
+                <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+                <input type="hidden" name="type" value="borrowers" />
+                <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+                <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+                <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->" />
+                <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
                 <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
                 <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-                <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+                <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
                 <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
 
 <!-- 		from form 1 -->
-                <input  type="hidden" name="surname" value="<!-- TMPL_VAR NAME="surname" -->" >
-                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
-                <input type="hidden" name="contactname" value="<!-- TMPL_VAR name="contactname" -->">
-                <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-                <input type="hidden" name="contactfirstname" value="<!-- TMPL_VAR name="contactfirstname" -->">
+                <input  type="hidden" name="surname" value="<!-- TMPL_VAR NAME="surname" -->" />
+                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" />
+                <input type="hidden" name="contactname" value="<!-- TMPL_VAR name="contactname" -->" />
+                <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->" />
+                <input type="hidden" name="contactfirstname" value="<!-- TMPL_VAR name="contactfirstname" -->" />
 
 <!-- 		from form 3	 -->
-                <input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-                <input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+                <input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
+                <input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
                 <textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
                 <textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-                <input type="hidden" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
-                <input type="hidden" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">	
+                <input type="hidden" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
+                <input type="hidden" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />	
                 <input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
                 <input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
                 <input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
                 <!-- TMPL_IF NAME="opadd" -->
-                        <input type="hidden" name="op" value="add">
+                        <input type="hidden" name="op" value="add" />
                 <!-- TMPL_ELSE -->
-                        <input type="hidden" name="op" value="modify">
+                        <input type="hidden" name="op" value="modify" />
                 <!-- /TMPL_IF -->
         
         
@@ -207,7 +207,7 @@
                 <label>
                 <!-- /TMPL_IF-->
                 Card number</label>
-                <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
+                <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
         </p>
         <fieldset is="memberentry_address">
                 <legend>Organisation address</legend>
@@ -218,7 +218,7 @@
                                 <label>
                         <!-- /TMPL_IF-->
                         Street number</label>
-                        <input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
+                        <input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
                 </p>
                 <!-- TMPL_IF NAME="road_cgipopup" -->
                         <p>
@@ -238,7 +238,7 @@
                                 <label>
                         <!-- /TMPL_IF-->	
                         Address</label>
-                        <input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->">
+                        <input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->" />
                 </p>
                 <p>
                         <!-- TMPL_IF NAME="mandatoryaddress2s" -->
@@ -247,7 +247,7 @@
                                 <label>
                         <!-- /TMPL_IF-->
                         Address 2</label>
-                        <input type="text" name="address2" size="33" value="<!-- TMPL_VAR NAME="address2" -->">
+                        <input type="text" name="address2" size="33" value="<!-- TMPL_VAR NAME="address2" -->" />
                 </p>
                 <p>
                         <!-- TMPL_IF NAME="mandatoryzipcode" -->
@@ -256,7 +256,7 @@
                                 <label>
                         <!-- /TMPL_IF-->
                         Zipcode</label>
-                        <input type="text" name="zipcode" size="10"  maxlength="10" value="<!-- TMPL_VAR NAME="zipcode" -->">
+                        <input type="text" name="zipcode" size="10"  maxlength="10" value="<!-- TMPL_VAR NAME="zipcode" -->" />
                 </p>
                 <p>
                         <!-- TMPL_IF NAME="mandatorycity" -->
@@ -265,7 +265,7 @@
                                 <label>
                         <!-- /TMPL_IF-->
                         City</label>
-                        <input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
+                        <input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->" />
                 </p>
                         <!-- TMPL_IF NAME="mandatorybranchcode" -->
                                 <label style="font-weight:bold">
@@ -282,7 +282,7 @@
                                 <label>
                         <!-- /TMPL_IF-->
                         Phone (prof)</label>
-                        <input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
+                        <input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
                 <p>
                 </p>
                         <!-- TMPL_IF NAME="mandatoryemailpro" -->
@@ -291,7 +291,7 @@
                                 <label>
                         <!-- /TMPL_IF-->	
                         E-mail (prof)</label>
-                        <input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
+                        <input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
                 </p>
                 <p>
                         <!-- TMPL_IF NAME="mandatoryefax" -->
@@ -300,7 +300,7 @@
                                 <label>
                         <!-- /TMPL_IF-->
                         Fax</label>		
-                        <input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" >	
+                        <input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" />	
                 </p>
         </fieldset>
         <fieldset>
@@ -316,8 +316,8 @@
                 </p>
         <fieldset>
         <div id="action">
-                <input type="button" name="step1" value="Previous step" onclick="check_form_borrowers(0);">
-                <input type="button" name="step3" onclick="check_form_borrowers('3')" value="Next step">
+                <input type="button" name="step1" value="Previous step" onclick="check_form_borrowers(0);" />
+                <input type="button" name="step3" onclick="check_form_borrowers('3')" value="Next step" />
         </div>
 </form>
 <!-- ############################END FORM PROFESSIONAL############################################"-->
@@ -326,41 +326,41 @@
 <!-- TMPL_IF NAME="step_3"-->
         <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
                 <!-- 		field always hidden in different form (1,2,3) -->
-                <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
-                <input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
-                <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-                <input type="hidden" name="type" value="borrowers">
-                <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-                <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-                <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-                <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+                <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+                <input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password" />
+                <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+                <input type="hidden" name="type" value="borrowers" />
+                <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+                <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+                <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->" />
+                <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
                 <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
                 <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-                <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-                <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
+                <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+                <input type="hidden" name="nodouble" value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
                 <!-- 		from form 1 -->
-                <input  type="hidden" name="surname" value="<!-- TMPL_VAR NAME="surname" -->" >
-                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
-                <input type="hidden" name="contactname" value="<!-- TMPL_VAR name="contactname" -->">
-                <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">
-                <input type="hidden" name="contactfirstname" value="<!-- TMPL_VAR name="contactfirstname" -->">
+                <input  type="hidden" name="surname" value="<!-- TMPL_VAR NAME="surname" -->" />
+                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" />
+                <input type="hidden" name="contactname" value="<!-- TMPL_VAR name="contactname" -->" />
+                <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->" />
+                <input type="hidden" name="contactfirstname" value="<!-- TMPL_VAR name="contactfirstname" -->" />
 
                 <!-- 		from form 2 -->
-                <input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-                <input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">
-                <input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-                <input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">	
-                <input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">	
-                <input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->">
-                <input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-                <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-                <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
+                <input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
+                <input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->" />
+                <input type="hidden" name="address" value="<!-- TMPL_VAR NAME="address" -->" />
+                <input type="hidden" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" />	
+                <input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->" />	
+                <input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->" />
+                <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+                <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
+                <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
                 <textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
-                <input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->">
+                <input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" />
                 
                 <!-- TMPL_IF NAME="opadd" -->
-                        <input type="hidden" name="op" value="add">
+                        <input type="hidden" name="op" value="add" />
                 <!-- TMPL_ELSE -->
                         <input type="hidden" name="op" value="modify">
                 <!-- /TMPL_IF -->
@@ -372,7 +372,7 @@
                 <label>
                 <!-- /TMPL_IF-->
                 Cardnumber</label>
-                <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
+                <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
         </p>
         <fieldset id="memberentry_subscription">
         <legend>Library set-up</legend>
@@ -384,7 +384,7 @@
                         <!-- /TMPL_IF-->
                         Arrival date</label>
                         <input type="text" id="dateenrolled" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-            <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="dateenrolled_button" />
+            <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="dateenrolled_button" alt="" />
             <script language="JavaScript" type="text/javascript">
                 Calendar.setup(
                 {
@@ -403,7 +403,7 @@
                         <!-- /TMPL_IF-->
                         Expiry date</label>
                         <input type="text" name="dateexpiry" maxlength="10"  size="10"
-                                                        onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+                                                        onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
                 </p>
                 <p>
                         <!-- TMPL_IF NAME="mandatoryopacnote" -->
@@ -412,7 +412,7 @@
                                 <label>
                         <!-- /TMPL_IF-->	
                         OPAC note</label>
-                        <textarea  name="opacnote" cols="40" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
+                        <textarea  name="opacnote" cols="40" rows="2"><!-- TMPL_VAR NAME="opacnote" --></textarea>
                 </p>
                 <p>
                         <!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
@@ -421,7 +421,7 @@
                                 <label>
                         <!-- /TMPL_IF-->
                         Library note</label>
-                        <textarea name="borrowernotes" cols="40" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+                        <textarea name="borrowernotes" cols="40" rows="2"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
                 </p>
         </fieldset>
         <fieldset id="memberentry_userid">
@@ -433,7 +433,7 @@
                         <label>
                         <!-- /TMPL_IF-->
                         OPAC Login</label>
-                        <input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
+                        <input type="text" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
                 </p>
                 <p>
                         <!-- TMPL_IF NAME="mandatorypassword" -->
@@ -443,12 +443,12 @@
                         <!-- /TMPL_IF-->
                         Password</label>
                         <!--TMPL_IF NAME="opadd"-->
-                                <input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
+                                <input type="text" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />
                         <!--TMPL_ELSE-->
                                 <!--TMPL_IF NAME="password"-->
-                                        <input type="text" name="password" size="20"  value="****">
+                                        <input type="text" name="password" size="20" value="****" />
                                 <!--TMPL_ELSE-->
-                                        <input type="text" name="password" size="20"  value="">
+                                        <input type="text" name="password" size="20" value="" />
                                 <!--/TMPL_IF-->
                         <!--/TMPL_IF-->
                 </p>
@@ -458,19 +458,19 @@
                         <!-- TMPL_LOOP NAME="flagloop" -->
                         <p>
                                 <label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
-                                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
-                                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
+                                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" --> />Yes
+                                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" --> />No
                         </p>
                         <!-- /TMPL_LOOP -->
                 <!-- /TMPL_UNLESS -->	
                 <p>
                 </fieldset>
                 <div>
-                        <input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">	
+                        <input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);" />	
                         <!-- TMPL_IF NAME="opadd" -->
-                                <input type="button" name="step4" onclick="unique();" value="Add member">
+                                <input type="button" name="step4" onclick="unique();" value="Add member" />
                         <!-- TMPL_ELSE -->
-                                <input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
+                                <input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member" />
                         <!--/TMPL_IF -->
                 </div>
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl
index b7930a5dd6..2623a2b5b2 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl
@@ -22,7 +22,11 @@
             Duplicate ? 
             <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->" class="borrowers_button">Yes</a> 
             &nbsp;&nbsp;&nbsp; No, it is not
-            <INPUT type="checkbox" <!-- TMPL_IF NAME="checked"--> checked <!--/TMPL_IF--> name="answernodouble" >
+			<!-- TMPL_IF NAME="checked"-->
+            <input type="checkbox" checked="checked" name="answernodouble" />
+			<!-- TMPL_ELSE -->
+            <input type="checkbox" name="answernodouble" />
+			<!--/TMPL_IF-->
         </div>
     </form> 
     </p>    
@@ -45,55 +49,55 @@
 <!-- TMPL_IF NAME="step_1"--><!--BEGIN OF TEST IF NOT collectivity BUT IN 1 STEP-->
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
         <!-- field always hidden in different form (1,2,3) -->
-        <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->"/>
-        <input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
-        <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
-        <input type="hidden" name="type" value="borrowers">
-        <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
-        <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
-        <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
-        <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
+        <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+        <input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2" />
+        <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+        <input type="hidden" name="type" value="borrowers" />
+        <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+        <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+        <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->" />
+        <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
         <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
-        <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" >
-        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-        <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
+        <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->"  />
+        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+        <input type="hidden" name="nodouble" value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
 <!-- from form 2 -->
-        <input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->">
-        <input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->">
-        <input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->">
-        <input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->">    
-        <input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->">
-        <input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->"> 
-        <input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
-        <input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" >
-        <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
-        <input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->" >   
-        <input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" >
-        <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-        <input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->">
-        <input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->">
-        <input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->">
-        <input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->">
-        <input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
-        <input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
-        <input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->">  
-        <textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
+        <input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
+        <input type="hidden" name="address" value="<!-- TMPL_VAR NAME="address" -->" />
+        <input type="hidden" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" />
+        <input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->" />    
+        <input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->" />
+        <input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->" /> 
+        <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+        <input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" />
+        <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
+        <input type="hidden" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" />   
+        <input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" />
+        <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
+        <input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->" />
+        <input type="hidden" name="relationship" value="<!-- TMPL_VAR NAME="relationship" -->" />
+        <input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->" />
+        <input type="hidden" name="B_zipcode" value="<!-- TMPL_VAR NAME="B_zipcode" -->" />
+        <input type="hidden" name="B_city" value="<!-- TMPL_VAR NAME="B_city" -->" />
+        <input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" /> 
+        <input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" /> 
+        <textarea style="display:none;" name="contactnote" cols="70" rows="3"><!-- TMPL_VAR NAME="contactnote" --></textarea>
 
 <!-- from form 3 -->
-        <input type="hidden" name="dateenrolled"  value="<!-- TMPL_VAR NAME="dateenrolled" -->">
-        <input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+        <input type="hidden" name="dateenrolled" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
+        <input type="hidden" name="dateexpiry" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
         <textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
         <textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-        <input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->">
-        <input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->">   
+        <input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->" />
+        <input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->" /> 
         <input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
         <input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
         <input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
     <!-- TMPL_IF NAME="opadd" -->
-        <input type="hidden" name="op" value="add">
+        <input type="hidden" name="op" value="add" />
     <!-- TMPL_ELSE -->
-        <input type="hidden" name="op" value="modify">
+        <input type="hidden" name="op" value="modify" />
     <!-- /TMPL_IF -->
     <!-- TMPL_VAR NAME="member" -->
     <p>
@@ -103,17 +107,17 @@
         <label>
         <!-- /TMPL_IF-->
         Cardnumber</label>
-            <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->">
+            <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
     </p>    
     <fieldset id="memberentry_identity">
         <legend>Patron identity</legend>
         <p>
         <!-- TMPL_IF NAME="female" -->
-        <input type="radio" name="sex" value="F" checked>Female
-        <input type="radio" name="sex" value="M">Male
+        <input type="radio" name="sex" value="F" checked="checked" />Female
+        <input type="radio" name="sex" value="M" />Male
         <!-- TMPL_ELSE -->
-        <input type="radio" name="sex" value="F">Female
-        <input type="radio" name="sex" value="M" checked>Male
+        <input type="radio" name="sex" value="F" />Female
+        <input type="radio" name="sex" value="M" checked="checked" />Male
         <!-- /TMPL_IF -->
         </p>
         <p>
@@ -133,9 +137,9 @@
         <!-- /TMPL_IF-->
         Surname</label>
 		<! --TMPL_IF NAME="uppercasesurnames" -->                                
-		<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >
+		<input style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
         <!-- TMPL_ELSE -->                       
-		<input style="text-transform:capitalize;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >   
+		<input style="text-transform:capitalize;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />   
         <!-- /TMPL_IF --> 
         </p>
         <p>
@@ -145,7 +149,7 @@
         <label>
         <!-- /TMPL_IF-->
         Firstname</label>
-        <input style="text-transform:capitalize;" type="text" name="firstname" size="20"  value="<!-- TMPL_VAR NAME="firstname" -->">
+        <input style="text-transform:capitalize;" type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatorydateofbirth" -->
@@ -154,8 +158,8 @@
             <label>
             <!-- /TMPL_IF-->
             Date of birth</label>
-            <input type="text" id="dateofbirth" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
-            <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="dateofbirth_button" />
+            <input type="text" id="dateofbirth" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+            <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="dateofbirth_button" alt="" />
             <script language="JavaScript" type="text/javascript">
                 Calendar.setup(
                 {
@@ -173,7 +177,7 @@
                 <label>
             <!-- /TMPL_IF-->
             Initials</label>
-            <input type="text" name="initials" size="20"  value="<!-- TMPL_VAR NAME="initials" -->">    
+            <input type="text" name="initials" size="20" value="<!-- TMPL_VAR NAME="initials" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryothernames" -->
@@ -182,7 +186,7 @@
             <label>
             <!-- /TMPL_IF-->
             Other name</label>
-            <input style="text-transform:uppercase;" type="text" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
+            <input style="text-transform:uppercase;" type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" />
         </p>
     </fieldset>
     <fieldset id="memberentry_identity">
@@ -218,7 +222,7 @@
             <!--TMPL_IF NAME="CGIsort1" --> 
                 <!-- TMPL_VAR NAME="CGIsort1" -->
             <!--TMPL_ELSE-->
-                <input type="text" name="sort1" size="20"  value="<!-- TMPL_VAR NAME="sort1" -->" >
+                <input type="text" name="sort1" size="20" value="<!-- TMPL_VAR NAME="sort1" -->" />
             <!-- /TMPL_IF -->       
         </p>
         <p>
@@ -231,12 +235,12 @@
         <!--TMPL_IF NAME="CGIsort2" --> 
             <!-- TMPL_VAR NAME="CGIsort2" -->
         <!--TMPL_ELSE-->
-            <input type="text" name="sort2" size="20"  value="<!-- TMPL_VAR NAME="sort2" -->" >
+            <input type="text" name="sort2" size="20" value="<!-- TMPL_VAR NAME="sort2" -->" />
         <!-- /TMPL_IF -->   
         </p>
     </fieldset>
     <div>
-        <input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);">
+        <input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);" />
     </div>
 </form>
 <!-- /TMPL_IF --><!--STEP_1 -->
@@ -247,48 +251,48 @@
     
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
         <!--        field always hidden in different form (1,2,3) -->
-        <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->"/>
-        <input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|contactname|phone|phonepro|mobile|email|emailpro|B_zipcode|B_phone|B_address|B_city|relationship|fax|contactnote"/>
-        <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->"/>
-        <input type="hidden" name="type" value="borrowers"/>
-        <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->"/>
-        <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->"/>
-        <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->"/>
-        <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->"/>
+        <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+        <input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|contactname|phone|phonepro|mobile|email|emailpro|B_zipcode|B_phone|B_address|B_city|relationship|fax|contactnote" />
+        <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+        <input type="hidden" name="type" value="borrowers" />
+        <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+        <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+        <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->" />
+        <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
         <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
         <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->"/>
+        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
         <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
     
 
 <!--        from form 1 -->
-        <input type="hidden" name="title"  value="<!-- TMPL_VAR NAME="title" -->"/>
-        <input type="hidden" name="surname"  value="<!-- TMPL_VAR NAME="surname" -->"/>
-        <input type="hidden" name="firstname"  value="<!-- TMPL_VAR NAME="firstname" -->"/>
-        <input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->"/>
-        <input type="hidden" name="initials"  value="<!-- TMPL_VAR NAME="initials" -->"/>
-        <input type="hidden" name="othernames"  value="<!-- TMPL_VAR NAME="othernames" -->"/>
-        <input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->"/>
-        <input type="hidden" name="categorycode"  value="<!-- TMPL_VAR NAME="categorycode" -->"/>
-        <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->"/>
-        <input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->"/>
-        <input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->"/>
+        <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+        <input type="hidden" name="surname" value="<!-- TMPL_VAR NAME="surname" -->" />
+        <input type="hidden" name="firstname" value="<!-- TMPL_VAR NAME="firstname" -->" />
+        <input type="hidden" name="dateofbirth" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+        <input type="hidden" name="initials" value="<!-- TMPL_VAR NAME="initials" -->" />
+        <input type="hidden" name="othernames" value="<!-- TMPL_VAR NAME="othernames" -->" />
+        <input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" />
+        <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" />
+        <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->" />
+        <input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->" />
+        <input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->" />
         
 <!--        from form 3 -->
-        <input type="hidden" name="dateenrolled"  value="<!-- TMPL_VAR NAME="dateenrolled" -->"/>
-        <input type="hidden" name="dateexpiry"  value="<!-- TMPL_VAR NAME="dateexpiry" -->"/>
+        <input type="hidden" name="dateenrolled" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
+        <input type="hidden" name="dateexpiry" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
         <textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
         <textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
-        <input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->"/>
-        <input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->"/>  
+        <input type="hidden" name="userid"   value="<!-- TMPL_VAR NAME="userid" -->" />
+        <input type="hidden" name="password"   value="<!-- TMPL_VAR NAME="password" -->" />  
         <input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
         <input type="hidden" name="lost"  value="<!-- TMPL_VAR NAME="lost" -->" />
         <input type="hidden" name="gonenoaddress"  value="<!-- TMPL_VAR NAME="gonenoaddress" -->" />
         
         <!-- TMPL_IF NAME="opadd" -->
-            <input type="hidden" name="op" value="add"/>
+            <input type="hidden" name="op" value="add" />
         <!-- TMPL_ELSE -->
-            <input type="hidden" name="op" value="modify"/>
+            <input type="hidden" name="op" value="modify" />
         <!-- /TMPL_IF -->
 
         <input type="hidden" name="debarred"  value="<!-- TMPL_VAR NAME="debarred" -->" />
@@ -300,7 +304,7 @@
         <label>
         <!-- /TMPL_IF-->
         Card number</label>
-        <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"/>
+        <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
     </p>
     <fieldset is="memberentry_address">
         <legend>Professional address</legend>
@@ -311,7 +315,7 @@
                 <label>
             <!-- /TMPL_IF-->    
             Street number</label>
-            <input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->">
+            <input type="text" name="streetnumber" size="5" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
         </p>
             <!-- TMPL_IF NAME="road_cgipopup" -->
                 <p>
@@ -331,7 +335,7 @@
                 <label>
             <!-- /TMPL_IF-->    
             Address</label>
-            <input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->">
+            <input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryaddress2s" -->
@@ -340,7 +344,7 @@
                 <label>
             <!-- /TMPL_IF-->
             Address 2</label>
-            <input type="text" name="address2" size="33" value="<!-- TMPL_VAR NAME="address2" -->">
+            <input type="text" name="address2" size="33" value="<!-- TMPL_VAR NAME="address2" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryzipcode" -->
@@ -349,7 +353,7 @@
                 <label>
             <!-- /TMPL_IF-->
                 Zipcode</label>
-            <input type="text" name="zipcode" size="10"  maxlength="10" value="<!-- TMPL_VAR NAME="zipcode" -->">
+            <input type="text" name="zipcode" size="10"  maxlength="10" value="<!-- TMPL_VAR NAME="zipcode" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatorycity" -->
@@ -358,7 +362,7 @@
                 <label>
             <!-- /TMPL_IF-->
                 City</label>
-            <input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
+            <input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatorybranchcode" -->
@@ -379,7 +383,7 @@
                 <label>
             <!-- /TMPL_IF-->
             Phone (home)</label>
-            <input type="text" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" >
+            <input type="text" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryphonepro" -->
@@ -388,7 +392,7 @@
                 <label>
             <!-- /TMPL_IF-->
             Phone (prof)</label>
-            <input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
+            <input type="text" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatorymobile" -->
@@ -397,7 +401,7 @@
                 <label>
             <!-- /TMPL_IF-->
             Phone (cell)</label>                
-            <input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" >
+            <input type="text" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" />
         </p>
         <p>
         <p>
@@ -407,7 +411,7 @@
                 <label>
             <!-- /TMPL_IF-->
             E-mail (home)</label>
-            <input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" >    
+            <input type="text" name="email" value="<!-- TMPL_VAR NAME="email" -->" />    
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryemailpro" -->
@@ -416,7 +420,7 @@
                 <label>
             <!-- /TMPL_IF-->
             E-mail (prof)</label>
-            <input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
+            <input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryefax" -->
@@ -425,7 +429,7 @@
                 <label>
             <!-- /TMPL_IF-->
             Fax</label> 
-            <input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->">
+            <input type="text" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" />
         </p>
     </fieldset>
     <fieldset>
@@ -437,7 +441,7 @@
                 <label>
             <!-- /TMPL_IF-->
             Name</label>
-            <input style="text-transform:uppercase;" type="text" name="contactname" size="20" value="<!-- TMPL_VAR NAME="contactname" -->">
+            <input style="text-transform:uppercase;" type="text" name="contactname" size="20" value="<!-- TMPL_VAR NAME="contactname" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryrelationship" -->
@@ -460,7 +464,7 @@
                 <label>
             <!-- /TMPL_IF-->
             Address </label>
-            <input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->">
+            <input type="text" name="B_address" size="40" value="<!-- TMPL_VAR NAME="B_address" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryB_zipcode" -->
@@ -469,7 +473,7 @@
             <label>
             <!-- /TMPL_IF-->    
             Zipcode</label>
-            <input type="text" maxlength="5" name="B_zipcode" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
+            <input type="text" maxlength="5" name="B_zipcode" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->" />
         </p>
             <!-- TMPL_IF NAME="mandatoryB_city" -->
                 <label style="font-weight:bold">
@@ -477,7 +481,7 @@
                 <label>
             <!-- /TMPL_IF-->
             City</label>
-            <input style="text-transform:uppercase;" type="text" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->">
+            <input style="text-transform:uppercase;" type="text" name="B_city" size="20" value="<!-- TMPL_VAR NAME="B_city" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryB_phone" -->
@@ -486,7 +490,7 @@
                 <label>
             <!-- /TMPL_IF-->
             Phone (home)</label>
-            <input type="text" name="B_phone" size="20" value="<!-- TMPL_VAR NAME="B_phone" -->">
+            <input type="text" name="B_phone" size="20" value="<!-- TMPL_VAR NAME="B_phone" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatorycontactnote" -->
@@ -499,8 +503,8 @@
         </p>
     </fieldset>
         <div>
-        <input type="button" class="borrowers_button" name="etapeprec1" value="previous step" onclick="check_form_borrowers(0);">
-        <input type="button" class="borrowers_button" name="etapesuiv3" onclick="check_form_borrowers('3')" value="next step"></div>
+        <input type="button" class="borrowers_button" name="etapeprec1" value="previous step" onclick="check_form_borrowers(0);" />
+        <input type="button" class="borrowers_button" name="etapesuiv3" onclick="check_form_borrowers('3')" value="next step" /></div>
     </p>
 </form>
 <!-- ############################END FORM PROFESSIONAL############################################"-->
@@ -509,59 +513,59 @@
 <!-- TMPL_IF NAME="step_3"-->
     <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
         <!--        field always hidden in different form (1,2,3) -->
-        <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->"/>
-        <input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password"/>
-        <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->"/>
-        <input type="hidden" name="type" value="borrowers"/>
-        <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->"/>
-        <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->"/>
-        <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->"/>
-        <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->"/>
+        <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
+        <input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password" />
+        <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
+        <input type="hidden" name="type" value="borrowers" />
+        <input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->" />
+        <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+        <input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->" />
+        <input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
         <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
         <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
         <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
         <input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
         
     <!--        from form 1 -->
-        <input type="hidden" name="title"  value="<!-- TMPL_VAR NAME="title" -->"/>
+        <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
         <input type="hidden" name="surname"  value="<!-- TMPL_VAR NAME="surname" -->" />
-        <input type="hidden" name="firstname"  value="<!-- TMPL_VAR NAME="firstname" -->"/>
-        <input type="hidden" name="dateofbirth"  value="<!-- TMPL_VAR NAME="dateofbirth" -->"/>
-        <input type="hidden" name="initials"  value="<!-- TMPL_VAR NAME="initials" -->"/>
+        <input type="hidden" name="firstname" value="<!-- TMPL_VAR NAME="firstname" -->" />
+        <input type="hidden" name="dateofbirth" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+        <input type="hidden" name="initials" value="<!-- TMPL_VAR NAME="initials" -->" />
         <input type="hidden" name="othernames"  value="<!-- TMPL_VAR NAME="othernames" -->" />
         <input type="hidden" name="sex" value="<!-- TMPL_VAR NAME="sex" -->" />
-        <input type="hidden" name="categorycode"  value="<!-- TMPL_VAR NAME="categorycode" -->"/>
-        <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->"/>
-        <input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->"/>
-        <input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->"/>
+        <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" />
+        <input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->" />
+        <input type="hidden" name="sort1"   value="<!-- TMPL_VAR NAME="sort1" -->" />
+        <input type="hidden" name="sort2"   value="<!-- TMPL_VAR NAME="sort2" -->" />
 
 
     <!--        from form 2 -->
-        <input type="hidden" name="streetnumber"  value="<!-- TMPL_VAR NAME="streetnumber" -->"/>
-        <input type="hidden" name="address"  value="<!-- TMPL_VAR NAME="address" -->"/>
-        <input type="hidden" name="address2"  value="<!-- TMPL_VAR NAME="address2" -->"/>
-        <input type="hidden" name="streettype"  value="<!-- TMPL_VAR NAME="streettype" -->"/>   
-        <input type="hidden" name="zipcode"  value="<!-- TMPL_VAR NAME="zipcode" -->"/>
-        <input type="hidden" name="city"  value="<!-- TMPL_VAR NAME="city" -->"/> 
-        <input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->"/>
-        <input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->"/>
-        <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->"/>
-        <input type="hidden" name="mobile"  value="<!-- TMPL_VAR NAME="mobile" -->"/>   
-        <input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->"/>
-        <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->"/>
-        <input type="hidden" name="contactname"  value="<!-- TMPL_VAR NAME="contactname" -->"/>
-        <input type="hidden" name="relationship"  value="<!-- TMPL_VAR NAME="relationship" -->"/>
-        <input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->"/>
-        <input type="hidden" name="B_zipcode"  value="<!-- TMPL_VAR NAME="B_zipcode" -->"/>
-        <input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->"/>
-        <input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"/> 
-        <input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"/>     
+        <input type="hidden" name="streetnumber" value="<!-- TMPL_VAR NAME="streetnumber" -->" />
+        <input type="hidden" name="address" value="<!-- TMPL_VAR NAME="address" -->" />
+        <input type="hidden" name="address2" value="<!-- TMPL_VAR NAME="address2" -->" />
+        <input type="hidden" name="streettype" value="<!-- TMPL_VAR NAME="streettype" -->" />   
+        <input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->" />
+        <input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->" /> 
+        <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
+        <input type="hidden" name="phone"   value="<!-- TMPL_VAR NAME="phone" -->" />
+        <input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" />
+        <input type="hidden" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" />   
+        <input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" />
+        <input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
+        <input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->" />
+        <input type="hidden" name="relationship" value="<!-- TMPL_VAR NAME="relationship" -->" />
+        <input type="hidden" name="B_address" value="<!-- TMPL_VAR NAME="B_address" -->" />
+        <input type="hidden" name="B_zipcode" value="<!-- TMPL_VAR NAME="B_zipcode" -->" />
+        <input type="hidden" name="B_city" value="<!-- TMPL_VAR NAME="B_city" -->" />
+        <input type="hidden" name="B_phone" value="<!-- TMPL_VAR NAME="B_phone" -->" /> 
+        <input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" />     
         <textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
     
         <!-- TMPL_IF NAME="opadd" -->
-            <input type="hidden" name="op" value="add">
+            <input type="hidden" name="op" value="add" />
         <!-- TMPL_ELSE -->
-            <input type="hidden" name="op" value="modify">
+            <input type="hidden" name="op" value="modify" />
         <!-- /TMPL_IF -->
         <p>
             <!-- TMPL_IF NAME="mandatorycardnumber" -->
@@ -570,7 +574,7 @@
             <label>
             <!-- /TMPL_IF-->
              Card number</label>
-            <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"/>
+            <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
         </p>
     <fieldset id="memberentry_subscription">
     <legend>Library set-up</legend>
@@ -581,7 +585,7 @@
             <label>
             <!-- /TMPL_IF-->
             Arrival date</label>
-            <input type="text" name="dateenrolled"  maxlength="10"    size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+            <input type="text" name="dateenrolled"  maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -590,8 +594,7 @@
             <label>
             <!-- /TMPL_IF-->
             Expiry date</label>
-            <input type="text" name="dateexpiry" maxlength="10"  size="10"
-                            onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+            <input type="text" name="dateexpiry" maxlength="10"  size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatoryopacnote" -->
@@ -621,7 +624,7 @@
             <label>
             <!-- /TMPL_IF-->
             OPAC Login</label>
-            <input type="text" name="userid" size="20"  value="<!-- TMPL_VAR NAME="userid" -->">
+            <input type="text" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
         </p>
         <p>
             <!-- TMPL_IF NAME="mandatorypassword" -->
@@ -631,12 +634,12 @@
             <!-- /TMPL_IF-->
             Password</label>
             <!--TMPL_IF NAME="opadd"-->
-                <input type="text" name="password" size="20"  value="<!-- TMPL_VAR NAME="password" -->">
+                <input type="text" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />
             <!--TMPL_ELSE-->
                 <!--TMPL_IF NAME="password"-->
-                    <input type="text" name="password" size="20"  value="****">
+                    <input type="text" name="password" size="20" value="****" />
                 <!--TMPL_ELSE-->
-                    <input type="text" name="password" size="20"  value="">
+                    <input type="text" name="password" size="20" value="" />
                 <!--/TMPL_IF-->
             <!--/TMPL_IF-->
         </p>
@@ -646,19 +649,19 @@
             <!-- TMPL_LOOP NAME="flagloop" -->
             <p>
                 <label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
-                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes
-                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
+                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" --> />Yes
+                <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" --> />No
             </p>
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_UNLESS -->   
         <p>
         </fieldset>
         <div>
-            <input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);">    
+            <input type="button" class="borrowers_button" name="step2" value="Previous step" onclick="check_form_borrowers(1);" />    
             <!-- TMPL_IF NAME="opadd" -->
-                <input type="button" name="step4" onclick="unique();" value="Add member">
+                <input type="button" name="step4" onclick="unique();" value="Add member" />
             <!-- TMPL_ELSE -->
-                <input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member">
+                <input type="button" name="step4" onclick="check_form_borrowers();" value="Modify member" />
             <!--/TMPL_IF -->
         </div>
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
index 29a969997b..896ffa9bd4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
@@ -3,9 +3,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <h3>Library</h3>
-<!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br><!-- /TMPL_IF -->
-Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber">"><!-- TMPL_VAR NAME="cardnumber" --></a><br>
-<!-- TMPL_VAR NAME="todaysdate" --><br>
+<!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br /><!-- /TMPL_IF -->
+Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber">"><!-- TMPL_VAR NAME="cardnumber" --></a><br />
+<!-- TMPL_VAR NAME="todaysdate" --><br />
 <table>
 	<caption>Issues</caption>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 739a448a52..382fc5a1ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -10,7 +10,7 @@
 <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a>
 
 <form action="" name="form">
-<input type="hidden" name="reregistration" value="<!-- TMPL_VAR NAME="reregistration"-->"/> 
+<input type="hidden" name="reregistration" value="<!-- TMPL_VAR NAME="reregistration"-->" /> 
 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 </form>
 <div id="action">
@@ -40,10 +40,10 @@
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
         
-        <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME=borrowernumber -->">
+        <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">
             Set password
         </a>
-        <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME=borrowernumber -->">
+        <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">
             Privileges
         </a> 
         <a href="javascript:confirm_deletion();">
@@ -60,7 +60,7 @@
         <a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
             Reading record
         </a>
-        <a href="javascript:confirm_reregistration();" onclick="javascript:document.form.value='y'" class="gest_borro_op">
+        <a href="javascript:confirm_reregistration();" onclick="document.form.value='y'" class="gest_borro_op">
         Renew
         </a>
     </div>
@@ -186,7 +186,7 @@
        
 	 <!-- TMPL_IF name="isguarantee" -->
             <!-- TMPL_IF NAME="guaranteeloop" -->
-                <p><label>Guarantees:</label><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name -->  </a></li><!-- /tmpl_loop --></ul></p>
+                <p><label>Guarantees:</label><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" -->  </a></li><!-- /tmpl_loop --></ul></p>
             <!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
             <!-- TMPL_IF name="guarantorborrowernumber" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
index f5cbba5e13..3f439bbfa3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc" -->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
@@ -255,7 +255,7 @@
 	
 	
 		<h3> Cell value </h3>
-			<input type="radio" name="Cellvalue" value="1" checked /> Count items
+			<input type="radio" name="Cellvalue" value="1" checked="checked" /> Count items
 			<input type="radio" name="Cellvalue" value="2" /> Amount
 	
 	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
index 7dd34d8210..82fce8fa3d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
@@ -74,7 +74,7 @@ function Dopop(link) {
 			<tr>
 				<td>
 					<select name="Limit">
-						<option value ="5" checked> 5</option>
+						<option value ="5" checked="checked"> 5</option>
 						<option value ="10">10</option>
 						<option value ="15">15</option>
 						<option value ="20">20</option>
@@ -86,7 +86,7 @@ function Dopop(link) {
 				</td>
 				<td>
 					<select name="Criteria">
-						<option value ="" checked>None</option>
+						<option value ="" checked="checked">None</option>
 						<option value ="issuingbranch">Branch</option>
 						<option value ="categorycode">Categorycode</option>
 						<option value ="itemtype">Itemtype</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
index 6b56843f73..652a679319 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
@@ -57,7 +57,7 @@
             <tr>
                 <td>
                     <select name="Limit">
-                        <option value ="" checked>None</option>
+                        <option value ="" checked="checked">None</option>
                         <option value ="5"> 5</option>
                         <option value ="10">10</option>
                         <option value ="15">15</option>
@@ -70,7 +70,7 @@
                 </td>
                 <td>
                     <select name="Criteria">
-                        <option value ="" checked>None</option>
+                        <option value ="" checked="checked">None</option>
                         <option value ="categorycode">Categorycode</option>
                         <option value ="itemtype">Itemtype</option>
                     </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
index 8fd81ba01a..cd68d20e86 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
index 6e1dd0c9eb..82e622c390 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
@@ -7,7 +7,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
@@ -75,7 +75,7 @@ function Dopop(link) {
 			<tr>
 				<td>
 					<select name="Limit">
-						<option value ="5" checked> 5</option>
+						<option value ="5" checked="checked"> 5</option>
 						<option value ="10">10</option>
 						<option value ="15">15</option>
 						<option value ="20">20</option>
@@ -87,7 +87,7 @@ function Dopop(link) {
 				</td>
 				<td>
 					<select name="Criteria">
-						<option value ="" checked>None</option>
+						<option value ="" checked="checked">None</option>
 						<option value ="issuingbranch">Branch</option>
 						<option value ="categorycode">Categorycode</option>
 						<option value ="itemtype">Itemtype</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
index a31951459c..585145525d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
@@ -57,7 +57,7 @@
 			<tr>
 				<td>
 					<select name="Limit">
-						<option value ="" checked>None</option>
+						<option value ="" checked="checked">None</option>
 						<option value ="5"> 5</option>
 						<option value ="10">10</option>
 						<option value ="15">15</option>
@@ -70,7 +70,7 @@
 				</td>
 				<td>
 					<select name="Criteria">
-						<option value ="" checked>None</option>
+						<option value ="" checked="checked">None</option>
 						<option value ="homebranch">Branch</option>
 						<option value ="itemtype">Itemtype</option>
 					</select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
index e4edc58999..49b89fa0fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl
index 184ac9787b..a4b80ab847 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/inventory.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
index abe4055163..a4a9ec84d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
index 1c78f181aa..51dd0906f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
index 11ceec3011..71cd59534d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
@@ -202,7 +202,7 @@
             <td>Item Callnumber</td>
             <td></td>
             <td></td>
-            <td>From <input type="text" name="Filter" size="10"/> (included) to <input type="text" name="Filter" size="10" /> (excluded) </td>
+            <td>From <input type="text" name="Filter" size="10" /> (included) to <input type="text" name="Filter" size="10" /> (excluded) </td>
         </tr>
         <!-- TMPL_IF Name="hassort1" -->
             <tr class="hilighted"> 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
index 5091604672..28a5935e26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
index ae32bde9a7..ae9d9df9e2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
@@ -4,7 +4,7 @@
 <!-- TMPL_INCLUDE NAME="menus.inc"-->
 <!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 0f7feb2b8d..c60b8ea7ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -57,7 +57,7 @@ if (alreadyreserved > "0"){
 			<p>Hold placed by : <b> <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> at : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please transfer this item.
 			</p>
 			<form name="cancelReservewithtransfert" action="branchreserves.pl" method="post">
-				<input type="submit" class="button circulation">
+				<input type="submit" class="button">
 			</form>
 		</div>
 	<!-- /TMPL_IF -->
@@ -69,7 +69,7 @@ if (alreadyreserved > "0"){
 
 <h2>Add reserve</h2>
 <!-- TMPL_UNLESS NAME="cardnumber"-->
-    <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post" onSubmit="request.pl" name="getborrower">
+    <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post" onsubmit="request.pl" name="getborrower">
         <!-- TMPL_UNLESS name="CGIselectborrower" -->
                 <p>
                 <label>Patron</label>
@@ -92,7 +92,7 @@ if (alreadyreserved > "0"){
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="expiry" -->
-    <br>
+    <br />
     <p class="problem">
       <label>Expired account</label>
       This patron's account has expired
@@ -117,7 +117,7 @@ if (alreadyreserved > "0"){
     <div class="problem">No patron with this name, Please, try an other </div>
   <!-- /TMPL_IF -->
     <h3>Reserve properties</h3>
-        <form action="placerequest.pl" method="post" onSubmit="return check();" name="form">
+        <form action="placerequest.pl" method="post" onsubmit="return check();" name="form">
     
         <input type="hidden" size="10" name="member" value="<!--  TMPL_VAR NAME="cardnumber" -->">
         <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
@@ -210,7 +210,7 @@ if (alreadyreserved > "0"){
                     else {return false;}">Cancel A reserve
                     <span> Item reserved for :
                             <!-- TMPL_VAR NAME="ReservedForSurname" -->  <!-- TMPL_VAR NAME="ReservedForFirstname" -->
-                    <br>
+                    <br />
                     expected at :	<!-- TMPL_VAR NAME="ExpectedAtLibrary" -->
                     </span>
                     </a>
@@ -258,7 +258,7 @@ if (alreadyreserved > "0"){
           <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
           <select name="rank-request">
     <!-- TMPL_IF Name="wait" -->
-            <option value="W" selected>Waiting</option>
+            <option value="W" selected="selected">Waiting</option>
     	<!-- TMPL_ELSE -->
             <option value="<!-- TMPL_VAR NAME="priority" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
               <!-- TMPL_VAR NAME="priority" -->
@@ -275,9 +275,9 @@ if (alreadyreserved > "0"){
         <td>
     <!-- TMPL_IF Name="wait" -->
     	<!-- TMPL_IF NAME="atdestination" -->
-          Document waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
+          Document waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->">
           <!-- TMPL_ELSE -->
-          Document will be transfered to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
+          Document will be transfered to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->">
          <!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
           <select name="pickup">
@@ -295,10 +295,10 @@ if (alreadyreserved > "0"){
         </td>
         <td>
     <!-- TMPL_IF Name="wait" -->
-          <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME='biblionumber' -->&type='intra'" onclick="openWindow(this, 'Item', 480, 640); return false;">
+          <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME='biblionumber' -->&amp;type='intra'" onclick="openWindow(this, 'Item', 480, 640); return false;">
                 <!-- TMPL_IF NAME="barcodenumber" -->
                     <!-- TMPL_VAR NAME="barcodenumber" -->
-                    <input type="hidden" name="itemnumber" value=<!-- TMPL_VAR NAME="itemnumber" -->>
+                    <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
                 <!-- TMPL_ELSE -->
                     No Barcode
                 <!-- /TMPL_IF -->
@@ -317,7 +317,7 @@ if (alreadyreserved > "0"){
   <!-- /TMPL_LOOP --> <!-- existing reserveloop -->
       <tr>
         <td colspan="6">
-          <input type="submit" name="submit" value="Cancel reserve(s)" border="0">
+          <input type="submit" name="submit" value="Cancel reserve(s)" border="0" />
         </td>
       </tr>
     </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
index 712ae6bc96..246d9a961e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/acqui-search-result.tmpl
@@ -14,7 +14,7 @@
 	<!-- TMPL_LOOP name="loop_suppliers" -->
 		<tr>
 			<td><!-- TMPL_VAR name="name" --></td>
-			<td><a href="#" onclick="javascript:GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,'<!--  TMPL_VAR escape="URL" NAME="name" -->')">Get It !</td>
+			<td><a href="#" onclick="GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,'<!--  TMPL_VAR escape="URL" NAME="name" -->')">Get It !</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
index 72fa5ffcef..993bf62921 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
@@ -23,13 +23,13 @@
           onsubmit="return CheckForm(this);">
          
         <label for="title">Filter on title&nbsp;</label>
-        <input id="title" type="texte" name="title" size="15" value="<!--TMPL_VAR NAME="title"-->"/>
+        <input id="title" type="texte" name="title" size="15" value="<!--TMPL_VAR NAME="title"-->" />
         <br />
         <label for="issn">Filter on ISSN</label>
-        <input id="issn" type="texte" name="issn" size="15" value="<!-- TMPL_VAR NAME="issn"-->"/>
+        <input id="issn" type="texte" name="issn" size="15" value="<!-- TMPL_VAR NAME="issn"-->" />
         <br />
         <label for="date">with expiration date before</label>
-        <input id="date" type="texte" name="date" size="10" value="<!-- TMPL_VAR NAME="date"-->"/>
+        <input id="date" type="texte" name="date" size="10" value="<!-- TMPL_VAR NAME="date"-->" />
             <script type="text/javascript">
                 Calendar.setup(
                  {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
index 4ebb2c8619..5fddac6238 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl
@@ -65,7 +65,7 @@
                     <tr>
                         <!--TMPL_IF NAME="letter" -->
                             <td class="cell">
-                                <input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->" onclick="javascript:document.claims.op.value='send_alert';" />
+                    <input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->" onclick="document.claims.op='send_alert';" />
                             </td>
                         <!--/TMPL_IF-->
                         <td class="cell">
@@ -104,8 +104,8 @@
 name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR
 name="supplierid" -->,''); return false" class="button">Supplier Group Claim Letter</a></p> -->
         <!-- /TMPL_IF -->
-        <p><br/>
-            <!--TMPL_IF Name=letter-->
+<p><br />
+<!--TMPL_IF Name="letter--">
                 <input type="submit" name="submit" class="button" value="Send letter" />
             <!--/TMPL_IF-->
         </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
index 3206d9c1f2..597e449edb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/distributedto.tmpl
@@ -23,8 +23,8 @@
 					<!-- /TMPL_IF -->
 					<input type="hidden" name="SaveList" value="0">
 					<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
-					<input type="button" name="save" value="Save" class="button" onClick="FSaveList()">
-					<input type="button" name="clode" value="Close" class="button" onClick="javascript:window.close()">
+					<input type="button" name="save" value="Save" class="button" onclick="FSaveList()">
+					<input type="button" name="clode" value="Close" class="button" onclick="window.close()">
 			</td>
 			</tr>
 			<tr>
@@ -80,7 +80,7 @@
 			}
 		}
 		function FSaveList() {
-			document.Aform.SaveList.value=1;
+			document.Aform.SaveList.value="1";
 			document.Aform.submit();
 		}
 	</script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl
index 8e2581ddc4..ce4ff7b593 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/receipt-search-result.tmpl
@@ -4,20 +4,20 @@
 	<h1 class="authority">Serial search results</h1>
 	<div id="resultnumber">
 		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
-					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
+			<!-- TMPL_IF NAME="displayprev" -->
+				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search>
+					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0" />
 				</a>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF NAME="highlight" -->
+					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif" />
 				<!-- TMPL_ELSE -->
-					<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+					<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0" /></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+			<!-- TMPL_IF NAME="displaynext" -->
+				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0" /></a>
 				<!-- /TMPL_IF -->
 		</p>
 
@@ -36,12 +36,12 @@
 
 					<td>
 		<div align="center">				<a href="subscription-detail.pl?suscr=<!-- TMPL_VAR name="subscriptionid" -->">
-							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" alt="Authority number <!-- TMPL_VAR name="authid" -->" title="Serial number<!-- TMPL_VAR name="subscriptionid" -->">
+							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" alt="Authority number <!-- TMPL_VAR name="authid" -->" title="Serial number<!-- TMPL_VAR name="subscriptionid" -->" />
 						</a> </div>
 					</td>
-	<td><div align="center"><a href="serials-recieve.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&serial=<!-- TMPL_VAR name="serial" -->">
+	<td><div align="center"><a href="serials-recieve.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serial=<!-- TMPL_VAR name="serial" -->">
 
-							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/Fleche.jpg"  width="32" hspace="0" vspace="0" border="0" alt="Subscribtion serial<!-- TMPL_VAR name="subscriptionid" -->" title="Serial number<!-- TMPL_VAR name="subscriptionid" -->">
+							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/Fleche.jpg"  width="32" hspace="0" vspace="0" border="0" alt="Subscribtion serial<!-- TMPL_VAR name="subscriptionid" -->" title="Serial number<!-- TMPL_VAR name="subscriptionid" -->" />
 
 
 </a></td></div>
@@ -51,18 +51,18 @@
 	</div>
 	<div id="resultnumber">
 		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
+			<!-- TMPL_IF NAME="displayprev" -->
+			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0" /></a>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF NAME="highlight" -->
+				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif" />
 				<!-- TMPL_ELSE -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0" /></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+			<!-- TMPL_IF NAME="displaynext" -->
+			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE="URL" -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0" /></a>
 				<!-- /TMPL_IF -->
 		</p>
 	</div>	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
index f9c0d89814..0ea66e1c59 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <div id="mainbloc">
-    <h1 class="catalogue">Search results</h1>
+    <h1>Search results</h1>
 <!-- TMPL_IF NAME="total"-->
 <div class="searchresults">
     <table>
@@ -16,7 +16,7 @@
     <!-- TMPL_LOOP NAME="resultsloop" -->
         <tr>
             <td>
-                <a href="#" onclick="Javascript:GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR escape="URL" NAME="title" -->');" title="Get this one !">
+                <a href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR escape="URL" NAME="title" -->');" title="Get this one !">
                     <!-- TMPL_VAR NAME="title" -->
                 </a>
                 <br />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl
index 40bd392a32..cfca98dded 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl
@@ -11,7 +11,7 @@
 			<a  class="button serial" href="javascript:active(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
 		<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
-	<a class=" button serial" href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=small">Compact view</a>
+	<a class=" button serial" href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&amp;selectview=small">Compact view</a>
 	</p>
 	<!-- TMPL_LOOP NAME="years" -->
 	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" style="position:absolute; visibility:hidden; margin-top:0px; border:4px;" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl
index a091166a81..482f0c1ce1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl
@@ -9,7 +9,7 @@
 <div id="action">
     <a href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Subscriptions</a>
     <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Back to biblio</a>
-    <a href="/cgi-bin/koha/serials/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=full">Complete view</a>
+    <a href="/cgi-bin/koha/serials/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&amp;selectview=full">Complete view</a>
     </form>
 </div>
 <!-- TMPL_LOOP name="subscription_LOOP" -->
@@ -80,7 +80,7 @@
         </p>
         <p>Last renewal of subscription was <b><!-- TMPl_VAR name="startdate" --></b></p>
         <!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was recieved on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF -->
-    <!--TMPL_UNLESS Name=fullinfo -->
+    <!--TMPL_UNLESS Name="fullinfo" -->
         <p><!-- TMPL_VAR name="notes" --></p>
         <!-- TMPL_IF name="opacnote" -->
             <h2>Issues summary</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
index 2afc0cf5b3..82770ee239 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl
@@ -60,7 +60,7 @@ function popup(subscriptionid) {
 
 <!-- TMPL_UNLESS name="popup" -->
 
-	<h1>Serial Collection information for<br/> <em><!-- TMPL_VAR name="bibliotitle" --></em></h1>
+	<h1>Serial Collection information for<br /> <em><!-- TMPL_VAR name="bibliotitle" --></em></h1>
 <!-- /TMPL_UNLESS -->
 
 <!--TMPL_IF Name="subscriptions"-->
@@ -143,9 +143,9 @@ function popup(subscriptionid) {
         <td> <!-- TMPL_VAR name="notes" -->        <!--TMPL_IF name="subscriptionexpired"--><br /><span class="problem"> Subscription Expired</span>
         <!--/TMPL_IF-->
         </td>
-        <!--TMPL_IF name="abouttoexpire"--><td class="problem"> <a onclick="javascript:popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew</a></td>
+        <!--TMPL_IF name="abouttoexpire"--><td class="problem"> <a onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew</a></td>
         <!--TMPL_ELSE-->
-        <!--TMPL_IF name="subscriptionexpired"--><td class="problem"> <a onclick="javascript:popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew</a></td>
+        <!--TMPL_IF name="subscriptionexpired"--><td class="problem"> <a onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew</a></td>
         <!--TMPL_ELSE-->
         <td> &nbsp;</td>
         <!--/TMPL_IF-->
@@ -201,7 +201,7 @@ function popup(subscriptionid) {
                 </th>
             </tr>
       <!-- TMPL_LOOP Name="serials" -->
-            <tr name="branch <!--TMPL_VAR Name=branchcode"-->">
+            <tr name="branch <!--TMPL_VAR Name="branchcode"-->">
 <!--TMPL_UNLESS Name="onesubscription"-->
                  <td><a href="serials-collection.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->"><!--TMPL_VAR Name="subscriptionid"--></a></td>
 <!--/TMPL_UNLESS-->
@@ -230,10 +230,10 @@ function popup(subscriptionid) {
                 <td>
                   <div visibility="hidden" name="subs" val="<!--TMPL_VAR Name="subscriptionid"-->"></div>
                   <!--TMPL_IF Name="subscriptionexpired"-->
-                  <input type="checkbox" name="serialid" value="<!--TMPL_VAR Name="serialid"-->" disabled />
+                  <input type="checkbox" name="serialid" value="<!--TMPL_VAR Name="serialid"-->" disabled="disabled" />
                   <!--TMPL_ELSE-->
                     <!--TMPL_IF Name="status1"-->
-                    <input type="checkbox" name="serialid" checked value="<!--TMPL_VAR Name="serialid"-->"/>
+                    <input type="checkbox" name="serialid" checked value="<!--TMPL_VAR Name="serialid"-->" />
                     <!--TMPL_ELSE -->
                     <!--TMPL_IF Name="status3"-->
                     <input type="checkbox" name="serialid" checked value="<!--TMPL_VAR Name="serialid"-->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
index 57189600bd..290c900aaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
@@ -13,9 +13,9 @@
     <a href="serials-collection.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="serial Collection for <!--TMPL_VAR Name="bibliotitle"-->">Serial collection</a>
     <!--TMPL_LOOP Name="subscriptions"-->
     <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" title="detail of the subscription">Subscription #<!-- TMPL_VAR name="subscriptionid" --></a>
-        <!--TMPL_IF name="abouttoexpire"--><a href="#" onclick="javascript:popup('subscription-renew.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->&amp;mode=popup')">Renew <!--TMPL_VAR Name="subscriptionid"--></a>
+        <!--TMPL_IF name="abouttoexpire"--><a href="#" onclick="popup('subscription-renew.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->&amp;mode=popup')">Renew <!--TMPL_VAR Name="subscriptionid"--></a>
         <!--/TMPL_IF-->
-        <!--TMPL_IF name="subscriptionexpired"--><a href="#" onclick="javascript:popup('subscription-renew.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->&amp;mode=popup')">Renew <!--TMPL_VAR Name="subscriptionid"--></a>
+        <!--TMPL_IF name="subscriptionexpired"--><a href="#" onclick="popup('subscription-renew.pl?subscriptionid=<!--TMPL_VAR Name="subscriptionid"-->&amp;mode=popup')">Renew <!--TMPL_VAR Name="subscriptionid"--></a>
         <!--/TMPL_IF-->
       <!--/TMPL_LOOP-->
     <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="go to <!-- TMPL_VAR name="bibliotitle" -->">Show Biblio</a>
@@ -54,47 +54,47 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
             Issue <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="20" maxlength="100">
         </td>
         <td>
-            <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
+            <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15">
         </td>
         <td>
-            <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
+            <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15">
         </td>
         <td>
             <!--TMPL_IF name="editdisable"-->
-              <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" disabled >
+              <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" disabled="disabled">
             <!--TMPL_ELSE-->
-              <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" OnChange="javascript:if (this.value==2){unHideItems('items'+<!-- TMPL_VAR NAME="subscriptionid" -->+<!-- TMPL_VAR NAME="serialid" -->,'label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')}" >
+              <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" onchange="javascript:if (this.value==2){unHideItems('items'+<!-- TMPL_VAR NAME="subscriptionid" -->+<!-- TMPL_VAR NAME="serialid" -->,'label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')}" >
             <!--/TMPL_IF-->
   <!--TMPL_IF name="status1" -->
-                    <option value="1" selected>Waited</option>
+                    <option value="1" selected="selected">Waited</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status2" -->
-                    <option value="2" selected>Arrived</option>
+                    <option value="2" selected="selected">Arrived</option>
   <!--TMPL_ELSE -->
                     <option value="2">Arrived</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status3" -->
-                    <option value="3" selected>Late</option>
+                    <option value="3" selected="selected">Late</option>
   <!-- TMPL_ELSE -->
                     <option value="3">Late</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status4" -->
-                    <option value="4" selected>Missing</option>
+                    <option value="4" selected="selected">Missing</option>
   <!-- TMPL_ELSE -->
                     <option value="4">Missing</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status7" -->
-                    <option value="7" selected>Claimed</option>
+                    <option value="7" selected="selected">Claimed</option>
   <!-- TMPL_ELSE -->
                     <option value="7">Claimed</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status5" -->
-                    <option value="5" selected>Not Available</option>
+                    <option value="5" selected="selected">Not Available</option>
   <!-- TMPL_ELSE -->
                     <option value="5">Not Available</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status6" -->
-                    <option value="6" selected>Delete</option>
+                    <option value="6" selected="selected">Delete</option>
   <!-- TMPL_ELSE -->
                     <option value="6">Delete</option>
   <!-- /TMPL_IF -->
@@ -102,7 +102,7 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
 
         </td>
         <td>
-            <input type="text" name="notes" value="<!-- TMPL_VAR name="sernotes" -->" size=20 maxlength=255>
+            <input type="text" name="notes" value="<!-- TMPL_VAR name="sernotes" -->" size="20" maxlength="255">
         </td>
     </tr>
   <!--TMPL_UNLESS Name="subscriptionexpired"-->
@@ -156,46 +156,46 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
             <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
             <input type="hidden" name="itemcount" value="<!-- TMPL_VAR name="issuesatonce" -->" />
             <input type="hidden" name="user" value="<!-- TMPL_VAR name="librarian" -->" />
-            <b>Subs. <!-- TMPL_VAR name="subscriptionid" --></b> New Issue <input type="text" name="serialseq" value="" size="20" maxlength="100" OnChange="javascript:if (this.value!=''){unHideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!-- TMPL_VAR NAME="serialid" -->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')} else {HideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!-- TMPL_VAR NAME="serialid" -->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')}"/>
+            <b>Subs. <!-- TMPL_VAR name="subscriptionid" --></b> New Issue <input type="text" name="serialseq" value="" size="20" maxlength="100" onchange="javascript:if (this.value!=''){unHideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!-- TMPL_VAR NAME="serialid" -->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')} else {HideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!-- TMPL_VAR NAME="serialid" -->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')}" />
         </td>
         <td>
-            <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
+            <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15">
         </td>
         <td>
-            <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
+            <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15">
         </td>
         <td>
             <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" >
   <!--TMPL_IF name="status1" -->
-                    <option value="1" selected>Waited</option>
+                    <option value="1" selected="selected">Waited</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status2" -->
-                    <option value="2" selected>Arrived</option>
+                    <option value="2" selected="selected">Arrived</option>
   <!--TMPL_ELSE -->
                     <option value="2">Arrived</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status3" -->
-                    <option value="3" selected>Late</option>
+                    <option value="3" selected="selected">Late</option>
   <!-- TMPL_ELSE -->
                     <option value="3">Late</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status4" -->
-                    <option value="4" selected>Missing</option>
+                    <option value="4" selected="selected">Missing</option>
   <!-- TMPL_ELSE -->
                     <option value="4">Missing</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status7" -->
-                    <option value="7" selected>Claimed</option>
+                    <option value="7" selected="selected">Claimed</option>
   <!-- TMPL_ELSE -->
                     <option value="7">Claimed</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status5" -->
-                    <option value="5" selected>Not Available</option>
+                    <option value="5" selected="selected">Not Available</option>
   <!-- TMPL_ELSE -->
                     <option value="5">Not Available</option>
   <!-- /TMPL_IF -->
   <!--TMPL_IF name="status6" -->
-                    <option value="6" selected>Delete</option>
+                    <option value="6" selected="selected">Delete</option>
   <!-- TMPL_ELSE -->
                     <option value="6">Delete</option>
   <!-- /TMPL_IF -->
@@ -203,7 +203,7 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
 
         </td>
         <td>
-            <input type="text" name="notes" value="" size=20 maxlength=255>
+            <input type="text" name="notes" value="" size="20" maxlength="255">
         </td>
     </tr>
   <!--TMPL_IF Name="serialsadditems"-->
@@ -247,7 +247,7 @@ Error : Barcode Not Unique For serialseq <!--TMPL_VAR Name="errserialseq"-->
 <!-- /TMPL_LOOP -->
 
 </table>
-    <input type="submit" value="Save"  class="button" accesskey="w" /> <!--onClick="Check(this.form)" -->
+    <input type="submit" value="Save"  class="button" accesskey="w" /> <!--onclick="Check(this.form)" -->
 </div>
 </form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
index cbab91d929..18d39374ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
@@ -67,9 +67,9 @@ Serials updated :
                 Branch
             </th>
             <!-- TMPL_IF NAME="routing" -->
-              <th colspan=3>&nbsp;</th>
+              <th colspan="3">&nbsp;</th>
             <!-- TMPL_ELSE -->
-              <th colspan=2>&nbsp;</th>
+              <th colspan="2">&nbsp;</th>
             <!-- /TMPL_IF -->        
         </tr>
         <tr>
@@ -79,10 +79,10 @@ Serials updated :
             <!-- /TMPL_IF -->
             <input type="hidden" name="searched" value="1" />
             <td>
-                <input type="text" size=10 maxlength=11 name="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" title="type ISSN here to filter subscription">
+                <input type="text" size="10" maxlength="11" name="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" title="type ISSN here to filter subscription">
             </td>
             <td>
-                <input type="text" size=40 maxlength=40 name="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" title="type a title -complete or partial- to filter subscription" />
+                <input type="text" size="40" maxlength="40" name="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" title="type a title -complete or partial- to filter subscription" />
             </td>
             <td colspan="2">
                 &nbsp;
@@ -119,8 +119,7 @@ Serials updated :
                 <!-- TMPL_ELSE -->
                     <td>
                 <!-- /TMPL_IF -->
-                <!-- TMPL_IF name="notes" --><p><!-- TMPL_VAR name="notes" --></p><!-- /TMPL_IF -->
-                <!-- TMPL_IF name="callnumber" --><p><!-- TMPL_VAR name="callnumber" --></p><!-- /TMPL_IF -->
+                <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
                 </td>
                 <!-- TMPL_IF name="toggle" -->
                     <td class="hilighted">
@@ -135,7 +134,7 @@ Serials updated :
                     <!-- TMPL_ELSE -->
                         <td>
                     <!-- /TMPL_IF -->
-                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" --><!-- TMPL_UNLESS NAME="routingedit" -->&op=new<!-- /TMPL_UNLESS -->">Routing List</a>
+                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" --><!-- TMPL_UNLESS NAME="routingedit" -->&amp;op=new<!-- /TMPL_UNLESS -->">Routing List</a>
                     </td>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="toggle" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
index 424c20f4a6..34834adcfc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl
@@ -46,18 +46,18 @@
 				Issue <input type="text" name="serialseq" value="<!-- TMPL_VAR name="serialseq" -->" size="20" maxlength="100">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
-				Callnumber <input type="text" name="itemcallnumber" value="<!--TMPL_VAR NAME="callnumber"-->" size=15 maxlength=100>
-				Barcode <input type="text" name="barcode" value="<!-- TMPL_VAR NAME="barcode"-->" id="barcode<!-- TMPL_VAR NAME="num" -->" size=20 maxlength=20>
+				Callnumber <input type="text" name="itemcallnumber" value="<!--TMPL_VAR NAME="callnumber"-->" size="15" maxlength="100">
+				Barcode <input type="text" name="barcode" value="<!-- TMPL_VAR NAME="barcode"-->" id="barcode<!-- TMPL_VAR NAME="num" -->" size="20" maxlength="20">
 			<!--/TMPL_IF -->
 			</td>
 			<td>
-				<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
+				<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />&nbsp;
 			<!--/TMPL_IF  -->
 			</td>
 			<td>
-				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
+				<input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
 				<select name="branch" size="1">
@@ -74,30 +74,30 @@
 				<input type="hidden" name="serialid" value="<!-- TMPL_VAR name="serialid" -->">
 				<select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->">
 					<!--TMPL_IF name="status1" -->
-						<option value="1" selected>Waited</option>
+						<option value="1" selected="selected">Waited</option>
 					<!-- /TMPL_IF -->
 					<!--TMPL_IF name="status2" -->
-						<option value="2" selected>Arrived</option>
+						<option value="2" selected="selected">Arrived</option>
 					<!-- TMPL_ELSE -->
 						<option value="2">Arrived</option>
 					<!-- /TMPL_IF -->
 					<!--TMPL_IF name="status3" -->
-						<option value="3" selected>Late</option>
+						<option value="3" selected="selected">Late</option>
 					<!-- TMPL_ELSE -->
 						<option value="3">Late</option>
 					<!-- /TMPL_IF -->
 					<!--TMPL_IF name="status4" -->
-						<option value="4" selected>Missing</option>
+						<option value="4" selected="selected">Missing</option>
 					<!-- TMPL_ELSE -->
 						<option value="4">Missing</option>
 					<!-- /TMPL_IF -->
 					<!--TMPL_IF name="status5" -->
-						<option value="5" selected>Not Available</option>
+						<option value="5" selected="selected">Not Available</option>
 					<!-- TMPL_ELSE -->
 						<option value="5">Not Available</option>
 					<!-- /TMPL_IF -->
 					<!--TMPL_IF name="status6" -->
-						<option value="6" selected>Delete</option>
+						<option value="6" selected="selected">Delete</option>
 					<!-- TMPL_ELSE -->
 						<option value="6">Delete</option>
 					<!-- /TMPL_IF -->
@@ -133,7 +133,7 @@
 
 			</td>
 			<td>
-				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size=20 maxlength=255>
+				<input type="text" name="notes" value="<!-- TMPL_VAR name="notes" -->" size="20" maxlength="255">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
 				<!--TMPL_IF Name="itemlocation"-->
@@ -157,21 +157,21 @@
 	<!-- TMPL_UNLESS name="hassubscriptionexpired" -->
 		<tr>
 			<td>
-				Manual issue <input type="text" name="serialseq" size=30 maxlength=100 value="<!-- TMPL_VAR NAME="missingseq" -->">
+				Manual issue <input type="text" name="serialseq" size="30" maxlength="100" value="<!-- TMPL_VAR NAME="missingseq" -->">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
-				Callnumber <input type="text" name="itemcallnumber" value="" size=10 maxlength=15>
-				Barcode <input type="text" name="barcode" value="" size=20 maxlength=20>
+				Callnumber <input type="text" name="itemcallnumber" value="" size="10" maxlength="15">
+				Barcode <input type="text" name="barcode" value="" size="20" maxlength="20">
 			<!--/TMPL_IF-->
 			</td>
 			<td>
-				<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=10 maxlength=15>
+				<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />&nbsp;
 			<!--/TMPL_IF  -->
 			</td>
 			<td>
-				<input type="text" name="planneddate" size=10 maxlength=15 value="<!-- TMPL_VAR NAME="missingdate" -->">
+				<input type="text" name="planneddate" size="10" maxlength="15" value="<!-- TMPL_VAR NAME="missingdate" -->">
 			<!--TMPL_IF Name="serialadditems" -->
 				<br /><br />
 				<select name="branch" size="1">
@@ -193,7 +193,7 @@
 				<!--/TMPL_IF-->
 				<select name="status" size="1">
 						<!-- TMPL_IF NAME="frommissing" -->
-						<option value="2" selected >Arrived</option>
+						<option value="2" selected="selected">Arrived</option>
 						<!-- TMPL_ELSE -->
 						<option value="2">Arrived</option>
 				
@@ -201,7 +201,7 @@
 						<!-- TMPL_IF NAME="frommissing" -->
 						<option value="3">Late</option>
 						<!--TMPL_ELSE-->
-						<option value="3" selected>Late</option>
+						<option value="3" selected="selected">Late</option>
 						<!--/TMPL_IF-->
 						<option value="4">Missing</option>
 						<option value="5">Not Available</option>
@@ -263,7 +263,7 @@
 	<input type="submit" value="Save changes" accesskey="w" class="button">
 	<!-- TMPL_IF name="hassubscriptionexpired" -->
 		<h3>Subscription has expired.</h3>
-		<p><b>Waited last issue status can't be changed. <a href="#" onClick="popup()" class="button">Renew</a> your subscription</b></p>
+		<p><b>Waited last issue status can't be changed. <a href="#" onclick="popup()" class="button">Renew</a> your subscription</b></p>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="abouttoexpire" -->
 		<h3>Note: Subscription is about to expire next issue.</h3>
@@ -285,11 +285,11 @@
 		<p><label>Starting date:</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"> (the date of the 1st subscription)</p>
 		<p><label>Ending date:</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->">(if empty : subscription still active)</p>
 		<p>Recieved issues</p>
-		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
+		<p>&nbsp;<textarea name="recievedlist" cols="60" rows="5"><!-- TMPL_VAR name="recievedlist" --></textarea></p>
 		<p>Missing issues</p>
-		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
+		<p>&nbsp;<textarea name="missinglist" cols="60" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></p>
 		<p>Opac's note</p>
-		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
+		<p>&nbsp;<textarea name="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea></p>
 		<input type="submit" value="Save changes" class="button">
 	</form>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index 4238fac206..7d1fe442e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -6,7 +6,7 @@
 <!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions -->
 
 <!-- Additions to enable Calendar system -->
@@ -289,7 +289,7 @@ var textbox = '';
             }
             textbox +="<\/tr>";
         } else {
-          textbox +="<tr> <td>"+_('issues expected')+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br/><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"</a></td></tr>";
+          textbox +="<tr> <td>"+_('issues expected')+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br /><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"</a></td></tr>";
         }
         textbox +="<\/table>\n";
     }
@@ -704,15 +704,15 @@ function check_input(e){
         </tr>
         <tr>
             <td><label>Supplier:</label></td>
-            <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <a href="#" onClick="FindAcqui(f)">Search for a Supplier</a></td>
+            <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <a href="#" onclick="FindAcqui(f)">Search for a Supplier</a></td>
         </tr>
         <tr>
             <td><label>Biblio</label></td>
             <td>
                 <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8"> 
                 (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />)
-                <a href="#" onClick="Plugin(f)">Search for Biblio</a> <!--TMPL_UNLESS Name="mod"--> |
-                <a href="#" onClick="Create_biblio(f)">Create Biblio</a><!--/TMPL_UNLESS-->
+                <a href="#" onclick="Plugin(f)">Search for Biblio</a> <!--TMPL_UNLESS Name="mod"--> |
+                <a href="#" onclick="Create_biblio(f)">Create Biblio</a><!--/TMPL_UNLESS-->
             </td>
         </tr>
         <tr>
@@ -773,7 +773,7 @@ function check_input(e){
             <td>First Issue ETA:</td>
             <td>
                 <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button2" style="cursor: pointer;"  />
-                <input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;" />
+                <input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" id="acqui_date" style="border-width: 0px;" />
                 <!-- both scripts for calendar must follow the input field --> 
                 <script type="text/javascript">
                     Calendar.setup({
@@ -800,87 +800,87 @@ function check_input(e){
             <td>Frequency: (*)</td>
             <td>
                 <select name="periodicity" size="1" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1);num_pattern;">
-                <option value="" selected>-- please choose --</option>
+                <option value="" selected="selected">-- please choose --</option>
                 <!-- TMPL_IF name="periodicity16" -->
-                <option value="16" selected>Without Periodicity</option>
+                <option value="16" selected="selected">Without Periodicity</option>
                 <!-- TMPL_ELSE -->
                     <option value="16">Without Periodicity</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity48" -->
-                <option value="48" selected>Unknown</option>
+                <option value="48" selected="selected">Unknown</option>
                 <!-- TMPL_ELSE -->
                 <option value="48">Unknown</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity32" -->
-                <option value="32" selected>Irregular</option>
+                <option value="32" selected="selected">Irregular</option>
                 <!-- TMPL_ELSE -->
                     <option value="32">Irregular</option>
                 <!-- /TMPL_IF -->
 
                 <!-- TMPL_IF name="periodicity12" -->
-                    <option value="12" selected>2/day</option>
+                    <option value="12" selected="selected">2/day</option>
                 <!-- TMPL_ELSE -->
                     <option value="12">2/day</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity1" -->
-                    <option value="1" selected>1/day</option>
+                    <option value="1" selected="selected">1/day</option>
                 <!-- TMPL_ELSE -->
                     <option value="1">1/day</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity13" -->
-                    <option value="13" selected>3/week</option>
+                    <option value="13" selected="selected">3/week</option>
                 <!-- TMPL_ELSE -->
                     <option value="13">3/week</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity2" -->
-                    <option value="2" selected>1/week</option>
+                    <option value="2" selected="selected">1/week</option>
                 <!-- TMPL_ELSE -->
                     <option value="2">1/week</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity3" -->
-                    <option value="3" selected>1/2 weeks (2/month)</option>
+                    <option value="3" selected="selected">1/2 weeks (2/month)</option>
                 <!-- TMPL_ELSE -->
                     <option value="3">1/2 weeks (2/months)</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity4" -->
-                    <option value="4" selected>1/3 weeks</option>
+                    <option value="4" selected="selected">1/3 weeks</option>
                 <!-- TMPL_ELSE -->
                     <option value="4">1/3 weeks</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity5" -->
-                    <option value="5" selected>1/month</option>
+                    <option value="5" selected="selected">1/month</option>
                 <!-- TMPL_ELSE -->
                     <option value="5">1/month</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity6" -->
-                    <option value="6" selected>1/2 months (6/year)</option>
+                    <option value="6" selected="selected">1/2 months (6/year)</option>
                 <!-- TMPL_ELSE -->
                     <option value="6">1/2 months (6/year)</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity7" -->
-                    <option value="7" selected>1/3 months (1/quarter)</option>
+                    <option value="7" selected="selected">1/3 months (1/quarter)</option>
                 <!-- TMPL_ELSE -->
                     <option value="7">1/3 months (1/quarter)</option>
                 <!-- /TMPL_IF -->
                 <!-- periodicity8 is 1/quarter, exactly like periodicity7 but will use it for seasonal option -->
                 <!-- TMPL_IF name="periodicity8" -->
-                    <option value="8" selected>1/quarter (seasonal)</option>
+                    <option value="8" selected="selected">1/quarter (seasonal)</option>
                 <!-- TMPL_ELSE -->
                     <option value="8">1/quarter (seasonal)</option>
                 <!-- /TMPL_IF -->
 
                 <!-- TMPL_IF name="periodicity9" -->
-                    <option value="9" selected>2/years</option>
+                    <option value="9" selected="selected">2/years</option>
                 <!-- TMPL_ELSE -->
                     <option value="9">2/year</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity10" -->
-                    <option value="10" selected>1/year</option>
+                    <option value="10" selected="selected">1/year</option>
                 <!-- TMPL_ELSE -->
                     <option value="10">1/year</option>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="periodicity11" -->
-                    <option value="11" selected>1/2 years</option>
+                    <option value="11" selected="selected">1/2 years</option>
                 <!-- TMPL_ELSE -->
                     <option value="11">1/2 years</option>
                 <!-- /TMPL_IF -->
@@ -892,44 +892,44 @@ function check_input(e){
             <td>Numbering Pattern:</td>
             <td>
                 <select name="numbering_pattern" size="1" id="numberpattern" onchange="num_pattern()">
-                    <option value="" selected>-- please choose --</option>
+                    <option value="" selected="selected">-- please choose --</option>
                     <!-- TMPL_IF name="numberpattern1" -->
-                        <option value="1" selected>Number</option>
+                        <option value="1" selected="selected">Number</option>
                     <!-- TMPL_ELSE -->
                         <option value="1">Number</option>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="numberpattern2" -->
-                        <option value="2" selected>Volume, Number, Issue</option>
+                        <option value="2" selected="selected">Volume, Number, Issue</option>
                     <!-- TMPL_ELSE -->
                         <option value="2">Volume, Number, Issue</option>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="numberpattern3" -->
-                        <option value="3" selected>Volume, Number</option>
+                        <option value="3" selected="selected">Volume, Number</option>
                     <!-- TMPL_ELSE -->
                         <option value="3">Volume, Number</option>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="numberpattern4" -->
-                        <option value="4" selected>Volume, Issue</option>
+                        <option value="4" selected="selected">Volume, Issue</option>
                     <!-- TMPL_ELSE -->
                         <option value="4">Volume, Issue</option>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="numberpattern5" -->
-                        <option value="5" selected>Number, Issue</option>
+                        <option value="5" selected="selected">Number, Issue</option>
                     <!-- TMPL_ELSE -->
                         <option value="5">Number, Issue</option>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="numberpattern6" -->
-                        <option value="6" selected>Seasonal only</option>
+                        <option value="6" selected="selected">Seasonal only</option>
                     <!-- TMPL_ELSE -->
                         <option value="6">Seasonal only</option>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="numberpattern8" -->
-                        <option value="8" selected>Year/Number</option>
+                        <option value="8" selected="selected">Year/Number</option>
                     <!-- TMPL_ELSE -->
                         <option value="8">Year/Number</option>
                     <!-- /TMPL_IF -->          
                     <!-- TMPL_IF name="numberpattern7" -->
-                        <option value="7" selected>None of the above</option>
+                        <option value="7" selected="selected">None of the above</option>
                     <!-- TMPL_ELSE -->
                         <option value="7">None of the above</option>
                     <!-- /TMPL_IF -->
@@ -942,7 +942,7 @@ function check_input(e){
             <td>Begins On: (*)</td>
             <td>
                 <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="button1" style="cursor: pointer;"  />
-                <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="beginning_date" style="border-width: 0px;">
+                <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" id="beginning_date" style="border-width: 0px;">
                 <!-- both scripts for calendar must follow the input field --> 
                 <script type="text/javascript">
                     Calendar.setup({
@@ -984,7 +984,7 @@ function check_input(e){
         <td>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></td>
     </tr>
     <tr>
-    <td colspan=3>
+    <td colspan="3">
         <div id="basetable" style="display: none;">
             <table class="small">
                 <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 3a49708a35..c3789a1167 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -90,7 +90,7 @@ function irregularity(){
         <div class="edit">
             <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>
             <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a>
-            <a href="#" onclick="javascript:popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a>
+            <a href="#" onclick="popup(<!--TMPL_VAR Name="subscriptionid"-->)">Renew </a>
             <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1,3">Receive</a>
             <a href="javascript:confirm_deletion()">
                 Delete
@@ -101,7 +101,7 @@ function irregularity(){
             <!-- TMPL_IF NAME="routing" -->
             <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a>
             <!-- TMPL_ELSE -->
-            <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&op=new">Create Routing List</a>
+            <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;op=new">Create Routing List</a>
             <!-- /TMPL_IF -->
         </div>
     </div>
@@ -273,11 +273,11 @@ function irregularity(){
                 </tr>
                 <tr>
                     <td>When more than</td>
-                    <td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
+                    <td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br />
                         <i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
-                    <td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
+                    <td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br />
                         <i>(is <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
-                    <td><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
+                    <td><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br />
                         <i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
                 </tr>
                 <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
index 0b4def99d2..a615d4336b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/acceptorreject.tmpl
@@ -54,10 +54,10 @@
 		    </span>
                 </td>
                 <td>
-		<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
+		<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
                     <!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br /><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->
                 </td>
                 <td>
                     <!-- TMPL_VAR name="surnamesuggestedby" -->
@@ -100,7 +100,7 @@
                     <!-- TMPL_IF NAME="author" -->
                         , by <!-- TMPL_VAR NAME="author" -->
                     <!-- /TMPL_IF -->
-                    <br>
+                    <br />
                     <!-- TMPL_IF name="copyrightdate" -->
                         &copy <!-- TMPL_VAR name="copyrightdate" -->
                     <!-- /TMPL_IF -->
@@ -119,7 +119,7 @@
                     <!-- TMPL_IF name="place" -->
                         in <i><!-- TMPL_VAR name="place" --></i>
                     <!-- /TMPL_IF -->
-                    <br>
+                    <br />
                     <!-- TMPL_IF name="note" -->
                         <!-- TMPL VAR NAME="note" -->
                     <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
index c773799a1a..55a7e14578 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name='themelang' -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name='themelang' -->/lib/calendar/calendar-en.js"></script>
@@ -21,7 +21,7 @@
     <form name="f1" onsubmit="return checkForm(this);" action="/cgi-bin/koha/tools/cleanborrowers.pl" method="post">
     <fieldset>
     <legend>What do you want to do ?</legend>
-        <p><input id="checkborrower" type="checkbox" name="checkbox" value="borrower" checked />
+        <p><input id="checkborrower" type="checkbox" name="checkbox" value="borrower" checked="checked" />
         Delete borrower who has not borrowed since:
         <input size="10" id="date1" name="filterdate1" value="<!-- TMPL_VAR NAME="filterdate1"-->" type="text" /></p>
             <script type="text/javascript">
@@ -34,7 +34,7 @@
             </script>
         
         <br />
-        <p><input id="checkissue" type="checkbox" name="checkbox" value="issue" checked />
+        <p><input id="checkissue" type="checkbox" name="checkbox" value="issue" checked="checked" />
         Anonymize issue history older than
         <input size="10" id="date2" name="filterdate2" value="<!-- TMPL_VAR NAME="filterdate2"-->" type="text" /></p>
             <script type="text/javascript">
@@ -72,7 +72,7 @@
             <!-- TMPL_IF NAME="totalToDelete" -->
                 What do you want to do for deleted members ?<br />
                 <label for="delete">Delete completly theses members</label>
-                <input id="delete" type="radio" name="radio" value="delete" checked/>
+                <input id="delete" type="radio" name="radio" value="delete" checked="checked" />
                 
                 <label for="trash">Move to trash theses members</label>
                 <input id="trash" type="radio" name="radio" value="trash" />
@@ -86,7 +86,7 @@
             <!-- /TMPL_IF -->
             <br /><br />
             <a href="JavaScript:back();" title="go back">Cancel</a>
-            <input type="submit" value=" OK " style="float:right;"/>
+            <input type="submit" value=" OK " style="float:right;" />
             
             <input type="hidden" name="step3" value="1" />
             <input type="hidden" name="filterdate1" value="<!-- TMPL_VAR NAME="filterdate1" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
index f02cc90bdb..963c9aa0e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
@@ -11,26 +11,26 @@
 <!-- ********************** Panel for showing already loaded holidays *********************** -->
 <div class="panel" style="position:absolute;background-color:#CCCCCC" id="showHoliday">
  	<form action="/cgi-bin/koha/tools/exceptionHolidays.pl" method="post" style="display:inline">
-		<p onclick="javascript: hidePanel('showHoliday');hidePanel('information')" style="cursor:pointer">
+		<p onclick=" hidePanel('showHoliday');hidePanel('information')" style="cursor:pointer">
 			Hide Details
 			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/signClose.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle">
 		</p>
 		<p>
 			<label>Day name</label>
 			<input type="text" size="20" id="showDayname" name="showDayname" readonly
-						   style="background-color:#FFFFFF;color:Black;font-size:10px;"/>
-			<input type="hidden" name="showWeekday"/>
+						   style="background-color:#FFFFFF;color:Black;font-size:10px;" />
+			<input type="hidden" name="showWeekday" />
 		</p>
 		<p>
 			<label>Library</label>
-			<input type="text" size="20" id="showBranchName" name="showBranchName" readonly style="background-color:#FFFFFF;color:Black;font-size:10px;"/>
+			<input type="text" size="20" id="showBranchName" name="showBranchName" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
 		</p>
 		<div style="display:inline">
-			Day <input type="text" size="2" id="showDay" name="showDay" readonly style="background-color:#FFFFFF;color:Black;font-size:10px;"/>
+			Day <input type="text" size="2" id="showDay" name="showDay" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
 			Month <input type="text" size="2" id="showMonth" name="showMonth" readonly
-						        style="background-color:#FFFFFF;color:Black;font-size:10px;"/>
+						        style="background-color:#FFFFFF;color:Black;font-size:10px;" />
 			Year <input type="text" size="4" id="showYear" name="showYear" readonly
-						       style="background-color:#FFFFFF;color:Black;font-size:10px;"/>		
+						       style="background-color:#FFFFFF;color:Black;font-size:10px;" />		
 		</div>
 	    <p>Add a description to holiday day.</p>
 		<p>
@@ -39,15 +39,15 @@
 		<div id="exceptionPosibility" style="position:static">
 			<input type="radio" name="showOperation" value="exception"> Generate an exception to this holiday
 			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0"   style="vertical-align:middle;cursor:pointer"
-					onclick="javascript: additionalInformation('You can make an exception for this holiday rule. This means that you will be able to say for a repeatable holiday, that there is one of those days that is going to be an exception.')">
-			<br>
+					onclick=" additionalInformation('You can make an exception for this holiday rule. This means that you will be able to say for a repeatable holiday, that there is one of those days that is going to be an exception.')">
+			<br />
 		</div>
-		<input type="radio" name="showOperation" value="delete" checked> Delete this holiday.
+		<input type="radio" name="showOperation" value="delete" checked="checked"> Delete this holiday.
 		<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer"
-			onclick="javascript: additionalInformation('This will delete this holiday rule. In case it is a repeatable holiday, this option checks for posible exceptions. In case those exists, this option take care of set this exceptions to regular holidays.')">
+			onclick=" additionalInformation('This will delete this holiday rule. In case it is a repeatable holiday, this option checks for posible exceptions. In case those exists, this option take care of set this exceptions to regular holidays.')">
 		<p>
 			<input type="submit" name="submit" id="submit" value="Save">
-			<input type="button" name="cancel2" id="cancel2" value="Cancel" onclick="javascript: hidePanel('showHoliday');hidePanel('information')">
+			<input type="button" name="cancel2" id="cancel2" value="Cancel" onclick=" hidePanel('showHoliday');hidePanel('information')">
 		</p>
 	</form>
 </div>
@@ -60,34 +60,34 @@
 		</h2>
 		<p>
 			<label>Day name</label>
-			<input type="text" size="20" id="newDayname" name="newDayname" readonly style="background-color:#FFFFFF;color:Black;font-size:10px;"/>
-			<input type="hidden" name="newWeekday"/>
+			<input type="text" size="20" id="newDayname" name="newDayname" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
+			<input type="hidden" name="newWeekday" />
 		</p>
 		<p>
 			<label>Library</label>
-			<input type="text" size="20" id="newBranchName" name="newBranchName" readonly style="background-color:#FFFFFF;color:Black;font-size:10px;"/>
+			<input type="text" size="20" id="newBranchName" name="newBranchName" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
 		</p>
 		<div style="display:inline">
-			Day <input type="text" size="2" id="newDay" name="newDay" readonly style="background-color:#FFFFFF;color:Black;font-size:10px;"/>
-			Month <input type="text" size="2" id="newMonth" name="newMonth"  readonly style="background-color:#FFFFFF;color:Black;font-size:10px;"/>
-			Year <input type="text" size="4" id="newYear" name="newYear" readonly style="background-color:#FFFFFF;color:Black;font-size:10px;"/>
+			Day <input type="text" size="2" id="newDay" name="newDay" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
+			Month <input type="text" size="2" id="newMonth" name="newMonth"  readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
+			Year <input type="text" size="4" id="newYear" name="newYear" readonly="readonly" style="background-color:#FFFFFF;color:Black;font-size:10px;" />
 		</div>
 		<p>
 			<label>Add a description to holiday day</label>
 			<textarea rows="2" cols="40" id="newDescription" name="newDescription"></textarea>
 		</p>
-			<input type="radio" name="newOperation" value="holiday" checked> Holiday only on this day.
+			<input type="radio" name="newOperation" value="holiday" checked="checked"> Holiday only on this day.
 			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer"
-			onclick="javascript: additionalInformation('This will take this date to make it holiday just for this time. Through this option, you can set a single holiday. For example, suppose you are in August 1st, and only for this year you want to make it holiday.')">
-			<br>
+			onclick=" additionalInformation('This will take this date to make it holiday just for this time. Through this option, you can set a single holiday. For example, suppose you are in August 1st, and only for this year you want to make it holiday.')">
+			<br />
 			<input type="radio" name="newOperation" value="weekday"> Holiday repeated every same day of the week
-			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer" onclick="javascript: additionalInformation('This will take this week day and make it holiday. No matter what date it is, this option will repeat this rule for every week. For example, if this date correspond to a saturday, every saturdays will be holidays.')">
-			<br>
+			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer" onclick=" additionalInformation('This will take this week day and make it holiday. No matter what date it is, this option will repeat this rule for every week. For example, if this date correspond to a saturday, every saturdays will be holidays.')">
+			<br />
 			<input type="radio" name="newOperation" value="repeatable">Holiday repeated yearly on the same date.
-			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer" onclick="javascript: additionalInformation('This will take this day and month as a reference to make it holiday. Through this option, you can repeat this rule for every year. For example, if this date correspond to a August 1st, every August 1st will be holiday, no matter what year you are.')">
+			<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:middle;cursor:pointer" onclick=" additionalInformation('This will take this day and month as a reference to make it holiday. Through this option, you can repeat this rule for every year. For example, if this date correspond to a August 1st, every August 1st will be holiday, no matter what year you are.')">
 			<p>
-				<input type="submit" name="submit" id="submit" value="Save"/>
-				<input type="button" name="cancel2" id="cancel2" value="Cancel" onclick="javascript: hidePanel('newHoliday');hidePanel('information')">
+				<input type="submit" name="submit" id="submit" value="Save" />
+				<input type="button" name="cancel2" id="cancel2" value="Cancel" onclick=" hidePanel('newHoliday');hidePanel('information')">
 			</p>
  	</form>
 </div>
@@ -103,7 +103,7 @@
 <!-- ******                     START OF INFORMATION PANEL                            ****** -->
 <!-- *************************************************************************************** -->
 
-<div class="information" style="position:absolute" id="information" onclick="javascript: hidePanel('information')" onblur="javascript: hidePanel('information')">
+<div class="information" style="position:absolute" id="information" onclick=" hidePanel('information')" onblur="javascript: hidePanel('information')">
 	<table>
 		<tr>
 			<td valign="top">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index a21a754119..c310d749d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
@@ -16,7 +16,7 @@
         <label>Branch</label><select id="branchloop" name="branchcode">
         <!-- TMPL_LOOP NAME="branchloop" -->
             <!-- TMPL_IF name="selected" -->
-                <option value="<!-- TMPL_VAR NAME='value' -->" SELECTED><!-- TMPL_VAR NAME='branchname' --></option>
+                <option value="<!-- TMPL_VAR NAME='value' -->" selected="selected"><!-- TMPL_VAR NAME='branchname' --></option>
             <!-- TMPL_ELSE -->
                 <option value="<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
             <!-- /TMPL_IF -->
@@ -36,7 +36,7 @@
                 <option value="">Filter location</option>
         <!-- TMPL_LOOP NAME="authorised_values" -->
             <!-- TMPL_IF name="selected" -->
-                <option value="<!-- TMPL_VAR NAME='authorised_value' -->" selected><!-- TMPL_VAR NAME='lib' --></option>
+                <option value="<!-- TMPL_VAR NAME='authorised_value' -->" selected="selected"><!-- TMPL_VAR NAME='lib' --></option>
             <!-- TMPL_ELSE -->
                 <option value="<!-- TMPL_VAR NAME='authorised_value' -->"><!-- TMPL_VAR NAME='lib' --></option>
             <!-- /TMPL_IF -->
@@ -63,7 +63,7 @@
         </p>
         <p>
             <input type="hidden" name="op" value="do_it" />
-            <input type="submit" value="OK" class="button reports"/>
+            <input type="submit" value="OK" class="button reports" />
         </p>
         </fieldset>
     </form>
@@ -123,7 +123,7 @@
                 <!-- TMPL_VAR NAME="barcode" -->
             </td>
             <td>
-                <p><b><!-- TMPL_VAR NAME="itemcallnumber" --></b> - <a href=# onclick="javascript:window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->','Catalogue -- Biblio <!--TMPL_VAR Name="biblionumber"-->','width=800,height=600,toolbar=false');"><!-- TMPL_VAR NAME="title" --></a></p>
+                <p><b><!-- TMPL_VAR NAME="itemcallnumber" --></b> - <a href=# onclick="window.open('/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->','Catalogue -- Biblio <!--TMPL_VAR Name="biblionumber"-->','width=800,height=600,toolbar=false');"><!-- TMPL_VAR NAME="title" --></a></p>
                 <p><!-- TMPL_VAR NAME="author" --></p>
             </td>
             <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl
index bfc189bf2b..5c1955e48e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/itemslost.tmpl
@@ -53,7 +53,7 @@
     </tr>
     <tr>
         <td>
-            <input type="text" name="barcodefilter" size="6"/>
+            <input type="text" name="barcodefilter" size="6" />
         </td>
         <td>
             <!-- datelastseen -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
index cd52ef984c..829e06b377 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
@@ -14,7 +14,7 @@
 <!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
 <div id="koha-news_main" class="searchresults">
-    <h1> OPAC & KOHA News</h1>
+    <h1> OPAC &amp; KOHA News</h1>
     <!-- TMPL_IF name="add_form" -->
         <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
             <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
@@ -25,7 +25,7 @@
                 <option value="koha">Librarian interface</option>
                 <!-- TMPL_LOOP name="lang_list" -->
                     <!-- TMPL_IF name="selected" -->
-                        <option value="<!-- TMPL_VAR name="language" -->" selected>
+                        <option value="<!-- TMPL_VAR name="language" -->" selected="selected">
                     <!-- TMPL_ELSE -->
                         <option value="<!-- TMPL_VAR name="language" -->">
                     <!-- /TMPL_IF -->
@@ -40,7 +40,7 @@
             </p>
             <p>
                 <label for="expirationdate">Expiration date</label>
-                <input id="expirationdate" type="text" name="expirationdate" value="<!-- TMPL_VAR NAME="expirationdate" -->"/>
+                <input id="expirationdate" type="text" name="expirationdate" value="<!-- TMPL_VAR NAME="expirationdate" -->" />
                 <script type="text/javascript">
                     Calendar.setup(
                     {
@@ -117,7 +117,7 @@
                                 <!-- TMPL_VAR NAME="new" -->
                             </td>
                             <td>
-                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=<!-- TMPL_VAR NAME="idnew" -->">
+                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=<!-- TMPL_VAR NAME="idnew" -->">
                                     Edit
                                 </a>
                             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
index 54bd931c31..e59bd69b06 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -9,7 +9,7 @@
 		<input type="text" name="searchfield" value="">
 		<input type="submit" class="button" value="Filter"></form>
 		<!-- TMPL_IF NAME="search" -->
-		<br>You Searched for <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br>
+		<br />You Searched for <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br />
 		<!-- /TMPL_IF -->
 		<table>
 		<tr>
@@ -35,9 +35,9 @@
 		</table>
 		<form action="/cgi-bin/koha/tools/letter.pl" method="post">
 			<input type="hidden" name="op" value="add_form">
-			<br>
+			<br />
 			<input type="submit" class="button" value="Add Letter" title="Add Letter" alt="Add Letter">
-			<br>
+			<br />
 		</form>
 		<br clear="all">
 	<!-- /TMPL_IF -->
@@ -146,32 +146,32 @@
 				<label class="label100">Koha module:</label>
 				<select name="module">
                                     <!--TMPL_IF Name="catalogue"-->
-                                    <option value="catalogue" selected>Catalogue</option>
+                                    <option value="catalogue" selected="selected">Catalogue</option>
                                     <!--TMPL_ELSE-->
                                     <option value="catalogue" >Catalogue</option>
                                     <!--/TMPL_IF-->
                                     <!--TMPL_IF Name="Serial"-->
-                                    <option value="serial" selected>Serial</option>
+                                    <option value="serial" selected="selected">Serial</option>
                                     <!--TMPL_ELSE-->
                                     <option value="serial">Serial</option>
                                     <!--/TMPL_IF-->
                                     <!--TMPL_IF Name="claimacquisition"-->
-                                    <option value="claimacquisition" selected>Claim Acquisition</option>
+                                    <option value="claimacquisition" selected="selected">Claim Acquisition</option>
                                     <!--TMPL_ELSE-->
                                     <option value="claimacquisition">Claim Acquisition</option>
                                     <!--/TMPL_IF -->
                                     <!--TMPL_IF Name="claimissues"-->
-                                    <option value="claimissues" selected>Claim Issues</option>
+                                    <option value="claimissues" selected="selected">Claim Issues</option>
                                     <!--TMPL_ELSE-->
                                     <option value="claimissues">Claim Issues</option>
                                     <!--/TMPL_IF-->
                                     <!--TMPL_IF Name="circulation"-->
-                                    <option value="circulation" selected>Circulation</option>
+                                    <option value="circulation" selected="selected">Circulation</option>
                                     <!--TMPL_ELSE-->
                                     <option value="circulation">Circulation</option>
                                     <!--/TMPL_IF-->
                                     <!--TMPL_IF Name="members"-->
-                                    <option value="members" selected>Members</option>
+                                    <option value="members" selected="selected">Members</option>
                                     <!--TMPL_ELSE-->
                                     <option value="members">Members</option>
                                     <!--/TMPL_IF-->
@@ -187,32 +187,32 @@
 				<label class="label100">Koha module:</label>
 				<select name="module" onchange="javascript:window.location.href = unescape(window.location.pathname)+'?op=add_form&amp;module='+this.value+'&amp;content='+window.document.forms['Aform'].elements['content'].value;">
 						<!--TMPL_IF Name="catalogue"-->
-                        <option value="catalogue" selected>Catalogue</option>
+                        <option value="catalogue" selected="selected">Catalogue</option>
 						<!--TMPL_ELSE-->
                         <option value="catalogue" >Catalogue</option>
                         <!--/TMPL_IF-->
 						<!--TMPL_IF Name="serial"-->
-						<option value="serial" selected>Serial</option>
+						<option value="serial" selected="selected">Serial</option>
 						<!--TMPL_ELSE-->
 						<option value="serial">Serial</option>
 						<!--/TMPL_IF-->
 						<!--TMPL_IF Name="claimacquisition"-->
-						<option value="claimacquisition" selected>Claim Acquisition</option>
+						<option value="claimacquisition" selected="selected">Claim Acquisition</option>
 						<!--TMPL_ELSE-->
 						<option value="claimacquisition">Claim Acquisition</option>
 						<!--/TMPL_IF -->
 						<!--TMPL_IF Name="claimissues"-->
-						<option value="claimissues" selected>Claim Issues</option>
+						<option value="claimissues" selected="selected">Claim Issues</option>
 						<!--TMPL_ELSE-->
 						<option value="claimissues">Claim Issues</option>
 						<!--/TMPL_IF-->
 						<!--TMPL_IF Name="circulation"-->
-						<option value="circulation" selected>Circulation</option>
+						<option value="circulation" selected="selected">Circulation</option>
 						<!--TMPL_ELSE-->
 						<option value="circulation">Circulation</option>
 						<!--/TMPL_IF-->
 						<!--TMPL_IF Name="members"-->
-						<option value="members" selected>Members</option>
+						<option value="members" selected="selected">Members</option>
 						<!--TMPL_ELSE-->
 						<option value="members">Members</option>
 						<!--/TMPL_IF-->
@@ -233,7 +233,7 @@
 			<label class="label100">Content (mail content):</label>
 		</p>
 		<p>		
-		<select name="SQLfieldname" size=9>
+		<select name="SQLfieldname" size="9">
 			<!-- TMPL_LOOP name="SQLfieldname" -->
 				<option value="<!-- TMPL_VAR name="value"-->"><!-- TMPL_VAR name="text"--></option>
 			<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
index 46d35bebf9..3f389d5a90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tmpl
@@ -63,7 +63,7 @@
 <!-- TMPL_ELSE -->
    <td>
 <!-- /TMPL_IF -->
-						<!--TMPL_IF Name="noletter" --><input type="text" name="letter1-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter1"-->"/>
+						<!--TMPL_IF Name="noletter" --><input type="text" name="letter1-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter1"-->" />
 						<!--TMPL_ELSE -->
 							<select name="letter1-<!-- TMPL_VAR NAME="overduename" -->">
 								<option value="">Default</option>
@@ -98,7 +98,7 @@
 <!-- TMPL_ELSE -->
    <td>
 <!-- /TMPL_IF -->
-						<!--TMPL_IF Name="noletter" --><input type="text" name="letter2-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter2"-->"/>
+						<!--TMPL_IF Name="noletter" --><input type="text" name="letter2-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter2"-->" />
 						<!--TMPL_ELSE -->
 							<select name="letter2-<!-- TMPL_VAR NAME="overduename" -->">
 								<option value="">Default</option>
@@ -134,7 +134,7 @@
 <!-- TMPL_ELSE -->
    <td>
 <!-- /TMPL_IF -->
-						<!--TMPL_IF Name="noletter" --><input type="text" name="letter3-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter3"-->"/>
+						<!--TMPL_IF Name="noletter" --><input type="text" name="letter3-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter3"-->" />
 						<!--TMPL_ELSE -->
 							<select name="letter3-<!-- TMPL_VAR NAME="overduename" -->">
 								<option value="">Default</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl
index 69ce967205..c970e188df 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/printerConfig.tmpl
@@ -9,7 +9,7 @@
 		<li>Select how many columns and rows are in your page type.</li>
 		<li>Set left- and bottom-margins of the page that you are going to use. This parameter will help to center the barcodes on the labels.</li>
 	</ul>
-	<br>
+	<br />
 	<form id="formulario" method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1">
 		<input type="hidden" name="saveSettings" value="1" />
 		<table>
@@ -17,65 +17,57 @@
 				<th scope="row">
 					Label width (Expressed in mm)
 				</th><td> 
-					<input id="labelWidth" type="text" name="labelWidth" size="5"
-					       value="<!-- TMPL_VAR NAME="LABEL_WIDTH" -->">
+					<input id="labelWidth" type="text" name="labelWidth" size="5" value="<!-- TMPL_VAR NAME="LABEL_WIDTH" -->">
 				</td></tr>
 				<th scope="row">
 					Label heigth (Expressed in mm)
 				</th><td> 
-					<input id="labelHeigth" type="text" name="labelHeigth" size="5"
-					       value="<!-- TMPL_VAR NAME="LABEL_HEIGTH" -->">
+					<input id="labelHeigth" type="text" name="labelHeigth" size="5" value="<!-- TMPL_VAR NAME="LABEL_HEIGTH" -->">
 				</td></tr>
 				<th scope="row">
 					System dpi
 				</th><td>
-					<input id="systemDpi" type="text" name="systemDpi" size="5"
-					       value="<!-- TMPL_VAR NAME="SYSTEM_DPI" -->">
+					<input id="systemDpi" type="text" name="systemDpi" size="5" value="<!-- TMPL_VAR NAME="SYSTEM_DPI" -->">
 				</td></tr>
 				<th scope="row">
 					Page Type
 				</th>	<td>
 					<select name="pageType" id="pageType" size="1">
 						<!-- TMPL_IF name="A4" -->
-							<option value="A4" selected>A4</option>
+							<option value="A4" selected="selected">A4</option>
 				        <!-- TMPL_ELSE -->
 							<option value="A4">A4</option>
 						<!-- /TMPL_IF -->
 						<!-- TMPL_IF name="Letter" -->
-							<option value="Letter" selected>Letter</option>
+							<option value="Letter" selected="selected">Letter</option>
 				        <!-- TMPL_ELSE -->
 							<option value="Letter">Letter</option>
 						<!-- /TMPL_IF -->
 						<!-- TMPL_IF name="Legal" -->
-							<option value="Legal" selected>Legal</option>
+							<option value="Legal" selected="selected">Legal</option>
 				        <!-- TMPL_ELSE -->
 							<option value="Legal">Legal</option>
-						<!-- /TMPL_IF -->
-		            </select>
+						<!-- /TMPL_IF -->    </select>
 				</td></tr>
 				<th scope="row">
 					Columns
 				</th>  <td>
-					<input id="columns" type="text" name="columns" size="5"
-					       value="<!-- TMPL_VAR NAME="COLUMNS" -->">
+					<input id="columns" type="text" name="columns" size="5" value="<!-- TMPL_VAR NAME="COLUMNS" -->">
 				</td></tr>
 				<th scope="row">
 					Rows
 				</th>   <td>
-					<input id="rows" type="text" name="rows" size="5"
-					       value="<!-- TMPL_VAR NAME="ROWS" -->">
+					<input id="rows" type="text" name="rows" size="5" value="<!-- TMPL_VAR NAME="ROWS" -->">
 				</td></tr>
 				<th scope="row">
 					Margin Bottom (Expressed in mm)
 				</th>   <td>
-					<input id="marginBottom" type="text" name="marginBottom" size="5"
-					       value="<!-- TMPL_VAR NAME="MARGIN_TOP" -->">
+					<input id="marginBottom" type="text" name="marginBottom" size="5" value="<!-- TMPL_VAR NAME="MARGIN_TOP" -->">
 				</td></tr>
 				<th scope="row">
 					Margin Left (Expressed in mm)
 				</th>   <td>
-					<input id="marginLeft" type="text" name="marginLeft" size="5"
-					       value="<!-- TMPL_VAR NAME="MARGIN_LEFT" -->">
+					<input id="marginLeft" type="text" name="marginLeft" size="5" value="<!-- TMPL_VAR NAME="MARGIN_LEFT" -->">
 				</td></tr>
 			</table><input type="submit" value="Save Settings" />
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
index 960ca0915e..34495cc289 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- Additions to enable Calendar system -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css" />
 <!-- End of additions --><!-- Additions to enable Calendar system -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
@@ -20,7 +20,7 @@
 <fieldset>
     <legend>Additional infos</legend>
         <p>
-         Display from <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="datefrom"-->"/>
+         Display from <input type="text" size="10" id="from" name="from" value="<!-- TMPL_VAR NAME="datefrom"-->" />
 							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
 								<script language="JavaScript" type="text/javascript">
 									function validate1(date) {
@@ -49,7 +49,7 @@
 										}
 									);
 								</script>
-					to <input size="10" id="to" name="to" type="text" value="<!-- TMPL_VAR NAME="dateto"-->"/>
+					to <input size="10" id="to" name="to" type="text" value="<!-- TMPL_VAR NAME="dateto"-->" />
 						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
 					<script type="text/javascript">
 						function validate2(date) {
@@ -82,7 +82,7 @@
 		<p><b>Export into</b></p>
         <input id="screen" type="radio" checked name="output" value="screen" />
         <label for="screen" >To screen into the browser</label>
-		<br>
+		<br />
 		<input id="file" type="radio" name="output" value="file" />
 		 <label for="file">To file</label>
 		<input type="text" name="basename" value="Export"> into an application  
@@ -122,7 +122,7 @@
 	    </td>
 	    <td>
 	        <select name="module">
-			    <option value="" checked>All</option>
+			    <option value="" checked="checked">All</option>
 			    <option value ="CATALOGUING">Catalogue</option>
 				<option value ="MEMBERS">Members</option>
 				<option value ="ACQUISITION">Acquisitions</option>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl
index bc71214205..d0b0a4ffd2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl
@@ -26,7 +26,7 @@
             <label for="newvirtualshelf">
                 Shelf name:
             </label>
-			<input type="hidden" name="biblionumber" id="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"/>
+			<input type="hidden" name="biblionumber" id="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
             <input type="text" name="newvirtualshelf" id="newvirtualshelf" size="40" />
         </p>
         <p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index da30f5b295..fda880b7ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -9,7 +9,7 @@
 <div id="action">
     <a class="button" href="/cgi-bin/koha/virtualshelves/shelves.pl">Back to virtual Shelves</a>
     <!-- TMPL_IF name="manageshelf" -->
-    <a class="button" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelfnumber" -->">
+    <a class="button" href="/cgi-bin/koha/virtualshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelfnumber" -->">
         Edit this shelf</a>
     <!-- /TMPL_IF -->
 </div>
@@ -76,8 +76,7 @@
     <!-- TMPL_IF name="manageshelf" -->
         <!-- TMPL_IF NAME="itemsloop" -->
             <b>With selected items :</b>
-            <input type="submit"
-                   value="Remove"
+            <input type="submit" "Remove"
                    class="icon delete"
                    onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')"
                    style="display:inline;"
@@ -174,16 +173,16 @@
             <tr><td><label for="owner">Owner: </label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
             <tr><td><label for="category">Category: </label></td><td><select id="category" name="category">
                     <!-- TMPL_IF name="category1" -->
-                        <option value="1" selected>Private</option>
+                        <option value="1" selected="selected">Private</option>
                     <!-- TMPL_ELSE -->
                         <option value="1">Private</option>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="category2" -->
-                        <option value="2" selected>Public</option>
+                        <option value="2" selected="selected">Public</option>
                     <!-- TMPL_ELSE -->
                         <option value="2">Public</option>
 					<!-- TMPL_IF NAME="category3" -->
-						<option value="3" selected>Free</option>
+						<option value="3" selected="selected">Free</option>
 					<!-- TMPL_ELSE -->
 						<option value="3">Free</option>
                     <!-- /TMPL_IF -->
-- 
2.39.2