diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc b/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc
index 649ee31f11..d71a016e2b 100644
--- a/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc
@@ -1,19 +1,14 @@
 	<!-- MENUS -->
-	<div id="menuline" style="font-size:11pt;margin-top:20px;margin-bottom:20px;">
-		<span class="spacer">&nbsp;</span>
-		<A href='javascript:delBasket()' class="menu">Empty</A>
-		<span class="basketspacer">&nbsp;</span>
-		<A href='javascript:delSelRecords()' class="menu">Remove selection</A>
-		<span class="basketspacer">&nbsp;</span>
-		<A href='javascript:sendBasket()' class="menu">Send</A>
-		<span class="basketspacer">&nbsp;</span>
-		<A href='javascript:printBasket()' class="menu">Print</A>
-		<span class="basketspacer">&nbsp;</span>
-		<A href='javascript:quit()' class="menu">Close</A>
+	<div id="menuline" style="font-size:11pt;margin-top:20px;margin-bottom:20px;padding-left:0px;">
+		<a href='javascript:delBasket()' class="menu">Empty</A>
+		<a href='javascript:delSelRecords()' class="menu">Remove selection</A>
+		<a href='javascript:sendBasket()' class="menu">Send</A>
+		<a href='javascript:printBasket()' class="menu">Print</A>
+		<a href='javascript:quit()' class="menu">Close</A>
 		<!-- TMPL_IF NAME="verbose" -->
-			<a href="javascript:showLess()" class="menu">Brief Display</a>
+			<a href="javascript:showLess()" class="menu">Brief</a>
 		<!-- TMPL_ELSE -->
-			<a href="javascript:showMore()" class="menu">More Details</a>
+			<a href="javascript:showMore()" class="menu">Details</a>
 		<!-- /TMPL_IF -->
 
 	</div>
diff --git a/koha-tmpl/opac-tmpl/css/en/includes/opac.css b/koha-tmpl/opac-tmpl/css/en/includes/opac.css
index 2aa930a590..feaf956e92 100644
--- a/koha-tmpl/opac-tmpl/css/en/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/css/en/includes/opac.css
@@ -1,5 +1,11 @@
+/*
+	blue/green : # 009999
+	light-blue/green : #ACE6E6
+	orange : #FFB380
+	light orange : #FFD9BF
+*/
 body {
-	background-color:#009999;
+	background-color:#006b6b;
 	font-family:verdana,arial,helvetica,sans-serif;
 	font-size:12pt;
 	margin:0px;
@@ -8,8 +14,9 @@ body {
 
 /* base tags */
 a {
-	background-color: #ACE6E6;
+	background-color: #FFD9BF;
 	text-decoration:none;
+/* 	padding:2px 2px; */
 	color:#000000;
 }
 
@@ -20,11 +27,7 @@ a.transparent {
 }
 
 a:hover {
-/* 	background-color: #FF6600; */
-	background-image: url(/opac-tmpl/css/en/images/bar.gif);
-	background-repeat:repeat-y;
-	text-decoration:none;
-	color:#000000;
+	background-color: #FFB380;
 }
 
 /* the page result number */
@@ -35,7 +38,7 @@ a.results {
 }
 
 a.results:hover {
-	background-color: #FFFFCC;
+	background-color: #FFB380;
 	padding : 0px 2px 0px 2px;
 	margin : 2px 1px 2px 0px;
 }
@@ -65,25 +68,26 @@ img {
 /* main title */
 h1 {
 	color:#FFD9BF;
-	background-color:#FF6600;
+	background-color:#006b6b;
 	font-weight:bold;
 	font-size: 150%;
 	text-align:center;
-	padding: 2px;
-	border: 4px inset #FFD9BF;
-	width:60%;
+	padding: 5px;
+	margin:0px 25% 10px 25%;
+	border: 1px solid black;
+	width:50%;
 }
 
 /* style for library name, on top of menu (defined in LibraryName systempref) */
 /* in opac-main page */
 .LibraryName {
-	color:#FFD9BF;
-	background-color:transparent;
+	color:#000000;
+	background-color:#FFD9BF;
 	font-weight:bold;
 	font-size: 150%;
 	text-align:center;
 	padding: 2px;
-	border: 4px inset #FF6600;
+	border: 1px solid #000000;
 	width:75%;
 }
 
@@ -101,10 +105,10 @@ h1 {
 /* subtitles. headers of blocks */
 h2 {
 	color:#000000;
-	background-image: url(/opac-tmpl/css/en/images/bar.gif);
-	background-repeat:repeat-y;
+	background-color:#009999;
 	font-weight:bold;
 	font-size: 125%;
+	width:100%;
 	margin: 0px 0px 10px 0px;
 }
 
@@ -118,7 +122,8 @@ h3 {
 
 /* paragraphs */
 p {
-	padding-left:10pt;
+	padding-left:10px;
+	padding-right:10px;
 	padding-bottom:0pt;
 	margin:0pt;
 	clear:left;
@@ -148,7 +153,6 @@ table {
 /* header */
 th {
 	background-color: #99cccc;
-	background-image: url(/opac-tmpl/css/en/images/background-opac.gif);
 	font-weight:bold;
 	text-align:center;
 	font-size:10pt;
@@ -184,14 +188,11 @@ tr.hilighted td, td.hilighted {
 .button {
 	text-align: center;
 	padding: 2px 2px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: black;
+	border-bottom:1px solid #FFB380;
+	border-left: 3px solid #FFB380;
 	text-decoration: none;
 	color: black;
 	line-height:175%;
-	border-radius: 6px;
-	-moz-border-radius: 6px;
 	background-color:#FFD9BF;
 	margin : 3px 3px 3px 0px;
 }
@@ -199,60 +200,42 @@ tr.hilighted td, td.hilighted {
 .button:hover {
 	text-align: center;
 	padding: 2px 2px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: black;
+	border-bottom:1px solid #FFB380;
+	border-left: 3px solid #FFB380;
 	text-decoration: none;
 	color: black;
 	line-height:175%;
-	border-radius: 6px;
-	-moz-border-radius: 6px;
-	background-color:#FF6600;
-	background-image: url(/opac-tmpl/css/en/images/bar.gif);
-	background-repeat:no-repeat;
+	background-color:#FFB380;
 	margin : 3px 3px 3px 0px;
 }
 
 /* standard input field */
 input {
-	border:0px;
-	border-bottom:1px solid #000000;
+	border:1px solid #888888;
 	margin-bottom:2px;
-	background-color:#009999;
+	background-color:#FFFFFF;
 }
-
 input:hover {
-	border:0px;
-	border-bottom:1px solid #000000;
-	background-color:#FF6600;
+	border:1px solid #000000;
 }
 
 /* textarea input field */
 textarea {
 	border:0px;
-	border-bottom:1px solid #000000;
-	background-color:#009999;
-}
-textarea:hover {
-	border:0px;
-	border-bottom:1px solid #000000;
-	background-color:#FF6600;
+	border:1px solid #888888;
+	background-color:#FFFFFF;
 }
 
+textarea:hover {
+	border:1px solid #000000;
+}
 /* select input field */
 select {
 	border:0px;
-	border-bottom:1px solid #000000;
-	background-color:#009999;
+	border:1px solid #888888;
+	background-color:#FFFFFF;
 }
 
-select:hover {
-	border:0px;
-	border-bottom:1px solid #000000;
-	background-color:#FF6600;
-}
-
-
 /* span classes */
 /* used to show small 1,2,3, to reach other pages when too much results */
 .smallnumber {
@@ -265,7 +248,7 @@ select:hover {
 }
 
 .smallnumberactive {
-	background-color:#FF6600;
+	background-color:#FFB380;
 	font-family:Times,serif;
 	font-size:small;
 	border:1px solid #000000;
@@ -301,8 +284,9 @@ select:hover {
 }
 
 #homebloc {
-	float:left;
-	width:60%;
+	float:right;
+	width:65%;
+	margin-right:10px;
 	border:0;
 }
 
@@ -325,16 +309,14 @@ select:hover {
 #bloc20, .bloc20 {
 	float:left;
 	border:1px solid #000000;
-	margin-right:20px;
-	margin-bottom:20px;
-	padding-right:20px;
+	padding-bottom:10px;
+	margin-bottom:10px;
 }
 #bloc60, .bloc60 {
 	float:left;
 	border:1px solid #000000;
-	margin-right:20px;
-	margin-bottom:20px;
-	padding-right:20px;
+	padding-bottom:10px;
+	margin-bottom:10px;
 }
 
 /* used in biblio detail */
@@ -347,7 +329,8 @@ select:hover {
 
 #itembloc {
 	float:left;
-	width:50%;
+	padding-left:10px;
+/* 	width:50%; */
 	border:0;
 }
 
@@ -356,9 +339,7 @@ select:hover {
 	border:1px solid #000000;
 	padding-left:10pt;
 	padding-right:10pt;
-/* 	float:left; */
 	margin-bottom:10px;
-	-moz-border-radius: 6px;
 	display:inline;
 }
 
@@ -370,6 +351,7 @@ select:hover {
 #menuline {
 	display:block;
 	margin-left:100px;
+	margin-bottom:20px;
 }
 
 #bibliomenu {
@@ -448,10 +430,10 @@ div.tab {
 
 .MARCtag { /* style for tag definition (700 - Statement of responsability) */
 	font-weight:bold;
-	color:#FF6600;
+	color:#FFB380;
 	background-color:#FFFFFF;
 	background-image:none;
-	border-bottom: thin solid #FF6600;
+	border-bottom: thin solid #FFB380;
 	margin-right:30%;
 }
 
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
index b5388f78f4..9386e9d3c5 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl
@@ -69,15 +69,18 @@
 					<p><label><b>Subjects:</b></label></p>
 					<p>
 						<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
-							<label>-</label><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
-								<!-- TMPL_VAR NAME="marcsubjct" -->
-							</a><br>
+							<p><label>-</label>
+							<!-- TMPL_IF name="linkvalue" -->
+								<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR name="link" -->&and_or=and&operator==&value=<!-- TMPL_VAR NAME="linkvalue" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a>, </p>
+							<!-- TMPL_ELSE -->
+								<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=start&value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a>, </p>
+							<!-- /TMPL_IF -->
 						<!-- /TMPL_LOOP -->
 					</p>
 				<!-- TMPL_ELSE -->
 					<!-- TMPL_IF name="subjects" --><p><label><b>Subject(s):</b> </label></p>
 						<!-- TMPL_LOOP name="subjects" -->
-							<p><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator==&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, </p> <!-- /TMPL_LOOP -->
+							<p><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=start&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, </p> <!-- /TMPL_LOOP -->
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF name="copyrightdate" --><p><label><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p><!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-full-serial-issues.tmpl
index 066a584465..58fc1374e4 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-full-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-full-serial-issues.tmpl
@@ -18,11 +18,11 @@
 	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tabsub" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
 		<table>
 			<tr>
-				<th> Date
+				<th>Date
 				</th>
-				<th> Number
+				<th>Number
 				</th>
-				<th> Status
+				<th>Status
 				</th>
 			</tr>
 			<!-- TMPL_LOOP Name="serials" -->
@@ -34,10 +34,11 @@
 					<!-- TMPL_VAR Name="serialseq" -->
 				</td>
 				<td>
-					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
-					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="status1" -->Waited<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="status2" -->Arrived<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
 				</td>
 			</tr>
 			<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-passwd.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-passwd.tmpl
index 4340535ea6..695b002476 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-passwd.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-passwd.tmpl
@@ -1,6 +1,8 @@
 <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <div id="mainbloc">
 
+<!-- TMPL_IF NAME= "Ask_data" -->
+<h1>Change your Password</h1>
 <!-- TMPL_IF NAME= "Error_messages" -->
 <h3>There was a problem with your submission</h3>
 <p class="error">
@@ -15,8 +17,6 @@
 	<!-- /TMPL_IF --></p>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME= "Ask_data" -->
-<h1>Change your Password</h1>
 <form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="get">
 <p><label for="password">Current Password:</label><input type="password" id="Oldkey" size="25"  name="Oldkey" /></p>
 <p><label for="Newkey">New Password:</label><input type="password" id="Newkey"  size="25"  name="Newkey" /></p>
diff --git a/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl
index 63058ac8af..d201ce607c 100644
--- a/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl
@@ -11,17 +11,27 @@
 		<p><!-- TMPL_IF name="faxnumber" -->Fax: <!-- TMPL_VAR NAME="faxnumber" --><!-- /TMPL_IF --></p>
 		<p><!-- TMPL_VAR NAME="emailaddress" --></p>
 		<p><a href="/cgi-bin/koha/opac-userupdate.pl" class="button">Update Record</a></p>
+		<p><a href="/cgi-bin/koha/opac-passwd.pl" class="button">Change your password</a></p>
 		<!-- TMPL_IF name="textmessaging"-->
 			<h2>Message from the library</h2>
 			<!-- TMPL_VAR name="textmessaging" -->
 		<!-- /TMPL_IF --></div>
 		
-		<!-- TMPL_IF NAME="flagged" --><div class="bloc20">
-		<h2>There are flags on your account!</h2>
-		<!-- TMPL_IF NAME="debarred" --><p><strong>Please note:</strong> Your account has been frozen. Usually the reason for freezing an account is old overdues or damage fees.  If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</p><!--
- /TMPL_IF -->
- <!-- TMPL_IF NAME="gonenoaddress" --><p><strong>Please note:</strong> According to our records, we don't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.  Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)</p><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" --><p><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</p><!-- /TMPL_IF --></div><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="flagged" -->
+		<div class="bloc20">
+			<h2>There are flags on your account!</h2>
+			<!-- TMPL_IF NAME="debarred" -->
+				<p><strong>Please note:</strong> Your account has been frozen. Usually the reason for freezing an account is old overdues or damage fees.
+			If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="gonenoaddress" -->
+				<p><strong>Please note:</strong> According to our records, we don't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.  Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="lost" -->
+				<p><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</p>
+			<!-- /TMPL_IF -->
+		</div>
+		<!-- /TMPL_IF -->
 
 	
 	<!-- TMPL_IF NAME="amountoverfive" -->