diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-print.css b/koha-tmpl/intranet-tmpl/prog/en/css/intranet-print.css
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/includes/intranet-print.css
rename to koha-tmpl/intranet-tmpl/prog/en/css/intranet-print.css
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css b/koha-tmpl/intranet-tmpl/prog/en/css/intranet.css
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
rename to koha-tmpl/intranet-tmpl/prog/en/css/intranet.css
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css b/koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css
rename to koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2popup.css b/koha-tmpl/intranet-tmpl/prog/en/css/intranet2popup.css
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/includes/intranet2popup.css
rename to koha-tmpl/intranet-tmpl/prog/en/css/intranet2popup.css
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/login.css b/koha-tmpl/intranet-tmpl/prog/en/css/login.css
similarity index 100%
rename from koha-tmpl/intranet-tmpl/prog/en/includes/login.css
rename to koha-tmpl/intranet-tmpl/prog/en/css/login.css
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-addbiblio.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-addbiblio.inc
index ad09699a82..91be14479c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-addbiblio.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close-addbiblio.inc
@@ -2,8 +2,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/css/intranet.css);
 </style>
 </head>
 
-<body>
\ No newline at end of file
+<body>
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 2b8b451884..0a13d80d48 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
@@ -1,23 +1,23 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet-print.css" />
+<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/css/intranet-print.css" />
 <style type="text/css" media="screen"> 
 	<!-- TMPL_IF NAME="popup" -->
-    @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet2popup.css);
+    @import url(<!-- TMPL_VAR NAME='themelang' -->/css/intranet2popup.css);
 	<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF NAME="login" -->
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/login.css);
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/css/login.css);
 	<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF NAME="wizard" -->
-    @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/wizard.css);
+    @import url(<!-- TMPL_VAR NAME='themelang' -->/css/wizard.css);
 	<!-- TMPL_ELSE -->
 
 		<!-- TMPL_IF NAME="intranetstylesheet" -->
 	@import url(<!-- TMPL_VAR NAME="intranetstylesheet" -->);
 		<!-- TMPL_ELSE -->
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet2.css);
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/css/intranet2.css);
     	<!--/TMPL_IF-->    
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
index 2b03bbfc1b..68f4402614 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
@@ -20,7 +20,7 @@ function Help() {
 }
 </script>
 
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/css/staff.css">
 <style type="text/css">
 .catalogue {
 	background-color:#ad11ad;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
index 8756a157b4..aa2c019b03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc
@@ -3,10 +3,10 @@
 <style type="text/css" media="screen">
 
 <!-- TMPL_IF NAME="login" -->
-    @import url(/intranet-tmpl/prog/en/includes/login.css);
+    @import url(/intranet-tmpl/prog/en/css/login.css);
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="wizard" -->
-    @import url(/intranet-tmpl/prog/en/includes/wizard.css);
+    @import url(/intranet-tmpl/prog/en/css/wizard.css);
 <!-- /TMPL_IF -->
 
 html { background: #eee; }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc
index bf72fe2e89..2eaba5b333 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc
@@ -5,7 +5,7 @@
 <title>popup</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf8">
 
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/css/staff.css">
 
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/san-op.css b/koha-tmpl/intranet-tmpl/prog/en/includes/san-op.css
deleted file mode 100644
index 6933a5e1a8..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/san-op.css
+++ /dev/null
@@ -1,414 +0,0 @@
-body {
-    font-family : Verdana, Geneva, Arial, sans-serif;
-    font-size : 1.0em;
-    background-color : #eeeeee;
-	text-align: left;
-}
-
-h1 {
-        font-size: 1.9em;
-        background-color : #384b73;
-        color : white;
-        text-align: center;
-        padding-bottom : 6px;
-        display:block;
-}
-
-h2 {
-        color : #384b73;
-        text-align: left;
-        padding-bottom : 6px;
-        display:block;
-        font-size:110%;
-}
-h3 {
-        color : #384b73;
-        text-align: left;
-        padding-bottom : 6px;
-        display:inline;
-        font-size:100%;
-        font-weight:normal;
-}
-
-label {
-    font-style:italic;
-    vertical-align:top;
-/*    display:block;
-    float:left;
-    text-align:right;
-    width:8em;
-    margin-right:0.2em;*/
-}
-
-p {
-    margin-bottom:0px;
-    margin-top:0px;
-    margin-left:10px;
-    margin-right:10px;
-    padding:0px;
-}
-
-/* Alternate css proposal : uncomment this (and comment #action a below), and action menu will appear on the right, vertically */
-/* 
-#action {
-float:right;
-}
-#action a {
-    background-color : #eec95a;
-    color : #FFFFFF;
-    font-size : 1em;
-    border: 3px;
-    font-weight : bold;
-    margin-right:5px;
-    margin-bottom:5px;
-    text-decoration:none;
-    display: block;
-}
-*/
-
-#action {
-    margin-top:5px;
-    margin-bottom:20px;
-}
-#action a {
-    background-color : #eec95a;
-    color : #FFFFFF;
-    font-size : 1em;
-    border: 2px outset;
-    font-weight : bold;
-    margin:0px 5px 0px 0px;
-    padding-right:5px;
-    padding-left:5px;
-    text-decoration:none;
-    display: inline;
-}
-#action a:hover {
-    border: 2px inset;
-    background-color:#384b73;
-}
-
-a:link, a:visited, a:active {
-        text-decoration : underline;
-        color :navy;
-}
-a:hover {
-        text-decoration : none;
-        color : orange;
-}
-
-table {
-	border-collapse : collapse;
-	border-top : 1px solid #CCCCCC;
-	border-right : 1px solid #CCCCCC;
-	margin : 1em 0;
-}
-
-caption {
-	font-size : 140%;
-	text-align : left;
-	font-weight : bold;
-}
-
-td,th {
-	border-left : 1px solid #CCCCCC;
-	border-bottom : 1px solid #CCCCCC;
-	padding : 5px;
-}
-
-th {
-    background-color : #384b73;
-    color : white;
-    border-left : 1px solid #999999;
-    border-bottom : 1px solid #999999;
-}
-
-th[scope=row] {
-    background-color : #EEEEEE;
-    color:black;
-    text-align : right;
-}
-
-input {
-    font-size:0.8em;
-}
-
-select {
-    font-size:0.8em;
-    border : 1px solid black;
-    padding : 1px;
-}
-
-li {
-margin : 0px 0px 0px 10px;
-}
-
-input[type=submit], input[type=button], input[type=reset] {
-    font-size:0.8em;
-    background-color : #eec95a;
-    color : #FFFFFF;
-    font-size : 1em;
-    border-width:2px;
-    font-weight : bold;
-}
-input:hover[type=submit], input:hover[type=button], input:hover[type=reset] {
-    border:2px inset;
-}
-
-input[type=text] {
-    font-size : 0.8em;
-    font-weight : bold;
-    border : 1px solid black;
-    margin : 0px 2px 0px 0px;
-    padding : 2px;
-}
-
-tr.highlight td, tr.highlight th {
-	background-color : #FFF;
-}
-
-#problem {
-	color: red;
-	background-color: #eee;
-	font-weight : bold;
-}
-
-legend {
-	font-size: 1.3em;
-	font-weight:bold;
-        background-color : #384b73;
-        color : white;
-        padding : 0px 5px 0px 5px; 
-}
-fieldset {
-        border : 1px solid #374b73;
-        display: inline;
-        vertical-align:top;
-}
-
-.problem {
-	color: white;
-	background-color:red;
-}
-
-/* css styles for reserves color alerts */
-.onloan {
-	background-color: #FFED3D;
-}
-
-.reserved {
-	background-color: #8EBAFF;
-}
-
-.transfered {
-	background-color: #F9FF9A;
-}
-
-.inwait {
-	background-color: #33CC99;
-}
-
-.other {
-	background-color: #FF0000;
-}
-
-/* end of css styles for reserves color alerts */
-
-/* MAIN MENU STYLES */
-#mainmenu {
-    display:block;
-    float:left;
-    font-weight : normal;
-    background-color : #eee;
-    margin-right: 5px;
-    padding-right: 5px;
-    border-right:1px solid black;
-    font-size:0.8em;
-}
-
-#mainmenu a {
-    display:block;
-    margin-bottom:0px;
-    padding-left :5px;
-    text-decoration:none;
-    font-weight:bold;
-    color:black;
-}
-
-
-#mainmenu a:hover {
-    display:block;
-    margin-bottom:0px;
-    padding-left :5px;
-    text-decoration:none;
-    font-weight:bold;
-    background-color:#6699cc;
-    color:white;
-}
-
-#mainmenu ul a {
-    display:block;
-    margin-bottom:5px;
-    padding-left :5px;
-    text-decoration:none;
-    font-weight:normal;
-    color:black;
-}
-#mainmenu ul a:hover {
-    display:block;
-    margin-bottom:5px;
-    padding-left :5px;
-    text-decoration:none;
-    font-weight:normal;
-    background-color:#6699cc;
-    color:white;
-}
-
-#mainmenu ul {
-    list-style-type: none;
-    padding-left:20px;
-    margin-bottom:0px;
-    margin-top:0px;
-}
-
-#mainmenu li {
-    list-style-type: none;
-    padding-left:0px;
-    margin-left:0px;
-    margin-bottom:0px;
-    margin-top:0px;
-}
-
-#mainmenu label {
-    width:4em;
-}
-/* submenus styles */
-#submenu {
-    margin-left:0%;
-    font-weight : normal;
-    /*display:left;*/
-}
-
-#submenu a {
-    margin:5px;
-    padding : 0px 0px 4px 0px;
-    text-decoration:none;
-    color:black;
-    padding-right:15px;
-    font-size:1em;
-}
-
-#submenu a:hover {
-    margin:5px;
-    padding : 0px 0px 4px 0px;
-    background-color:#6699cc;
-    color:white;
-    padding-right:15px;
-    font-size:1em;
-}
-
-/* Main body style */
-#main {
-    margin-left:20%;
-    margin-bottom:0px;
-    padding-bottom:0px;
-}
-
-/* facets bloc */
-#facets {
-    float:left;
-/*     background-color:#CCCCCC; */
-    margin-right:20px;
-    border:1px solid black;
-    font-size:75%;
-}
-
-#facets ul {
-    list-style-type: none;
-    padding-left:0px;
-    margin-bottom:0px;
-    margin-top:0px;
-}
-
-/* the USER information block */
-#librarian_information {
-/*     position:absolute; */
-    float:right;
-    font-size:10pt;
-}
-/* css style for reregistration alert */
-
-.reregistrinfo {
-	color: #6699cc;
-	font-weight : bold;
-	background-color : #eeeeee;
-}
-
-/* MARC editor */
-
-/* styles for the 11 buttons that the user can click on */
-/* the design of the active tab button (only 1 at a given time)*/
-.tab_active {
-    background-color : #eec95a;
-    font-size : 1em;
-    border: 2px inset;
-    font-weight : bold;
-    text-decoration:none;
-    display: inline;
-    color:white;
-    text-decoration:none;
-    margin-left:10px;
-}
-/* the design of the INactives tab buttons (all other tabs) */
-.tab_inactive {
-    background-color:#384b73;
-    font-size : 1em;
-    border: 2px outset;
-    font-weight : bold;
-    display: inline;
-    color:white;
-    text-decoration:none;
-    margin-left:10px;
-}
-
-/* the button of INactive tabs : we need this one to have white color on links, otherwise, default a look will be choosen */
-#tabs a {
-    color:white;
-    text-decoration:none;
-    padding-right:10px;
-    padding-left:10px;
-}
-
-/* specify that we to do when the mouse is on 1 button */
-#tabs a:hover {
-    border: 2px inset;
-}
-
-#tabs {
-    margin-top:45px;
-    margin-bottom:5px;
-}
-
-/* styles for the 11 content blocks */
-/* the property for hidden tabs */
-.content_hidden {
-    height:0px; /* you propably don't need to change this one */
-    visibility:hidden; /* you propably don't need to change this one */
-}
-/* the property for the displayed tab */
-.content_visible {
-    height:0px; /* you propably don't need to change this one */
-    visibility:visible; /* you propably don't need to change this one */
-}
-
-#onlinehelp {
-    float:right;
-}
-
-.term {
-    background-color:yellow;
-}
-
-.searchresults table tr:hover{
-    background-color:#ffffde
-   
-}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
index e5e9d3a859..6c9f2dcf18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
 <!-- TMPL_IF Name="displayhierarchy"-->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/hierarchy.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/hierarchy.css">
 <script language="JavaScript" type="text/javascript">
 function showParents(mynumber) {
   var parents=document.getElementsByName(mynumber+'p')
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
index 9759e2e25a..ab808b004a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
@@ -6,8 +6,8 @@
     <!-- TMPL_IF NAME="TemplateEncoding" --><meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME="TemplateEncoding" -->"><!-- TMPL_ELSE --><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><!-- /TMPL_IF -->
 <link rel="shortcut icon" href="/intranet-tmpl/prog/en/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-    <!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="intranetstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/css/<!-- TMPL_VAR NAME="intranetstylesheet" -->);<!-- TMPL_ELSE -->@import url(<!-- TMPL_VAR NAME='themelang' -->/css/intranet.css);<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="intranetcolorstylesheet" -->@import url(<!-- TMPL_VAR NAME='themelang' -->/css/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);<!-- /TMPL_IF -->
 </style>
 </head>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl
index e6824f0c72..d16fc41aee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tmpl
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-    @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+    @import url(<!-- TMPL_VAR NAME='themelang' -->/css/intranet.css);
 </style>
 </head>
 <body>