diff --git a/C4/Auth.pm b/C4/Auth.pm
index 11e0615fc9..0060853bdc 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -255,6 +255,7 @@ sub get_template_and_user {
             KohaAdminEmailAddress   => "" . C4::Context->preference("KohaAdminEmailAddress"),
             IntranetmainUserblock 	=> C4::Context->preference("IntranetmainUserblock"),
             IndependantBranches     => C4::Context->preference("IndependantBranches"),
+			CircAutocompl => C4::Context->preference("CircAutocompl"),
         );
     }
     else {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
index 3b24040d14..e0a893f55b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
@@ -1,4 +1,4 @@
-
+<!-- Begin Acquisitions Resident Search Box -->
 <div id="header_search">
 <div id="supplier_search" class="residentsearch">
 	<p class="tip">Search suppliers:</p>
@@ -18,4 +18,5 @@
 			<li><a href="/cgi-bin/koha/acqui/booksellers.pl#supplier_search">Supplier Search</a></li>
 			<li><a href="/cgi-bin/koha/acqui/histsearch.pl#orders_search">Orders Search</a></li>
 			</ul>	
-</div>
\ No newline at end of file
+</div>
+<!-- End Acquisitions Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
index ffb5d806e8..25fef87446 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
@@ -1,4 +1,4 @@
-<!-- Begin Circulation Resident Search Box -->
+<!-- Begin Authorities Resident Search Box -->
 <div id="header_search">
 </div>
-<!-- End Circulation Resident Search Box -->
\ No newline at end of file
+<!-- End Authorities Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 3aa1b01dc1..84cd4bf38e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -1,14 +1,67 @@
-<!-- Begin Circulation Resident Search Box -->
+<!-- Begin Catalogue Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>
 	
 
@@ -33,4 +86,4 @@
 			<li class="tabs-selected"><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Circulation Resident Search Box -->
+<!-- End Catalogue Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index ae4c85b003..52f0cc65dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Circulation Resident Search Box -->
+<!-- Begin Cataloging Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 <div id="addbooks_search" class="residentsearch">
 	<p class="tip">Search the catalog and the reservoir:</p>
@@ -9,17 +51,28 @@
 </div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 			<ul>
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#addbooks_search">Cataloguing Search</a></li>
 			<li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
 			</ul>	
 </div>
-<!-- End Circulation Resident Search Box -->
\ No newline at end of file
+<!-- End Cataloging Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 7ae9f5a069..9f78ecb2cc 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -1,79 +1,7 @@
 <!-- Begin Circulation Resident Search Box -->
 
-<!-- TMPL_IF NAME="CircAutocompl" -->
-
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/utilities/utilities.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/autocomplete/autocomplete-min.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/yahoo-dom-event/yahoo-dom-event-min.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/element/element-beta-min.js"></script>
-
-<style type="text/css">
-.yui-skin-sam .yui-ac {
-    position:relative;
-    font-size:100%;
-}
-.yui-skin-sam .yui-ac-input { 
-    position:absolute;
-    width:100%;}
-.yui-skin-sam .yui-ac-container { 
-    position:absolute;
-    top:1.6em;
-    width:100%;
-}
-.yui-skin-sam .yui-ac-content {
-    position:absolute;
-    width:100%;
-    border:1px solid #808080;
-    background:#fff;
-    overflow:hidden;
-    z-index:9050;
-}
-.yui-skin-sam .yui-ac-shadow {
-    position:absolute;
-    margin:.3em;
-    width:100%;
-    background:#000;
-    -moz-opacity:0.10;
-    opacity:.10;
-    filter:alpha(opacity=10);
-    z-index:9049;
-}
-.yui-skin-sam .yui-ac-content ul {
-    margin:0;
-    padding:0;
-    width:100%;
-}
-.yui-skin-sam .yui-ac-content li {
-    margin:0;
-    padding:2px 5px;
-    cursor:default;
-    white-space:nowrap;
-}
-.yui-skin-sam .yui-ac-content li.yui-ac-prehighlight {
-    background:#B3D4FF;
-}
-.yui-skin-sam .yui-ac-content li.yui-ac-highlight {
-    background:#426FD9;
-    color:#FFF;
-}
-
-
-
-#borrowerautocomplete { width: 405px; text-align:left;} /* z-index needed on top instances for ie & sf absolute inside relative issue */
-.autocomplete { width:130px; }/* set width of widget here*/
-.autocomplete .yui-ac-highlight ,
-.autocomplete .yui-ac-highlight .sample-result,
-.autocomplete .yui-ac-highlight .sample-query { color:#FFF; }
-.autocomplete .sample-result { color: black; }
-.autocomplete .sample-query { color:#000; }
-#findborrower { position:static; width:335px; }  */
-#yborrowercontainer { text-align:left;width:300px; }
-</style>
-
-<script type="text/javascript">
-
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
 YAHOO.util.Event.onContentReady("header_search", function() {
-
     new function() {
         // Define a custom formatter function
         this.fnCustomFormatter = function(oResultItem, sQuery) {
@@ -113,21 +41,15 @@ YAHOO.util.Event.onContentReady("header_search", function() {
         this.oAutoComp.formatResult = this.fnCustomFormatter;
 }
 });    
-
-
-</script>
-
-<!-- /TMPL_IF -->
+</script><!-- /TMPL_IF -->
 
 <div id="header_search">
 
 <div id="circ_search" class="residentsearch">
     <p class="tip">Enter patron card number or partial name:</p>
     <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    
-<!-- TMPL_IF NAME="CircAutocompl" -->
-        
-    <div class="yui-skin-sam">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
             <div id="borrowerautocomplete" class="autocomplete">
                 <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
                 <div id="yborrowercontainer"></div>
@@ -136,16 +58,12 @@ YAHOO.util.Event.onContentReady("header_search", function() {
                 <input name="printer" value="" type="hidden" />
             </div>
         </div>
-
-<!-- TMPL_ELSE -->
-
+	<!-- TMPL_ELSE -->
             <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
             <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
             <input name="printer" value="" type="hidden" />
             <input value="Submit" type="submit" />
-
-<!-- /TMPL_IF -->
-
+	<!-- /TMPL_IF -->
     </form>
 </div>  
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index 0d0bcb1665..00eade3ca5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Members Resident Search Box -->
+<!-- Begin Cities Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="city_search" class="residentsearch">
 	<p class="tip">City Search:</p>
@@ -9,13 +51,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -30,4 +83,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
+<!-- End Cities Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index c1d14989fd..ad136be55c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Members Resident Search Box -->
+<!-- Begin Currencies Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="currency_search" class="residentsearch">
 	<p class="tip">Currencies Search:</p>
@@ -9,13 +51,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -30,4 +83,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
+<!-- End Currencies Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index b4f44d73d3..3f556fad0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -61,3 +61,20 @@
 <!-- TMPL_IF name="intranetcolorstylesheet" -->
     <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->" />
 <!-- /TMPL_IF -->
+<!-- Core + Skin CSS -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/yui/button.css" />
+<!-- OPTIONAL: Menu Stylesheet (required for creating buttons of type "menu" and "split") -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/yui/menu.css" />
+<!-- Dependencies -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/yahoo-dom-event/yahoo-dom-event.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/element/element-beta-min.js"></script>
+<!-- OPTIONAL: Menu and Container Core (required for creating buttons of type "menu" and "split") -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/container/container_core-min.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/menu/menu-min.js"></script>
+<!-- Source file -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/button/button-beta-min.js"></script>
+<!-- TMPL_IF NAME="CircAutocompl" -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/utilities/utilities.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/autocomplete/autocomplete-min.js"></script>
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/yui/autocomplete.css" />
+<!-- /TMPL_IF -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index ba6f21da59..59ebe15931 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Members Resident Search Box -->
+<!-- Begin Notices Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="notices_search" class="residentsearch">
 	<p class="tip">Search Existing Notices:</p>
@@ -9,13 +51,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -30,4 +83,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
+<!-- End Notices Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 6ae46e5d13..0a101eadb9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Members Resident Search Box -->
+<!-- Begin Patrons Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="patron_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
@@ -14,13 +56,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -35,4 +88,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
\ No newline at end of file
+<!-- End Patrons Resident Search Box -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index d2e7400884..6a99f48fee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Members Resident Search Box -->
+<!-- Begin Patrons Admin Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="patron_category_search" class="residentsearch">
 	<p class="tip">Search by Patron Category Name:</p>
@@ -9,13 +51,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -30,4 +83,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
+<!-- End Patrons Admin Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
index b5c9bdb181..529449b680 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Members Resident Search Box -->
+<!-- Begin Printers Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="printer_search" class="residentsearch">
 	<p class="tip">Printer Search:</p>
@@ -9,13 +51,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -30,4 +83,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
+<!-- End Printers Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
index bb678c9dae..e1d8e5670a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Members Resident Search Box -->
+<!-- Begin Roads Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="roadtype_search" class="residentsearch">
 	<p class="tip">Road Type Search:</p>
@@ -9,13 +51,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -30,4 +83,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
+<!-- End Roads Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index f9e3380f15..c980897d93 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Members Resident Search Box -->
+<!-- Begin Serials Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="subscription_search" class="residentsearch">
 	<p class="tip">Search Subscriptions:</p>
@@ -7,12 +49,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -27,4 +81,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
+<!-- End Serials Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
index 44034db555..3e047e09e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -1,5 +1,46 @@
+<!-- Begin Stopwords Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
 
-	<!-- Begin Members Resident Search Box -->
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="stopword_search" class="residentsearch">
 	<p class="tip">Stop Word Search:</p>
@@ -10,13 +51,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -31,4 +83,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
+<!-- End Stopwords Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index c99cde145f..17b3a8772a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -1,4 +1,46 @@
-<!-- Begin Members Resident Search Box -->
+<!-- Begin Suggestions Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class='sample-result'>",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});    
+</script><!-- /TMPL_IF -->
 <div id="header_search">
 	<div id="suggestions_search" class="residentsearch">
 	<p class="tip">Suggestions Search:</p>
@@ -11,13 +53,24 @@
 	</div>
 	<div id="circ_search" class="residentsearch">
 	<p class="tip">Enter patron card number or partial name:</p>
-	<form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-			<label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
-	<input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
-    <input name="printer" value="" type="hidden" />
-	<input value="Submit" type="submit" />
-	</form>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit">
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+	<!-- TMPL_ELSE -->
+            <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+            <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+            <input name="printer" value="" type="hidden" />
+            <input value="Submit" type="submit" />
+	<!-- /TMPL_IF -->
+    </form>
 	</div>	
 	<div id="catalog_search" class="residentsearch">
 	<p class="tip">Enter search keywords:</p>
@@ -32,4 +85,4 @@
 			<li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
 			</ul>	
 </div>
-<!-- End Members Resident Search Box -->
+<!-- End Suggestions Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.inc
deleted file mode 100644
index d299270d23..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- Core + Skin CSS -->
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/button/assets/skins/sam/button.css" />
-<!-- OPTIONAL: Menu Stylesheet (required for creating buttons of type "menu" and "split") -->
-<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/menu/assets/skins/sam/menu.css" />
-<!-- Dependencies -->
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/yahoo-dom-event/yahoo-dom-event.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/element/element-beta-min.js"></script>
-<!-- OPTIONAL: Menu and Container Core (required for creating buttons of type "menu" and "split") -->
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/container/container_core-min.js"></script>
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/menu/menu-min.js"></script>
-<!-- Source file -->
-<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/button/button-beta-min.js"></script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/autocomplete.css b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/autocomplete.css
new file mode 100644
index 0000000000..72203f77de
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/autocomplete.css
@@ -0,0 +1,58 @@
+.autocomplete .yui-ac {
+    position:relative;
+    font-size:100%;
+}
+.autocomplete .yui-ac-input { 
+    position:absolute;
+    width:100%;}
+.autocomplete .yui-ac-container { 
+    position:absolute;
+    top:1.6em;
+    width:100%;
+}
+.autocomplete .yui-ac-content {
+    position:absolute;
+    width:100%;
+    border:1px solid #808080;
+    background:#fff;
+    overflow:hidden;
+    z-index:9050;
+}
+.autocomplete .yui-ac-shadow {
+    position:absolute;
+    margin:.3em;
+    width:100%;
+    background:#000;
+    -moz-opacity:0.10;
+    opacity:.10;
+    filter:alpha(opacity=10);
+    z-index:9049;
+}
+.autocomplete .yui-ac-content ul {
+    margin:0;
+    padding:0;
+    width:100%;
+}
+.autocomplete .yui-ac-content li {
+    margin:0;
+    padding:2px 5px;
+    cursor:default;
+    white-space:nowrap;
+}
+.autocomplete .yui-ac-content li.yui-ac-prehighlight {
+    background:#B3D4FF;
+}
+.autocomplete .yui-ac-content li.yui-ac-highlight {
+    background:#426FD9;
+    color:#FFF;
+}
+
+#borrowerautocomplete { width: 405px; text-align:left;} /* z-index needed on top instances for ie & sf absolute inside relative issue */
+.autocomplete { width:130px; }/* set width of widget here*/
+.autocomplete .yui-ac-highlight ,
+.autocomplete .yui-ac-highlight .sample-result,
+.autocomplete .yui-ac-highlight .sample-query { color:#FFF; }
+.autocomplete .sample-result { color: black; }
+.autocomplete .sample-query { color:#000; }
+#findborrower { position:static; width:335px; }  */
+#yborrowercontainer { text-align:left;width:300px; }
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button.css b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button.css
new file mode 100644
index 0000000000..dfb8f9fe3b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/button.css
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2007, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.3.1
+*/
+body .yui-button{display:-moz-inline-box;display:inline-block;}body .yui-button .first-child{display:block;*display:inline-block;}body .yui-button button,body .yui-button a{display:block;*display:inline-block;border:none;}body .yui-button button{background-color:transparent;*overflow:visible;cursor:pointer;}body .yui-button a{text-decoration:none;}body .yui-button{border-width:1px 0;border-style:solid;border-color:#808080;background:url(yui-sprite.png) repeat-x 0 0;margin:auto .25em;}body .yui-button .first-child{border-width:0 1px;border-style:solid;border-color:#808080;margin:0 -1px;*position:relative;*left:-1px;}body .yui-button button,body .yui-button a{padding:0 10px;font-size:93%;line-height:2;*line-height:1.7;min-height:2em;*min-height:auto;color:#000;}body .yui-split-button button,body .yui-menu-button button{padding-right:20px;background-position:right center;background-repeat:no-repeat;}body .yui-menu-button button{background-image:url(menu-button-arrow.png);}body .yui-split-button button{background-image:url(split-button-arrow.png);}body .yui-button-focus{border-color:#7D98B8;background-position:0 -1300px;}body .yui-button-focus .first-child{border-color:#7D98B8;}body .yui-button-focus button,body .yui-button-focus a{color:#000;}body .yui-split-button-focus button{background-image:url(split-button-arrow-focus.png);}body .yui-button-hover{border-color:#7D98B8;background-position:0 -1300px;}body .yui-button-hover .first-child{border-color:#7D98B8;}body .yui-button-hover button,body .yui-button-hover a{color:#000;}body .yui-split-button-hover button{background-image:url(split-button-arrow-hover.png);}body .yui-button-active{border-color:#7D98B8;background-position:0 -1700px;}body .yui-button-active .first-child{border-color:#7D98B8;}body .yui-button-active button,body .yui-button-active a{color:#000;}body .yui-split-button-activeoption{border-color:#808080;background-position:0 0;}body .yui-split-button-activeoption .first-child{border-color:#808080;}body .yui-split-button-activeoption button{background-image:url(split-button-arrow-active.png);}body .yui-radio-button-checked,body .yui-checkbox-button-checked{border-color:#304369;background-position:0 -1400px;}body .yui-radio-button-checked .first-child,body .yui-checkbox-button-checked .first-child{border-color:#304369;}body .yui-radio-button-checked button,body .yui-checkbox-button-checked button{color:#fff;}body .yui-button-disabled{border-color:#ccc;background-position:0 -1500px;}body .yui-button-disabled .first-child{border-color:#ccc;}body .yui-button-disabled button,body .yui-button-disabled a{color:#A6A6A6;cursor:default;}body .yui-menu-button-disabled button{background-image:url(menu-button-arrow-disabled.png);}body .yui-split-button-disabled button{background-image:url(split-button-arrow-disabled.png);}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png
new file mode 100644
index 0000000000..8cef2abb31
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png
new file mode 100644
index 0000000000..f03dfee4e4
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu.css b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu.css
new file mode 100644
index 0000000000..2b18dc6db6
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu.css
@@ -0,0 +1,7 @@
+/*
+Copyright (c) 2007, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.3.1
+*/
+.yuimenu .yuimenu,.yuimenubar .yuimenu{position:absolute;visibility:hidden;}.yuimenubar li,.yuimenu li{list-style-type:none;}.yuimenubar ul,.yuimenu ul,.yuimenubar li,.yuimenu li,.yuimenu h6,.yuimenubar h6{margin:0;padding:0;}.yuimenuitemlabel,.yuimenubaritemlabel{white-space:nowrap;}.yui-menu-shadow{position:absolute;z-index:-1;}.hide-scrollbars *{overflow:hidden;}.hide-scrollbars select{display:none;}.yuimenu.show-scrollbars{overflow:visible;}.yuimenu.hide-scrollbars .yui-menu-shadow{overflow:hidden;}.yuimenu.show-scrollbars .yui-menu-shadow{overflow:auto;}body .yuimenubar{border:solid 1px #808080;background:url(yui-sprite.png) repeat-x 0 0;}body .yuimenubar .bd,body .yuimenubar ul{*zoom:1;}body .yuimenubar>.bd>ul:after{content:".";display:block;clear:both;visibility:hidden;height:0;line-height:0;}body .yuimenubaritem{float:left;}body .yuimenubarnav .yuimenubaritem{border-right:solid 1px #ccc;}body .yuimenubaritemlabel{display:block;*display:inline-block;font-size:93%;line-height:2;*line-height:1.9;padding:0 10px;color:#000;text-decoration:none;outline:none;cursor:default;border-style:solid;border-color:#808080;border-width:1px 0;position:relative;margin:-1px 0;}body .yuimenubarnav .yuimenubaritemlabel{padding-right:20px;}body .yuimenubaritemlabel .submenuindicator{width:1px;height:1px;top:0;left:0;}body .yuimenubarnav .yuimenubaritemlabel .submenuindicator{top:50%;right:8px;left:auto;margin-top:-3px;height:4px;width:7px;text-indent:8px;background-position:-16px -856px;}body .yuimenubaritem a.selected{background:url(yui-sprite.png) repeat-x 0 -1700px;border-color:#7D98B8;}body .yuimenubarnav .yuimenubaritem a.selected{border-left-width:1px;margin-left:-1px;*left:-1px;}body .yuimenubar a.selected .submenuindicator{background:transparent;}body .yuimenubarnav a.selected .submenuindicator{background:url(yui-sprite.png) repeat-x -16px -856px;}body .yuimenubaritem a.disabled{cursor:default;color:#A6A6A6;}body .yuimenubarnav .yuimenubaritem a.disabled .submenuindicator{background-position:-16px -881px;}body .yuimenu .bd{border:solid 1px #808080;background-color:#fff;}body .yuimenu ul{padding:3px 0;border-width:1px 0 0 0;border-color:#ccc;border-style:solid;}body .yuimenu ul.first-of-type{border-width:0;}body .yuimenu h6{font-size:93%;font-weight:bold;line-height:1.5;*line-height:1.45;border-style:solid;border-color:#ccc;border-width:1px 0 0 0;color:#a4a4a4;padding:3px 10px 0 10px;}body .yuimenu ul.hastitle,body .yuimenu h6.first-of-type{border-width:0;}body .yuimenu .yui-menu-body-scrolled{border-color:#ccc #808080;overflow:hidden;}body .yuimenu .topscrollbar,body .yuimenu .bottomscrollbar{height:16px;border:solid 1px #808080;background:#fff url(yui-sprite.png) no-repeat 0 0;}body .yuimenu .topscrollbar{border-bottom-width:0;background-position:center -950px;}body .yuimenu .topscrollbar_disabled{background-position:center -975px;}body .yuimenu .bottomscrollbar{border-top-width:0;background-position:center -850px;}body .yuimenu .bottomscrollbar_disabled{background-position:center -875px;}body .yuimenuitemlabel{font-size:93%;line-height:1.5;*line-height:1.45;padding:0 20px;display:block;color:#000;text-decoration:none;outline:none;position:relative;*position:static;cursor:default;}body .yuimenuitemlabel .helptext{font-style:normal;display:block;margin:-1.5em 0 0 10em;*margin-top:-1.45em;}body .yuimenuitemlabel .submenuindicator,body .yuimenuitemlabel .checkedindicator,body .yuimenubaritemlabel .submenuindicator{position:absolute;overflow:hidden;background:url(yui-sprite.png) no-repeat;}body .yuimenuitemlabel .submenuindicator,body .yuimenuitemlabel .checkedindicator{*position:static;*display:inline-block;}body .yuimenuitemlabel .submenuindicator{top:50%;right:8px;margin-top:-3px;height:7px;width:4px;text-indent:5px;background-position:0 -906px;}body .yuimenuitemlabel .checkedindicator{top:50%;left:8px;margin-top:-3px;height:7px;width:7px;text-indent:8px;background-position:0 -1006px;}body .visible .yuimenuitemlabel .submenuindicator{*float:right;*margin:-1em 8px 0 8px;}body .visible .yuimenuitem .hassubmenu{*padding-right:0;}body .visible .yuimenuitemlabel .checkedindicator{*float:left;*margin:-1em 0 0 -12px;}body .yui-menu-shadow-visible{top:2px;right:-3px;left:-3px;bottom:-3px;background-color:#000;opacity:.12;*filter:alpha(opacity=12);visibility:visible;}body .visible .bd,body .visible .yuimenuitem{_zoom:1;}body .visible .yuimenuitemlabel{*zoom:1;}body .yuimenuitem a.selected{background:#B3D4FF;}body .yuimenubar .yuimenuitem a.selected .submenuindicator{background:url(yui-sprite.png) no-repeat 0 -906px;}body .yuimenubarnav .yuimenuitem a.selected{border-width:0;margin:0;*left:0;}body .yuimenuitem a.disabled{cursor:default;color:#A6A6A6;}body .yuimenuitem a.disabled .submenuindicator{background-position:0 -931px;}body .yuimenuitem a.disabled .checkedindicator{background-position:0 -1031px;}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png
new file mode 100644
index 0000000000..fa58c5030e
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png
new file mode 100644
index 0000000000..0a6a82c640
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png
new file mode 100644
index 0000000000..167d71eb72
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png
new file mode 100644
index 0000000000..167d71eb72
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png
new file mode 100644
index 0000000000..b33a93ff2d
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png differ
diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yui-sprite.png b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yui-sprite.png
new file mode 100644
index 0000000000..afd65e05aa
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/en/lib/yui/yui-sprite.png differ
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 11be41264c..6bced21789 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
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
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 1dbf2632ae..2c2ac545b2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
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 5921041fff..f52745a55b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -12,7 +12,7 @@ function confirm_deletion() {
 //]]>
 </script>
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
 
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 968129b250..5e9a51dab0 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
@@ -20,7 +20,7 @@ function searchauthority() {
 //]]>
 </script>
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="authorities-search.inc" -->
 
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 bac4f38ed4..3221f95a6e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
@@ -27,7 +27,7 @@ function searchauthority() {
 //]]>
 </script>
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="authorities-search.inc" -->
 
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 5f8f1aec0b..3f5f077aa7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.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 f7071320b9..a85f5e28ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -17,7 +17,7 @@ function Changefwk(FwkList) {
 //]]>
 </script>
 </head>
-<body class="yui-skin-sam">
+<body>
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 4759ae0eba..f148f86646 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -4,7 +4,7 @@
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
 
-<body class="yui-skin-sam">
+<body>
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
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 4f08d73e7c..4c498829e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
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 290a88d5b6..f036f3fdb8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -425,7 +425,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
 	}
 </style>
 </head>
-<body class="yui-skin-sam">
+<body>
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
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 93ad58dd3e..75510e8abe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -8,7 +8,7 @@
  });
 </script>
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cataloging-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl
index 558510205a..16bd054d06 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tmpl
@@ -1,15 +1,11 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-
-<!-- TMPL_IF NAME="CircAutocompl" -->
-<!-- TMPL_INCLUDE NAME="circ-search-autocompl.inc" -->
-<!-- TMPL_ELSE -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
-<!-- /TMPL_IF -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Circulation</div>
 
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 42506f925a..dcd53f6469 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -15,7 +15,7 @@
 </script>
 
 </head>
-<body class="yui-skin-sam">
+<body>
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
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 aaa15439d0..bb075c6fea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -204,8 +204,7 @@
             </fieldset>
         </form>
     <!-- TMPL_IF NAME="errmsgloop" -->
-    <fieldset>
-        <legend>Error</legend>
+    <div class="message">
         <!-- TMPL_LOOP Name="errmsgloop" -->
                     <!-- TMPL_IF Name="badbarcode" -->
                         <p class="problem">No Item with barcode: <!-- TMPL_VAR Name="msg" --></p>
@@ -224,7 +223,7 @@
                     <!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
         <!-- /TMPL_IF -->
-    </fieldset>
+    </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF Name="returned" -->
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 e4d371453e..a228295bdb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -20,7 +20,7 @@
         <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>
+                                <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">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
index 221359cb58..4280a25760 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
@@ -2,7 +2,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
index a332ac8a54..399b5bedaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
@@ -7,7 +7,7 @@ function Plugin(batch_id) {
 }
 </script>
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
index 651cd8d9f0..784634ba54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
@@ -2,7 +2,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index 7440d1a892..043fa1b649 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
index b932100c9a..e8e51dd2be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
index db790c1d7d..4a8ef084ab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
index 1408327b59..ce80da8e3f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
index b0bf15347f..d73262a07b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
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 bbc599d4d1..1b4fc36bac 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
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
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 604010a42b..140571d091 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
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 32a985be82..3fa169cc4e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
index d84ade68c6..edb5f9dc78 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
index ee5c0850a6..fef2b4bb5a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="patron-search.inc" -->
 
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 296d0a23fc..dbae7503ad 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
@@ -38,7 +38,7 @@ $(document).ready(function() {
 //]]>
 </script>
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
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 32c378eea5..5b793dde79 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
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="yui-toolbars.inc" -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
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 ebc3705911..b82926b93e 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
@@ -93,7 +93,7 @@ function popup(subscriptionid) {
 -->
 </script>
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="serials-search.inc" -->
 
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 a48d131674..0d1a0e7a60 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
@@ -4,7 +4,7 @@
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_UNLESS NAME="add_form" --><!-- TMPL_INCLUDE NAME="yui-toolbars.inc" --><!-- /TMPL_UNLESS -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
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 47fb69d6c0..848e1d1397 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -95,7 +95,7 @@
 		</script>
 	<!-- /TMPL_IF -->
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="letters-search.inc" -->
 
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 60db0fc0e4..975a320bfb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -60,7 +60,7 @@ function confirmDelete(s){
 	//]]>
 </script>
 </head>
-<body class="yui-skin-sam">
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->