diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 5caa17f2e1..d64dfcf7d7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -9,3 +9,11 @@
 <div id="masthead">
         <!-- TMPL_VAR NAME="LibraryName" -->
 </div>
+<div id="opac-main-search">
+    <label for="masthead_search">Search</label>
+    <form name="searchform" method="POST" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+        <input type="text" name="q" style="width: 30%;"/>
+        <input type="submit" value="Search" class="submit" />
+    </form>
+    <a href="/cgi-bin/koha/opac-search.pl">more search options</a>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
index edb5254c59..bef46cbce9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
@@ -32,27 +32,6 @@
             <!-- /TMPL_IF -->
         </ul>
         <br />
-    <div id="login">
-        <!-- TMPL_IF NAME="loggedinusername" -->
-            <a href="/cgi-bin/koha/opac-user.pl"><b>User Info</b></a>
-            <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></li>
-            <li><a href="/cgi-bin/koha/opac-logout.pl?logout=Log Out">Log Out</a></li>
-        <!-- TMPL_ELSE -->
-            <form action="/cgi-bin/koha/opac-user.pl" method="POST" name="auth" id="auth">
-                <li>
-                    <label for="userid">Login:</label>
-                    <input type="text" id="userid" size="10" name="userid" />
-                </li>
-                <li>
-                    <label for="password">Pass: </label>
-                    <input type="password" id="password" size="10" name="password" />
-                </li>
-                <li>
-                    <input type="submit" value="Log In" class="submit" />
-                </li>
-                </form>
-        <!-- /TMPL_IF -->
-    </div>
  </div>
 
  <div id="main"> <!-- MAIN Body start here -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
index ccb00ad69f..86e150037d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
@@ -1,5 +1,21 @@
 </div>
-
+<div id="login">
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="/cgi-bin/koha/opac-user.pl"><b>User Info</b></a>
+        <p>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></p>
+        <p><a href="/cgi-bin/koha/opac-logout.pl?logout=Log Out">Log Out</a></p>
+    <!-- TMPL_ELSE -->
+        <form action="/cgi-bin/koha/opac-user.pl" method="POST" name="auth" id="auth">
+            <p>Login:</p>
+            <input type="text" id="userid" size="10" name="userid" />
+            <p>Pass:</p>
+            <input type="password" id="password" size="10" name="password" />
+            <p>
+                <input type="submit" value="Log In" class="submit" />
+            </p>
+            </form>
+    <!-- /TMPL_IF -->
+</div>
 <!-- TMPL_IF NAME="opaccredits" -->
     <div id="footer">
         <!-- TMPL_VAR NAME="opaccredits" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac.css b/koha-tmpl/opac-tmpl/prog/en/includes/opac.css
index 31971097cd..a6a2896fd5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac.css
@@ -1,8 +1,14 @@
 /* color scheme :
+- #6699CC smooth blue for buttons background
+- #FFFFCC smooth yellow for button text
+- grey (
+
+- #990033 (red) for hovered links
 - #384b73 : light blue, for menus, text enhancement, footer & header
+
 - #eeeeee : light grey, for background color
 - #CCCCCC : for table backgrounds
-- #EEC95A : orange for action buttons & hyperlinks
+- #6BA037 : green for action buttons
 */
 
 /* attribute for standard html tags */
@@ -10,7 +16,7 @@
 body {
     font-family : Verdana, Geneva, Arial, sans-serif;
     font-size : 1em;
-    background-color : #eeeeee;
+    background-color : white;
     text-align: left;
     margin-bottom:0px;
 }
@@ -22,6 +28,14 @@ h1 {
     text-align:left;
 }
 
+h2 {
+    color:#384b73;
+}
+
+h3 {
+    color:#384b73;
+}
+
 p {
     margin:0px;
     padding:0px;
@@ -29,12 +43,11 @@ p {
 }
 
 label {
-    font-style:italic;
     vertical-align:top;
     display:block;
     float:left;
-    width:10em;
     margin-right:0.2em;
+    width:7em;
 }
 
 a:link, a:visited, a:active {
@@ -44,12 +57,14 @@ a:link, a:visited, a:active {
 
 a:hover {
     text-decoration : none;
-    background-color : #EEC95A;
+    color: #990033;
+
 }
 
 fieldset {
     display:inline;
     border: 1px solid #384b73;
+    background-color:#F9F9FF;
 }
 
 table {
@@ -71,8 +86,11 @@ td,th {
 }
 
 th {
-    background-color: #384b73;
-    color:white;
+    background:url( /opac-tmpl/prog/images/member-menu-background.gif);
+    background-repeat:repeat-x;
+    background-color:#ADC4E2;
+    color:#096C9D;
+    font-size:0.8em;
     border : 1px solid #CCCCCC;
     border-right: 1px solid #CCCCCC;
 }
@@ -82,10 +100,11 @@ th[scope=row] {
 }
 
 input[type=submit], input[type=button], input[type=reset] {
-    background-color : #EEC95A;
+    background-color : #6BA037;
     color : #FFFFFF;
-    font-size : 1em;
+    font-size : 0.8em;
     font-weight : bold;
+    border: 1px outset #666666;
 }
 
 li {
@@ -115,7 +134,7 @@ p.searchresults {
     color : #006699;
 }
 .searchresults table tr:hover {
-    background-color: #CCFFFF;
+    background-color: #FFFFCC;
 }
 tr.highlight td, tr.highlight th {
     background-color : #EEEEEE;
@@ -125,7 +144,7 @@ tr.highlight td, tr.highlight th {
 
 /* the top part of the opac : (the LibraryName) */
 #masthead {
-    color:#384b73;
+    color: #000066;
     margin-left:15%;
     text-align:left;
     font-size:150%;
@@ -148,31 +167,35 @@ tr.highlight td, tr.highlight th {
     border-spacing: 3px;
     border : 0px;
     margin : 0px;
+    background-color: white;
+    border: 0px solid #D8DEB8;
+}
 }
 #advsearch-itemtype table tr td {
-    background-color:#CCCCCC;
+    background-color: #F8F8EB;
     border : 0px;
     margin : 0px;
     width:700px;
 }
-#advsearch-itemtype table tr td p {
+#advsearch-itemtype td {
     font-size:0.8em;
+    background-color:#F8F8EB;
 }
 
 /* the content part of every page */
 #main {
-    margin-left:25%;
+    margin-left:20%;
     margin-bottom:0px;
 }
 
-/* the main menu (home, adv search, login...) */
+/* the main menu (home, adv search) */
 #menu {
     position:fixed;
-    margin-top:100px;
-    border-right:1px solid black;
     padding:0px;
     font-size:0.8em;
+    font-weight:bold;
     color:#384b73;
+    background-color:#dddddd;
 }
 #menu ul a {
     display:block;
@@ -187,8 +210,7 @@ tr.highlight td, tr.highlight th {
     margin:5px 5px 0px 5px;
     padding :5px 5px 0px 5px;
     text-decoration:none;
-    background-color:#384b73;
-    color:white;
+    color:#990033;
     white-space: nowrap;
 }
 #menu ul {
@@ -199,38 +221,45 @@ tr.highlight td, tr.highlight th {
 #menu li {
     list-style-type:none;
 }
-#menu label {
-    font-style:italic;
-    display:block;
-    float:left;
-    width:5em;
-}
 
+
+/***************/
+/* login block */
+/***************/
 #login {
-    font-size:0.9em;
+    position:fixed;
+    bottom:0px;
+    font-size:0.8em;
+    background-color : #cccccc;
+    padding:10px;
 }
 #login input {
     font-size:0.8em;
 }
+#login label {
+    width:5em;
+}
+#login p {
+    margin:0px;
+}
+
+/***********************************************************/
 /* the user menu, for user option (and biblio detail view) */
+/***********************************************************/
 #usermenu {
     float:right;
 }
 #usermenu a {
-    background-color : #EEC95A;
+    background-color : #6BA037;
     color : #FFFFFF;
-    font-size : 1em;
-    border: 2px outset;
+    font-size : 0.8em;
     font-weight : bold;
-    margin:0px 5px 0px 0px;
-    padding:2px 5px 2px 5px;
-    text-decoration:none;
-    display: block;
-    white-space: nowrap;
+    border: 1px outset #666666;
+    display:block;
+    margin-bottom:3px;
 }
 #usermenu a:hover {
-    border: 2px inset;
-    background-color:#384b73;
+    border: 1px inset #666666;
 }
 
 /* the opac-news */
@@ -251,21 +280,21 @@ background-color:red;
 }
 
 /* action buttons */
+#action {
+    margin-top:15px;
+}
 #action a {
-    background-color : #EEC95A;
-    color : #FFFFFF;
-    font-size : 1em;
-    border: 2px outset;
+    background-color : #6699cc;
+    color : #eeeeee;
+    font-size : 0.8em;
     font-weight : bold;
-    margin:0px 5px 0px 0px;
-    padding-right:5px;
-    padding-left:5px;
-    text-decoration:none;
-    display: inline;
+    border: 1px outset #666666;
+    margin-right:5px;
+    padding:0 5px 0 5px;
 }
 #action a:hover {
-    border: 2px inset;
-    background-color:#CCCCCC;
+    color : white;
+    border: 1px inset;
 }
 
 #auth {
@@ -279,19 +308,21 @@ background-color:red;
     font-size:0.8em;
     margin:0px;
     background-color:#eeeeee;
-    border:1px solid #CCCCCC;
+    border:0px;
 }
 
 #facets dl {
     margin:0px;
+    border:1px solid #CCCCCC;
 }
 #facets dd {
     margin:0px;
 }
 #facets dt {
     font-weight:bold;
-    background-color:#EEC95A;
-    border:0px;
+    background-color:#6BA037;
+    border: 1px outset #666666;
+    color:white;
 }
 
 #facets li {
@@ -363,6 +394,28 @@ color:#384b73;
 /* style for search terms in catalogsearch */
 .term {
 background-color:lightyellow;
+color: #990033;
+}
+
+#opac-main-search {
+    background-image:url( /opac-tmpl/prog/images/menu-background.gif);
+    background-repeat:repeat-x;
+    background-color: #6699CC;
+    border-top: 1px solid #335599;
+    border-bottom: 1px solid #335599;
+    margin: 0 0 0 15%;
+    padding: 15px 0 15px 10px;
+    color:#FFFFCC;
+    font-weight:bold;
+}
+#opac-main-search a {
+    color:#FFFFCC;
+}
+#opac-main-search a:visited {
+    color:#FFFFCC;
+}
+#opac-main-search a:hover {
+    color:#FFFFFF;
 }
 
 #opac-main-search form {
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl
index 16b77fa52c..7754ba159a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl
@@ -44,10 +44,18 @@
 
     <!-- BOOLEAN SEARCH OPTIONS -->
     <fieldset>
-    <legend>Search For:</legend>
+    <legend>Search for:</legend>
     <!-- TMPL_LOOP NAME="search_boxes_loop" -->
     
-        <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_IF NAME="search_boxes_label" --><p style="text-indent: 4.5em;"><!-- TMPL_ELSE --><p><!-- /TMPL_IF --><!-- TMPL_ELSE --><p><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="expanded_options" -->
+            <!-- TMPL_IF NAME="search_boxes_label" -->
+                <p style="text-indent: 4.5em;">
+            <!-- TMPL_ELSE -->
+                <p>
+            <!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            <p>
+        <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR NAME="left_content" --><!-- /TMPL_IF --> 
         <select name="idx">
             <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
@@ -85,19 +93,19 @@
         </select>
         <input type="text" size="30" name="q" title="Enter search terms" value=""/>
         <!-- TMPL_IF NAME="expanded_options" -->
-            <!-- TMPL_IF NAME="scan_index" --><!-- TMPL_VAR NAME="scan_index" --><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="scan_index" --><input type='checkbox' name='scan' id='scan' value='1'/> Scan Indexes<!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="add_field" --><a href="JavaScript:add_field();" id="ButtonPlus" title="Add another field">[+]</a><!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
     </fieldset>
 <!-- /BOOLEAN SEARCH OPTIONS -->
     <div id="advsearch-itemtype">
-    <h2>Itemtype limit to any of the following:</h2>
+    <h3>Itemtype limit to any of the following:</h3>
     <table>
         <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;
+        <input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/><!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->&nbsp;
         <!--TMPL_VAR Name="description" --></p></td>
         <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
       <!--/TMPL_LOOP-->
@@ -108,8 +116,8 @@
     <!-- BASIC LIMITS -->
     <!--TMPL_IF Name="usmarc"-->
         <fieldset>
-        <legend>Limit type to: match any of the following</legend>
-        <table class="itemtypes">
+            <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/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>
@@ -128,9 +136,9 @@
                 </tr>
                 
                 </table>
-    </fieldset>
-    <!-- /TYPE LIMITS -->
-    <div id="sidebar">
+        </fieldset>
+        <!-- /TYPE LIMITS -->
+        <div id="sidebar">
         <!-- SUBTYPE LIMITS -->
             <fieldset>
             <legend>Subtype limits</legend><p>
@@ -197,8 +205,8 @@
     </fieldset>
     <!--/TMPL_IF -->
     <!--TMPL_IF Name="UNIMARC" -->
-    <div id="sidebar">
-    <!-- SUBTYPE LIMITS -->
+        <div id="sidebar">
+        <!-- SUBTYPE LIMITS -->
             <fieldset>
             <legend>Champs Cod&eacute;s</legend>
             <p>
@@ -400,8 +408,8 @@
                 <option value="Graphics-support:z">Autres</option>
             </select>
             </p>
-    
     </fieldset>
+    </div>
     <!--/TMPL_IF-->
 <!--/TMPL_IF-->
 <!-- AVAILABILITY LIMITS -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl
index e7cc6e593d..1ce47258ef 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-authoritiessearchresultlist.tmpl
@@ -38,7 +38,7 @@
 				<!-- TMPL_UNLESS name="isEDITORS" -->
 					<th width="10%">Biblio records</th>
 				<!-- /TMPL_UNLESS -->
-				<th width="10%">Full Authorized Heading</th>				
+				<th width="10%">Full Heading</th>				
 			</tr>
 			<!-- TMPL_LOOP NAME="result" -->
 				<tr>
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
index 01e0f81455..e1c091d0b6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
@@ -22,36 +22,6 @@
 </div>
 <!-- /TMPL_IF -->
 
-<div id="opac-main-search">
-<h1>Search our catalogue</h1>
-    <ul><li>
-    <label for="masthead_search">Query the catalogue</label>
-    <form name="searchform" method="POST" action="/cgi-bin/koha/opac-search.pl" id="searchform">
-        <input type="text" name="q" style="width: 30%;"/>
-        <input type="submit" value="Search" class="submit" />
-    </form>
-    <i>(<a href="/cgi-bin/koha/opac-search.pl">more search options</a>)</i>
-    </li>
-    <!-- TMPL_IF name="OpacBrowser" -->
-        <li><a href="/cgi-bin/koha/opac-browser.pl">Browse the Catalogue</a>, through a hierarchy of subjects</li>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF name="OpacAuthorities" -->
-        <li>Query the <a href="/cgi-bin/koha/opac-authorities-home.pl">authorities</a></li>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF name="OpacCloud" -->
-        <li>Dig into <a href="/cgi-bin/koha/opac-tags_subject.pl">tag cloud</a></li>
-    <!-- /TMPL_IF -->
-        <li>
-            <form name="recent-acqui" action="/cgi-bin/koha/opac-main.pl" method="POST">
-                <label for="recentacqui">Get the last</label>
-                <input id="recentacqui" type="text" name="recentacqui" value="30" size="3"/>
-                acquisitions
-                <input type="submit" value=" OK " />
-            </form>
-        </li>
-    </ul>
-</div>
-
 <!-- TMPL_IF NAME="languages" -->
 <div id="opac-main-changelanguage">
     <h1>Change language</h1>
diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index c76f696da5..f9714a3730 100755
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -104,9 +104,5 @@ $template->param(
 $template->param(
     'Disable_Dictionary' => C4::Context->preference("Disable_Dictionary") )
   if ( C4::Context->preference("Disable_Dictionary") );
-$template->param(
-    'OpacAuthorities' => 1 );
-$template->param(
-    'OpacCloud' => 1 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 902cccbec1..21d6330b9b 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -242,7 +242,7 @@ foreach my $thisitemtype ( sort {$itemtypes->{$a}->{'description'} cmp $itemtype
         code     => $thisitemtype,
         selected => $selected,
         description => $itemtypes->{$thisitemtype}->{'description'},
-        count5      => $cnt % 5,
+        count5      => $cnt % 4,
     );
     $selected = 0 if ($selected);
     push @itemtypesloop, \%row;
@@ -292,8 +292,7 @@ if ( $template_name eq "opac-advsearch.tmpl" ) {
               {
                 indexes            => $this_index,
                 search_boxes_label => "<span class='labels'>Search for:</span>",
-                scan_index         =>
-"<input type='checkbox' name='scan' id='scan' value='1'/><label for='scan'>Scan Indexes</label>",
+                scan_index         => 1,
               };
 
         }
@@ -344,9 +343,6 @@ if ( $template_name eq "opac-advsearch.tmpl" ) {
     my $sort_by_loop = displaySortby($sort_by);
     $template->param(
         sort_by_loop => $sort_by_loop,
-        OpacCloud            => C4::Context->preference("OpacCloud"),
-        OpacTopissue         => C4::Context->preference("OpacTopissue"),
-        OpacAuthorities      => C4::Context->preference("OpacAuthorities"),
      );
 
     output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl
index b636acceba..e9ce1210d1 100755
--- a/opac/opac-showreviews.pl
+++ b/opac/opac-showreviews.pl
@@ -43,9 +43,6 @@ my $reviews = getreviews( $biblionumber, 1 );
 $template->param(
     reviews => $reviews,
     title   => $biblio->{'title'},
-    OpacCloud            => C4::Context->preference("OpacCloud"),
-    OpacTopissue         => C4::Context->preference("OpacTopissue"),
-    OpacAuthorities      => C4::Context->preference("OpacAuthorities"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;